@revizly/sharp 0.35.0-revizly46 → 0.35.0-revizly48

package/dist/constructor.cjs

@@ -493,7 +493,7 @@ function clone () {
   clone.options.queueListener = queueListener;
   // Pass 'finish' event to clone for Stream-based input
   if (this._isStreamInput()) {
-    this.on('finish', () => {
+    this._whenStreamInFinished(() => {
       // Clone inherits input data
       this._flattenBufferIn();
       clone.options.input.buffer = this.options.input.buffer;

package/dist/constructor.mjs

@@ -493,7 +493,7 @@ function clone () {
   clone.options.queueListener = queueListener;
   // Pass 'finish' event to clone for Stream-based input
   if (this._isStreamInput()) {
-    this.on('finish', () => {
+    this._whenStreamInFinished(() => {
       // Clone inherits input data
       this._flattenBufferIn();
       clone.options.input.buffer = this.options.input.buffer;

package/dist/input.cjs

@@ -531,11 +531,6 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
 function _write (chunk, _encoding, callback) {
   if (Array.isArray(this.options.input.buffer)) {
     if (is.buffer(chunk)) {
-      if (this.options.input.buffer.length === 0) {
-        this.on('finish', () => {
-          this.streamInFinished = true;
-        });
-      }
       this.options.input.buffer.push(chunk);
       callback();
     } else {
@@ -565,6 +560,20 @@ function _isStreamInput () {
   return Array.isArray(this.options.input.buffer);
 }
 
+/**
+ * Call fn when the Writable side of Stream-based input has finished,
+ * or immediately when it already has, as 'finish' is emitted only once.
+ * @private
+ * @param {Function} fn
+ */
+function _whenStreamInFinished (fn) {
+  if (this.writableFinished) {
+    fn();
+  } else {
+    this.once('finish', fn);
+  }
+}
+
 /**
  * Fast access to (uncached) image metadata without decoding any compressed pixel data.
  *
@@ -642,7 +651,7 @@ function metadata (callback) {
   const stack = Error();
   if (is.fn(callback)) {
     if (this._isStreamInput()) {
-      this.on('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.metadata(this.options, (err, metadata) => {
           if (err) {
@@ -665,7 +674,7 @@ function metadata (callback) {
   } else {
     if (this._isStreamInput()) {
       return new Promise((resolve, reject) => {
-        const finished = () => {
+        this._whenStreamInFinished(() => {
           this._flattenBufferIn();
           sharp.metadata(this.options, (err, metadata) => {
             if (err) {
@@ -674,12 +683,7 @@ function metadata (callback) {
               resolve(metadata);
             }
           });
-        };
-        if (this.writableFinished) {
-          finished();
-        } else {
-          this.once('finish', finished);
-        }
+        });
       });
     } else {
       return new Promise((resolve, reject) => {
@@ -744,7 +748,7 @@ function stats (callback) {
   const stack = Error();
   if (is.fn(callback)) {
     if (this._isStreamInput()) {
-      this.on('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.stats(this.options, (err, stats) => {
           if (err) {
@@ -767,7 +771,7 @@ function stats (callback) {
   } else {
     if (this._isStreamInput()) {
       return new Promise((resolve, reject) => {
-        this.on('finish', function () {
+        this._whenStreamInFinished(() => {
           this._flattenBufferIn();
           sharp.stats(this.options, (err, stats) => {
             if (err) {
@@ -805,6 +809,7 @@ module.exports = (Sharp) => {
     _write,
     _flattenBufferIn,
     _isStreamInput,
+    _whenStreamInFinished,
     // Public
     metadata,
     stats

package/dist/input.mjs

@@ -531,11 +531,6 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
 function _write (chunk, _encoding, callback) {
   if (Array.isArray(this.options.input.buffer)) {
     if (is.buffer(chunk)) {
-      if (this.options.input.buffer.length === 0) {
-        this.on('finish', () => {
-          this.streamInFinished = true;
-        });
-      }
       this.options.input.buffer.push(chunk);
       callback();
     } else {
@@ -565,6 +560,20 @@ function _isStreamInput () {
   return Array.isArray(this.options.input.buffer);
 }
 
+/**
+ * Call fn when the Writable side of Stream-based input has finished,
+ * or immediately when it already has, as 'finish' is emitted only once.
+ * @private
+ * @param {Function} fn
+ */
+function _whenStreamInFinished (fn) {
+  if (this.writableFinished) {
+    fn();
+  } else {
+    this.once('finish', fn);
+  }
+}
+
 /**
  * Fast access to (uncached) image metadata without decoding any compressed pixel data.
  *
@@ -642,7 +651,7 @@ function metadata (callback) {
   const stack = Error();
   if (is.fn(callback)) {
     if (this._isStreamInput()) {
-      this.on('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.metadata(this.options, (err, metadata) => {
           if (err) {
@@ -665,7 +674,7 @@ function metadata (callback) {
   } else {
     if (this._isStreamInput()) {
       return new Promise((resolve, reject) => {
-        const finished = () => {
+        this._whenStreamInFinished(() => {
           this._flattenBufferIn();
           sharp.metadata(this.options, (err, metadata) => {
             if (err) {
@@ -674,12 +683,7 @@ function metadata (callback) {
               resolve(metadata);
             }
           });
-        };
-        if (this.writableFinished) {
-          finished();
-        } else {
-          this.once('finish', finished);
-        }
+        });
       });
     } else {
       return new Promise((resolve, reject) => {
@@ -744,7 +748,7 @@ function stats (callback) {
   const stack = Error();
   if (is.fn(callback)) {
     if (this._isStreamInput()) {
-      this.on('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.stats(this.options, (err, stats) => {
           if (err) {
@@ -767,7 +771,7 @@ function stats (callback) {
   } else {
     if (this._isStreamInput()) {
       return new Promise((resolve, reject) => {
-        this.on('finish', function () {
+        this._whenStreamInFinished(() => {
           this._flattenBufferIn();
           sharp.stats(this.options, (err, stats) => {
             if (err) {
@@ -805,6 +809,7 @@ export default (Sharp) => {
     _write,
     _flattenBufferIn,
     _isStreamInput,
+    _whenStreamInFinished,
     // Public
     metadata,
     stats

package/dist/operation.cjs

@@ -78,6 +78,10 @@ function rotate (angle, options) {
  * Auto-orient based on the EXIF `Orientation` tag, then remove the tag.
  * Mirroring is supported and may infer the use of a flip operation.
  *
+ * Only the EXIF `Orientation` tag is considered; orientation carried in other
+ * places, such as an XMP `tiff:Orientation` element, is left untouched and
+ * remains the responsibility of the consumer.
+ *
  * Previous or subsequent use of `rotate(angle)` and either `flip()` or `flop()`
  * will logically occur after auto-orientation, regardless of call order.
  *

package/dist/operation.mjs

@@ -78,6 +78,10 @@ function rotate (angle, options) {
  * Auto-orient based on the EXIF `Orientation` tag, then remove the tag.
  * Mirroring is supported and may infer the use of a flip operation.
  *
+ * Only the EXIF `Orientation` tag is considered; orientation carried in other
+ * places, such as an XMP `tiff:Orientation` element, is left untouched and
+ * remains the responsibility of the consumer.
+ *
  * Previous or subsequent use of `rotate(angle)` and either `flip()` or `flop()`
  * will logically occur after auto-orientation, regardless of call order.
  *

package/dist/output.cjs

@@ -1656,7 +1656,7 @@ function _pipeline (callback, stack) {
     // output=file/buffer
     if (this._isStreamInput()) {
       // output=file/buffer, input=stream
-      this.on('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.pipeline(this.options, (err, data, info) => {
           if (err) {
@@ -1681,7 +1681,7 @@ function _pipeline (callback, stack) {
     // output=stream
     if (this._isStreamInput()) {
       // output=stream, input=stream
-      this.once('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.pipeline(this.options, (err, data, info) => {
           if (err) {
@@ -1694,9 +1694,6 @@ function _pipeline (callback, stack) {
           this.on('end', () => this.emit('close'));
         });
       });
-      if (this.streamInFinished) {
-        this.emit('finish');
-      }
     } else {
       // output=stream, input=file/buffer
       sharp.pipeline(this.options, (err, data, info) => {
@@ -1716,7 +1713,7 @@ function _pipeline (callback, stack) {
     if (this._isStreamInput()) {
       // output=promise, input=stream
       return new Promise((resolve, reject) => {
-        this.once('finish', () => {
+        this._whenStreamInFinished(() => {
           this._flattenBufferIn();
           sharp.pipeline(this.options, (err, data, info) => {
             if (err) {

package/dist/output.mjs

@@ -1656,7 +1656,7 @@ function _pipeline (callback, stack) {
     // output=file/buffer
     if (this._isStreamInput()) {
       // output=file/buffer, input=stream
-      this.on('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.pipeline(this.options, (err, data, info) => {
           if (err) {
@@ -1681,7 +1681,7 @@ function _pipeline (callback, stack) {
     // output=stream
     if (this._isStreamInput()) {
       // output=stream, input=stream
-      this.once('finish', () => {
+      this._whenStreamInFinished(() => {
         this._flattenBufferIn();
         sharp.pipeline(this.options, (err, data, info) => {
           if (err) {
@@ -1694,9 +1694,6 @@ function _pipeline (callback, stack) {
           this.on('end', () => this.emit('close'));
         });
       });
-      if (this.streamInFinished) {
-        this.emit('finish');
-      }
     } else {
       // output=stream, input=file/buffer
       sharp.pipeline(this.options, (err, data, info) => {
@@ -1716,7 +1713,7 @@ function _pipeline (callback, stack) {
     if (this._isStreamInput()) {
       // output=promise, input=stream
       return new Promise((resolve, reject) => {
-        this.once('finish', () => {
+        this._whenStreamInFinished(() => {
           this._flattenBufferIn();
           sharp.pipeline(this.options, (err, data, info) => {
             if (err) {

package/dist/resize.cjs

@@ -265,19 +265,19 @@ function resize (widthOrOptions, height, options) {
   if (is.defined(widthOrOptions)) {
     if (is.object(widthOrOptions) && !is.defined(options)) {
       options = widthOrOptions;
-    } else if (is.integer(widthOrOptions) && widthOrOptions > 0) {
+    } else if (is.integer(widthOrOptions) && is.inRange(widthOrOptions, 1, 100000000)) {
       this.options.width = widthOrOptions;
     } else {
-      throw is.invalidParameterError('width', 'positive integer', widthOrOptions);
+      throw is.invalidParameterError('width', 'positive integer between 1 and 100000000', widthOrOptions);
     }
   } else {
     this.options.width = -1;
   }
   if (is.defined(height)) {
-    if (is.integer(height) && height > 0) {
+    if (is.integer(height) && is.inRange(height, 1, 100000000)) {
       this.options.height = height;
     } else {
-      throw is.invalidParameterError('height', 'positive integer', height);
+      throw is.invalidParameterError('height', 'positive integer between 1 and 100000000', height);
     }
   } else {
     this.options.height = -1;
@@ -285,18 +285,18 @@ function resize (widthOrOptions, height, options) {
   if (is.object(options)) {
     // Width
     if (is.defined(options.width)) {
-      if (is.integer(options.width) && options.width > 0) {
+      if (is.integer(options.width) && is.inRange(options.width, 1, 100000000)) {
         this.options.width = options.width;
       } else {
-        throw is.invalidParameterError('width', 'positive integer', options.width);
+        throw is.invalidParameterError('width', 'positive integer between 1 and 100000000', options.width);
       }
     }
     // Height
     if (is.defined(options.height)) {
-      if (is.integer(options.height) && options.height > 0) {
+      if (is.integer(options.height) && is.inRange(options.height, 1, 100000000)) {
         this.options.height = options.height;
       } else {
-        throw is.invalidParameterError('height', 'positive integer', options.height);
+        throw is.invalidParameterError('height', 'positive integer between 1 and 100000000', options.height);
       }
     }
     // Fit

package/dist/resize.mjs

@@ -265,19 +265,19 @@ function resize (widthOrOptions, height, options) {
   if (is.defined(widthOrOptions)) {
     if (is.object(widthOrOptions) && !is.defined(options)) {
       options = widthOrOptions;
-    } else if (is.integer(widthOrOptions) && widthOrOptions > 0) {
+    } else if (is.integer(widthOrOptions) && is.inRange(widthOrOptions, 1, 100000000)) {
       this.options.width = widthOrOptions;
     } else {
-      throw is.invalidParameterError('width', 'positive integer', widthOrOptions);
+      throw is.invalidParameterError('width', 'positive integer between 1 and 100000000', widthOrOptions);
     }
   } else {
     this.options.width = -1;
   }
   if (is.defined(height)) {
-    if (is.integer(height) && height > 0) {
+    if (is.integer(height) && is.inRange(height, 1, 100000000)) {
       this.options.height = height;
     } else {
-      throw is.invalidParameterError('height', 'positive integer', height);
+      throw is.invalidParameterError('height', 'positive integer between 1 and 100000000', height);
     }
   } else {
     this.options.height = -1;
@@ -285,18 +285,18 @@ function resize (widthOrOptions, height, options) {
   if (is.object(options)) {
     // Width
     if (is.defined(options.width)) {
-      if (is.integer(options.width) && options.width > 0) {
+      if (is.integer(options.width) && is.inRange(options.width, 1, 100000000)) {
         this.options.width = options.width;
       } else {
-        throw is.invalidParameterError('width', 'positive integer', options.width);
+        throw is.invalidParameterError('width', 'positive integer between 1 and 100000000', options.width);
       }
     }
     // Height
     if (is.defined(options.height)) {
-      if (is.integer(options.height) && options.height > 0) {
+      if (is.integer(options.height) && is.inRange(options.height, 1, 100000000)) {
         this.options.height = options.height;
       } else {
-        throw is.invalidParameterError('height', 'positive integer', options.height);
+        throw is.invalidParameterError('height', 'positive integer between 1 and 100000000', options.height);
       }
     }
     // Fit

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-revizly46",
+  "version": "0.35.0-revizly48",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -163,10 +163,10 @@
     "semver": "^7.8.5"
   },
   "optionalDependencies": {
-    "@revizly/sharp-libvips-linux-arm64": "1.0.47",
-    "@revizly/sharp-libvips-linux-x64": "1.0.47",
-    "@revizly/sharp-linux-arm64": "0.35.0-revizly46",
-    "@revizly/sharp-linux-x64": "0.35.0-revizly46"
+    "@revizly/sharp-libvips-linux-arm64": "1.0.49",
+    "@revizly/sharp-libvips-linux-x64": "1.0.49",
+    "@revizly/sharp-linux-arm64": "0.35.0-revizly48",
+    "@revizly/sharp-linux-x64": "0.35.0-revizly48"
   },
   "peerDependenciesMeta": {
     "@types/node": {
@@ -174,18 +174,18 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.5",
+    "@biomejs/biome": "^2.5.10",
     "@cpplint/cli": "^0.1.0",
-    "@emnapi/runtime": "^1.11.2",
-    "@revizly/sharp-libvips-dev": "1.0.47",
+    "@emnapi/runtime": "^1.11.3",
+    "@revizly/sharp-libvips-dev": "1.0.49",
     "@types/node": "*",
-    "emnapi": "^1.11.2",
+    "emnapi": "^1.11.3",
     "exif-reader": "^2.0.3",
-    "extract-zip": "^2.0.1",
+    "yauzl": "^3.4.0",
     "icc": "^4.0.0",
-    "node-addon-api": "^8.9.0",
+    "node-addon-api": "^8.9.2",
     "node-gyp": "^12.4.0",
-    "publint": "^0.3.21",
+    "publint": "^0.3.24",
     "tar-fs": "^3.1.3",
     "tsd": "^0.33.0"
   },
@@ -194,7 +194,7 @@
     "node": ">=20.9.0"
   },
   "config": {
-    "libvips": ">=8.18.5"
+    "libvips": ">=8.18.6"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/common.cc

@@ -711,9 +711,12 @@ namespace sharp {
     bool hasDelay = !delay.empty();
     VImage copy = image.copy();
 
-    // Only set page-height if we have more than one page, or this could
-    // accidentally turn into an animated image later.
-    if (nPages > 1) copy.set(VIPS_META_PAGE_HEIGHT, pageHeight);
+    // Only set page-height and n-pages if we have more than one page, or this
+    // could accidentally turn into an animated image later.
+    if (nPages > 1) {
+      copy.set(VIPS_META_PAGE_HEIGHT, pageHeight);
+      copy.set(VIPS_META_N_PAGES, nPages);
+    }
     if (hasDelay) {
       if (delay.size() == 1) {
         // We have just one delay, repeat that value for all frames.

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 < 5)
-#error "libvips version 8.18.5+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 6)
+#error "libvips version 8.18.6+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)