@revizly/sharp 0.35.0-revizly39 → 0.35.0-revizly40

package/dist/index.d.cts

@@ -1512,11 +1512,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;
@@ -1624,13 +1624,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;
@@ -1645,7 +1645,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;
     }
 
@@ -1673,11 +1673,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;
     }
 

package/dist/index.d.mts

@@ -1506,11 +1506,11 @@ export interface TiffOptions extends OutputOptions {
     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;
@@ -1618,13 +1618,13 @@ export interface Noise {
 export type ExtendWith = 'background' | 'copy' | 'repeat' | 'mirror';
 
 export 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;
@@ -1639,7 +1639,7 @@ export interface TrimOptions {
     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;
 }
 
@@ -1667,11 +1667,11 @@ export interface Kernel {
 }
 
 export 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;
 }
 

package/dist/input.cjs

@@ -410,17 +410,17 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
           }
         }
         if (is.defined(inputOptions.text.width)) {
-          if (is.integer(inputOptions.text.width) && inputOptions.text.width > 0) {
+          if (is.integer(inputOptions.text.width) && is.inRange(inputOptions.text.width, 1, 1000000)) {
             inputDescriptor.textWidth = inputOptions.text.width;
           } else {
-            throw is.invalidParameterError('text.width', 'positive integer', inputOptions.text.width);
+            throw is.invalidParameterError('text.width', 'integer between 1 and 1000000', inputOptions.text.width);
           }
         }
         if (is.defined(inputOptions.text.height)) {
-          if (is.integer(inputOptions.text.height) && inputOptions.text.height > 0) {
+          if (is.integer(inputOptions.text.height) && is.inRange(inputOptions.text.height, 1, 1000000)) {
             inputDescriptor.textHeight = inputOptions.text.height;
           } else {
-            throw is.invalidParameterError('text.height', 'positive integer', inputOptions.text.height);
+            throw is.invalidParameterError('text.height', 'integer between 1 and 1000000', inputOptions.text.height);
           }
         }
         if (is.defined(inputOptions.text.align)) {

package/dist/input.mjs

@@ -410,17 +410,17 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
           }
         }
         if (is.defined(inputOptions.text.width)) {
-          if (is.integer(inputOptions.text.width) && inputOptions.text.width > 0) {
+          if (is.integer(inputOptions.text.width) && is.inRange(inputOptions.text.width, 1, 1000000)) {
             inputDescriptor.textWidth = inputOptions.text.width;
           } else {
-            throw is.invalidParameterError('text.width', 'positive integer', inputOptions.text.width);
+            throw is.invalidParameterError('text.width', 'integer between 1 and 1000000', inputOptions.text.width);
           }
         }
         if (is.defined(inputOptions.text.height)) {
-          if (is.integer(inputOptions.text.height) && inputOptions.text.height > 0) {
+          if (is.integer(inputOptions.text.height) && is.inRange(inputOptions.text.height, 1, 1000000)) {
             inputDescriptor.textHeight = inputOptions.text.height;
           } else {
-            throw is.invalidParameterError('text.height', 'positive integer', inputOptions.text.height);
+            throw is.invalidParameterError('text.height', 'integer between 1 and 1000000', inputOptions.text.height);
           }
         }
         if (is.defined(inputOptions.text.align)) {

package/dist/is.cjs

@@ -78,7 +78,7 @@ const string = (val) => typeof val === 'string' && val.length > 0;
  * Is this value a real number?
  * @private
  */
-const number = (val) => typeof val === 'number' && !Number.isNaN(val);
+const number = (val) => typeof val === 'number' && Number.isFinite(val);
 
 /**
  * Is this value an integer?

package/dist/is.mjs

@@ -78,7 +78,7 @@ const string = (val) => typeof val === 'string' && val.length > 0;
  * Is this value a real number?
  * @private
  */
-const number = (val) => typeof val === 'number' && !Number.isNaN(val);
+const number = (val) => typeof val === 'number' && Number.isFinite(val);
 
 /**
  * Is this value an integer?

package/dist/operation.cjs

@@ -646,23 +646,23 @@ function normalize (options) {
  *   .toBuffer();
  *
  * @param {Object} options
- * @param {number} options.width - Integral width of the search window, in pixels.
- * @param {number} options.height - Integral height of the search window, in pixels.
+ * @param {number} options.width - Integral width of the search window, in pixels, between 1 and 65536.
+ * @param {number} options.height - Integral height of the search window, in pixels, between 1 and 65536.
  * @param {number} [options.maxSlope=3] - Integral level of brightening, between 0 and 100, where 0 disables contrast limiting.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
 function clahe (options) {
   if (is.plainObject(options)) {
-    if (is.integer(options.width) && options.width > 0) {
+    if (is.integer(options.width) && is.inRange(options.width, 1, 65536)) {
       this.options.claheWidth = options.width;
     } else {
-      throw is.invalidParameterError('width', 'integer greater than zero', options.width);
+      throw is.invalidParameterError('width', 'integer between 1 and 65536', options.width);
     }
-    if (is.integer(options.height) && options.height > 0) {
+    if (is.integer(options.height) && is.inRange(options.height, 1, 65536)) {
       this.options.claheHeight = options.height;
     } else {
-      throw is.invalidParameterError('height', 'integer greater than zero', options.height);
+      throw is.invalidParameterError('height', 'integer between 1 and 65536', options.height);
     }
     if (is.defined(options.maxSlope)) {
       if (is.integer(options.maxSlope) && is.inRange(options.maxSlope, 0, 100)) {
@@ -706,7 +706,8 @@ function convolve (kernel) {
   if (!is.object(kernel) || !Array.isArray(kernel.kernel) ||
       !is.integer(kernel.width) || !is.integer(kernel.height) ||
       !is.inRange(kernel.width, 3, 1001) || !is.inRange(kernel.height, 3, 1001) ||
-      kernel.height * kernel.width !== kernel.kernel.length
+      kernel.height * kernel.width !== kernel.kernel.length ||
+      !kernel.kernel.every(is.number)
   ) {
     // must pass in a kernel
     throw new Error('Invalid convolution kernel');

package/dist/operation.mjs

@@ -646,23 +646,23 @@ function normalize (options) {
  *   .toBuffer();
  *
  * @param {Object} options
- * @param {number} options.width - Integral width of the search window, in pixels.
- * @param {number} options.height - Integral height of the search window, in pixels.
+ * @param {number} options.width - Integral width of the search window, in pixels, between 1 and 65536.
+ * @param {number} options.height - Integral height of the search window, in pixels, between 1 and 65536.
  * @param {number} [options.maxSlope=3] - Integral level of brightening, between 0 and 100, where 0 disables contrast limiting.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
 function clahe (options) {
   if (is.plainObject(options)) {
-    if (is.integer(options.width) && options.width > 0) {
+    if (is.integer(options.width) && is.inRange(options.width, 1, 65536)) {
       this.options.claheWidth = options.width;
     } else {
-      throw is.invalidParameterError('width', 'integer greater than zero', options.width);
+      throw is.invalidParameterError('width', 'integer between 1 and 65536', options.width);
     }
-    if (is.integer(options.height) && options.height > 0) {
+    if (is.integer(options.height) && is.inRange(options.height, 1, 65536)) {
       this.options.claheHeight = options.height;
     } else {
-      throw is.invalidParameterError('height', 'integer greater than zero', options.height);
+      throw is.invalidParameterError('height', 'integer between 1 and 65536', options.height);
     }
     if (is.defined(options.maxSlope)) {
       if (is.integer(options.maxSlope) && is.inRange(options.maxSlope, 0, 100)) {
@@ -706,7 +706,8 @@ function convolve (kernel) {
   if (!is.object(kernel) || !Array.isArray(kernel.kernel) ||
       !is.integer(kernel.width) || !is.integer(kernel.height) ||
       !is.inRange(kernel.width, 3, 1001) || !is.inRange(kernel.height, 3, 1001) ||
-      kernel.height * kernel.width !== kernel.kernel.length
+      kernel.height * kernel.width !== kernel.kernel.length ||
+      !kernel.kernel.every(is.number)
   ) {
     // must pass in a kernel
     throw new Error('Invalid convolution kernel');

package/dist/output.cjs

@@ -1103,10 +1103,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 +1134,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 +1157,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/output.mjs

@@ -1103,10 +1103,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 +1134,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 +1157,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);
@@ -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);
@@ -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/lib/index.d.ts

@@ -1512,11 +1512,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;
@@ -1624,13 +1624,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;
@@ -1645,7 +1645,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;
     }
 
@@ -1673,11 +1673,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;
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@revizly/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-revizly39",
+  "version": "0.35.0-revizly40",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -160,21 +160,21 @@
   "dependencies": {
     "@img/colour": "^1.1.0",
     "detect-libc": "^2.1.2",
-    "semver": "^7.8.4"
+    "semver": "^7.8.5"
   },
   "optionalDependencies": {
-    "@revizly/sharp-libvips-linux-arm64": "1.0.40",
-    "@revizly/sharp-libvips-linux-x64": "1.0.40",
-    "@revizly/sharp-linux-arm64": "0.35.0-revizly39",
-    "@revizly/sharp-linux-x64": "0.35.0-revizly39"
+    "@revizly/sharp-libvips-linux-arm64": "1.0.41",
+    "@revizly/sharp-libvips-linux-x64": "1.0.41",
+    "@revizly/sharp-linux-arm64": "0.35.0-revizly40",
+    "@revizly/sharp-linux-x64": "0.35.0-revizly40"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.0",
+    "@biomejs/biome": "^2.5.1",
     "@cpplint/cli": "^0.1.0",
-    "@emnapi/runtime": "^1.11.0",
-    "@revizly/sharp-libvips-dev": "1.0.40",
+    "@emnapi/runtime": "^1.11.1",
+    "@revizly/sharp-libvips-dev": "1.0.41",
     "@types/node": "*",
-    "emnapi": "^1.11.0",
+    "emnapi": "^1.11.1",
     "exif-reader": "^2.0.3",
     "extract-zip": "^2.0.1",
     "icc": "^4.0.0",

package/src/pipeline.cc

@@ -608,38 +608,25 @@ class PipelineWorker : public Napi::AsyncWorker {
         baton->width = image.width() + baton->extendLeft + baton->extendRight;
         baton->height = (nPages > 1 ? targetPageHeight : image.height()) + baton->extendTop + baton->extendBottom;
 
+        std::vector<double> background;
         if (baton->extendWith == VIPS_EXTEND_BACKGROUND) {
-          std::vector<double> background;
           std::tie(image, background) = sharp::ApplyAlpha(image, baton->extendBackground, shouldPremultiplyAlpha);
-
-          image = sharp::StaySequential(image, nPages > 1);
-          image = nPages > 1
-            ? sharp::EmbedMultiPage(image,
-                baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                baton->extendWith, background, nPages, &targetPageHeight)
-            : image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                VImage::option()->set("extend", baton->extendWith)->set("background", background));
-          if (baton->keepGainMap) {
-            gainMap = gainMap.embed(baton->extendLeft / gainMapScaleFactor, baton->extendTop / gainMapScaleFactor,
-              baton->width / gainMapScaleFactor, baton->height / gainMapScaleFactor, VImage::option()
-                ->set("extend", baton->extendWith)
-                ->set("background", 0));
-          }
-        } else {
-          std::vector<double> ignoredBackground(1);
-          image = sharp::StaySequential(image);
-          image = nPages > 1
-            ? sharp::EmbedMultiPage(image,
-                baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                baton->extendWith, ignoredBackground, nPages, &targetPageHeight)
-            : image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height,
-                VImage::option()->set("extend", baton->extendWith));
-          if (baton->keepGainMap) {
-            gainMap = gainMap.embed(baton->extendLeft / gainMapScaleFactor, baton->extendTop / gainMapScaleFactor,
-              baton->width / gainMapScaleFactor, baton->height / gainMapScaleFactor, VImage::option()
-                ->set("extend", baton->extendWith)
-                ->set("background", 0));
-          }
+        }
+        image = sharp::StaySequential(image, nPages > 1 || baton->extendWith != VIPS_EXTEND_BACKGROUND);
+        auto options = VImage::option()->set("extend", baton->extendWith);
+        if (baton->extendWith == VIPS_EXTEND_BACKGROUND) {
+          options->set("background", background);
+        }
+        image = nPages > 1
+          ? sharp::EmbedMultiPage(image,
+              baton->extendLeft, baton->extendTop, baton->width, baton->height,
+              baton->extendWith, background, nPages, &targetPageHeight)
+          : image.embed(baton->extendLeft, baton->extendTop, baton->width, baton->height, options);
+        if (baton->keepGainMap) {
+          gainMap = gainMap.embed(baton->extendLeft / gainMapScaleFactor, baton->extendTop / gainMapScaleFactor,
+            baton->width / gainMapScaleFactor, baton->height / gainMapScaleFactor, VImage::option()
+              ->set("extend", baton->extendWith)
+              ->set("background", 0));
         }
       }
       // Median - must happen before blurring, due to the utility of blurring after thresholding