sharp 0.35.4 → 0.35.5-rc.1

package/dist/index.d.cts

@@ -1404,7 +1404,7 @@ declare namespace sharp {
         chromaSubsampling?: '4:4:4' | '4:2:0';
     }
 
-    interface JxlOptions extends OutputOptions {
+    interface JxlOptions extends OutputOptions, AnimationOptions {
         /** Maximum encoding error, between 0 (highest quality) and 15 (lowest quality) (optional, default 1.0) */
         distance?: number;
         /** Calculate distance based on JPEG-like quality, between 1 and 100, overrides distance if specified */
@@ -1413,7 +1413,7 @@ declare namespace sharp {
         decodingTier?: number;
         /** Use lossless compression (optional, default false) */
         lossless?: boolean;
-        /** CPU effort, between 3 (fastest) and 9 (slowest) (optional, default 7) */
+        /** CPU effort, between 1 (fastest) and 9 (slowest) (optional, default 7) */
         effort?: number | undefined;
     }
 

package/dist/index.d.mts

@@ -1398,7 +1398,7 @@ export interface Jp2Options extends OutputOptions {
     chromaSubsampling?: '4:4:4' | '4:2:0';
 }
 
-export interface JxlOptions extends OutputOptions {
+export interface JxlOptions extends OutputOptions, AnimationOptions {
     /** Maximum encoding error, between 0 (highest quality) and 15 (lowest quality) (optional, default 1.0) */
     distance?: number;
     /** Calculate distance based on JPEG-like quality, between 1 and 100, overrides distance if specified */
@@ -1407,7 +1407,7 @@ export interface JxlOptions extends OutputOptions {
     decodingTier?: number;
     /** Use lossless compression (optional, default false) */
     lossless?: boolean;
-    /** CPU effort, between 3 (fastest) and 9 (slowest) (optional, default 7) */
+    /** CPU effort, between 1 (fastest) and 9 (slowest) (optional, default 7) */
     effort?: number | undefined;
 }
 
@@ -2041,6 +2041,6 @@ export interface SharpConstructor {
   bool: BoolEnum;
 }
 
-export const sharp: SharpConstructor;
+declare const sharp: SharpConstructor;
 export default sharp;
 

package/dist/is.cjs

@@ -107,9 +107,15 @@ const inArray = (val, list) => list.includes(val);
  * @returns {Error} Containing the formatted message.
  * @private
  */
-const invalidParameterError = (name, expected, actual) => new Error(
-    `Expected ${expected} for ${name} but received ${actual} of type ${typeof actual}`
+const invalidParameterError = (name, expected, actual) => {
+  let actualString;
+  try {
+    actualString = String(actual).slice(0, 100);
+  } catch {}
+  return new Error(
+    `Expected ${expected} for ${name} but received ${actualString} of type ${typeof actual}`
   );
+};
 
 /**
  * Ensures an Error from C++ contains a JS stack.

package/dist/is.mjs

@@ -107,9 +107,15 @@ const inArray = (val, list) => list.includes(val);
  * @returns {Error} Containing the formatted message.
  * @private
  */
-const invalidParameterError = (name, expected, actual) => new Error(
-    `Expected ${expected} for ${name} but received ${actual} of type ${typeof actual}`
+const invalidParameterError = (name, expected, actual) => {
+  let actualString;
+  try {
+    actualString = String(actual).slice(0, 100);
+  } catch {}
+  return new Error(
+    `Expected ${expected} for ${name} but received ${actualString} of type ${typeof actual}`
   );
+};
 
 /**
  * Ensures an Error from C++ contains a JS stack.

package/dist/operation.cjs

@@ -824,7 +824,7 @@ function linear (a, b) {
     this.options.linearA = [];
   } else if (is.number(a)) {
     this.options.linearA = [a];
-  } else if (Array.isArray(a) && a.length && a.every(is.number)) {
+  } else if (Array.isArray(a) && is.inRange(a.length, 1, 1000000) && a.every(is.number)) {
     this.options.linearA = a;
   } else {
     throw is.invalidParameterError('a', 'number or array of numbers', a);
@@ -833,7 +833,7 @@ function linear (a, b) {
     this.options.linearB = [];
   } else if (is.number(b)) {
     this.options.linearB = [b];
-  } else if (Array.isArray(b) && b.length && b.every(is.number)) {
+  } else if (Array.isArray(b) && is.inRange(b.length, 1, 1000000) && b.every(is.number)) {
     this.options.linearB = b;
   } else {
     throw is.invalidParameterError('b', 'number or array of numbers', b);

package/dist/operation.mjs

@@ -824,7 +824,7 @@ function linear (a, b) {
     this.options.linearA = [];
   } else if (is.number(a)) {
     this.options.linearA = [a];
-  } else if (Array.isArray(a) && a.length && a.every(is.number)) {
+  } else if (Array.isArray(a) && is.inRange(a.length, 1, 1000000) && a.every(is.number)) {
     this.options.linearA = a;
   } else {
     throw is.invalidParameterError('a', 'number or array of numbers', a);
@@ -833,7 +833,7 @@ function linear (a, b) {
     this.options.linearB = [];
   } else if (is.number(b)) {
     this.options.linearB = [b];
-  } else if (Array.isArray(b) && b.length && b.every(is.number)) {
+  } else if (Array.isArray(b) && is.inRange(b.length, 1, 1000000) && b.every(is.number)) {
     this.options.linearB = b;
   } else {
     throw is.invalidParameterError('b', 'number or array of numbers', b);

package/dist/output.cjs

@@ -1066,6 +1066,7 @@ function trySetAnimationOptions (source, target) {
       target.delay = [source.delay];
     } else if (
       Array.isArray(source.delay) &&
+      is.inRange(source.delay.length, 1, 1000000) &&
       source.delay.every(is.integer) &&
       source.delay.every(v => is.inRange(v, 0, 65535))) {
       target.delay = source.delay;

package/dist/output.mjs

@@ -1066,6 +1066,7 @@ function trySetAnimationOptions (source, target) {
       target.delay = [source.delay];
     } else if (
       Array.isArray(source.delay) &&
+      is.inRange(source.delay.length, 1, 1000000) &&
       source.delay.every(is.integer) &&
       source.delay.every(v => is.inRange(v, 0, 65535))) {
       target.delay = source.delay;

package/dist/resize.cjs

@@ -386,10 +386,10 @@ 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] - 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 {number} [extend.top=0] - number of pixels to add to the top edge, valid values are integers in the range 0-100000000
+ * @param {number} [extend.left=0] - number of pixels to add to the left edge, valid values are integers in the range 0-100000000
+ * @param {number} [extend.bottom=0] - number of pixels to add to the bottom edge, valid values are integers in the range 0-100000000
+ * @param {number} [extend.right=0] - number of pixels to add to the right edge, valid values are integers in the range 0-100000000
  * @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}
@@ -397,41 +397,41 @@ function resize (widthOrOptions, height, options) {
 */
 function extend (extend) {
   if (is.integer(extend)) {
-    if (is.inRange(extend, 1, 10000)) {
+    if (is.inRange(extend, 1, 100000000)) {
       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);
+      throw is.invalidParameterError('extend', 'integer between 1 and 100000000', extend);
     }
   } else if (is.object(extend)) {
     if (is.defined(extend.top)) {
-      if (is.integer(extend.top) && is.inRange(extend.top, 0, 10000)) {
+      if (is.integer(extend.top) && is.inRange(extend.top, 0, 100000000)) {
         this.options.extendTop = extend.top;
       } else {
-        throw is.invalidParameterError('top', 'integer between 0 and 10000', extend.top);
+        throw is.invalidParameterError('top', 'integer between 0 and 100000000', extend.top);
       }
     }
     if (is.defined(extend.bottom)) {
-      if (is.integer(extend.bottom) && is.inRange(extend.bottom, 0, 10000)) {
+      if (is.integer(extend.bottom) && is.inRange(extend.bottom, 0, 100000000)) {
         this.options.extendBottom = extend.bottom;
       } else {
-        throw is.invalidParameterError('bottom', 'integer between 0 and 10000', extend.bottom);
+        throw is.invalidParameterError('bottom', 'integer between 0 and 100000000', extend.bottom);
       }
     }
     if (is.defined(extend.left)) {
-      if (is.integer(extend.left) && is.inRange(extend.left, 0, 10000)) {
+      if (is.integer(extend.left) && is.inRange(extend.left, 0, 100000000)) {
         this.options.extendLeft = extend.left;
       } else {
-        throw is.invalidParameterError('left', 'integer between 0 and 10000', extend.left);
+        throw is.invalidParameterError('left', 'integer between 0 and 100000000', extend.left);
       }
     }
     if (is.defined(extend.right)) {
-      if (is.integer(extend.right) && is.inRange(extend.right, 0, 10000)) {
+      if (is.integer(extend.right) && is.inRange(extend.right, 0, 100000000)) {
         this.options.extendRight = extend.right;
       } else {
-        throw is.invalidParameterError('right', 'integer between 0 and 10000', extend.right);
+        throw is.invalidParameterError('right', 'integer between 0 and 100000000', extend.right);
       }
     }
     this._setBackgroundColourOption('extendBackground', extend.background);

package/dist/resize.mjs

@@ -386,10 +386,10 @@ 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] - 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 {number} [extend.top=0] - number of pixels to add to the top edge, valid values are integers in the range 0-100000000
+ * @param {number} [extend.left=0] - number of pixels to add to the left edge, valid values are integers in the range 0-100000000
+ * @param {number} [extend.bottom=0] - number of pixels to add to the bottom edge, valid values are integers in the range 0-100000000
+ * @param {number} [extend.right=0] - number of pixels to add to the right edge, valid values are integers in the range 0-100000000
  * @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}
@@ -397,41 +397,41 @@ function resize (widthOrOptions, height, options) {
 */
 function extend (extend) {
   if (is.integer(extend)) {
-    if (is.inRange(extend, 1, 10000)) {
+    if (is.inRange(extend, 1, 100000000)) {
       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);
+      throw is.invalidParameterError('extend', 'integer between 1 and 100000000', extend);
     }
   } else if (is.object(extend)) {
     if (is.defined(extend.top)) {
-      if (is.integer(extend.top) && is.inRange(extend.top, 0, 10000)) {
+      if (is.integer(extend.top) && is.inRange(extend.top, 0, 100000000)) {
         this.options.extendTop = extend.top;
       } else {
-        throw is.invalidParameterError('top', 'integer between 0 and 10000', extend.top);
+        throw is.invalidParameterError('top', 'integer between 0 and 100000000', extend.top);
       }
     }
     if (is.defined(extend.bottom)) {
-      if (is.integer(extend.bottom) && is.inRange(extend.bottom, 0, 10000)) {
+      if (is.integer(extend.bottom) && is.inRange(extend.bottom, 0, 100000000)) {
         this.options.extendBottom = extend.bottom;
       } else {
-        throw is.invalidParameterError('bottom', 'integer between 0 and 10000', extend.bottom);
+        throw is.invalidParameterError('bottom', 'integer between 0 and 100000000', extend.bottom);
       }
     }
     if (is.defined(extend.left)) {
-      if (is.integer(extend.left) && is.inRange(extend.left, 0, 10000)) {
+      if (is.integer(extend.left) && is.inRange(extend.left, 0, 100000000)) {
         this.options.extendLeft = extend.left;
       } else {
-        throw is.invalidParameterError('left', 'integer between 0 and 10000', extend.left);
+        throw is.invalidParameterError('left', 'integer between 0 and 100000000', extend.left);
       }
     }
     if (is.defined(extend.right)) {
-      if (is.integer(extend.right) && is.inRange(extend.right, 0, 10000)) {
+      if (is.integer(extend.right) && is.inRange(extend.right, 0, 100000000)) {
         this.options.extendRight = extend.right;
       } else {
-        throw is.invalidParameterError('right', 'integer between 0 and 10000', extend.right);
+        throw is.invalidParameterError('right', 'integer between 0 and 100000000', extend.right);
       }
     }
     this._setBackgroundColourOption('extendBackground', extend.background);

package/dist/sharp.cjs

@@ -112,8 +112,8 @@ if (!sharp) {
 
   const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
   errors.forEach((err) => {
-    if (!err.code.endsWith("MODULE_NOT_FOUND")) {
-      help.push(`${err.code}: ${err.message}`);
+    if (!err.code?.endsWith("MODULE_NOT_FOUND")) {
+      help.push(err.code ? `${err.code}: ${err.message}` : err.message);
     }
   });
   const messages = errors.map((err) => err.message).join(" ");
@@ -122,7 +122,7 @@ if (!sharp) {
   if (isUnsupportedNodeRuntime()) {
     const { found, expected } = isUnsupportedNodeRuntime();
     help.push("- Please upgrade Node.js:", `    Found ${found}`, `    Requires ${expected}`);
-  } else if (prebuiltPlatforms.includes(runtimePlatform)) {
+  } else if (prebuiltPlatforms.includes(runtimePlatform) && !/libstdc\+\+\.so/.test(messages)) {
     const [os, cpu] = runtimePlatform.split("-");
     const libc = os.endsWith("musl") ? " --libc=musl" : "";
     help.push(

package/dist/sharp.mjs

@@ -112,8 +112,8 @@ if (!sharp) {
 
   const help = [`Could not load the "sharp" module using the ${runtimePlatform} runtime`];
   errors.forEach((err) => {
-    if (!err.code.endsWith("MODULE_NOT_FOUND")) {
-      help.push(`${err.code}: ${err.message}`);
+    if (!err.code?.endsWith("MODULE_NOT_FOUND")) {
+      help.push(err.code ? `${err.code}: ${err.message}` : err.message);
     }
   });
   const messages = errors.map((err) => err.message).join(" ");
@@ -122,7 +122,7 @@ if (!sharp) {
   if (isUnsupportedNodeRuntime()) {
     const { found, expected } = isUnsupportedNodeRuntime();
     help.push("- Please upgrade Node.js:", `    Found ${found}`, `    Requires ${expected}`);
-  } else if (prebuiltPlatforms.includes(runtimePlatform)) {
+  } else if (prebuiltPlatforms.includes(runtimePlatform) && !/libstdc\+\+\.so/.test(messages)) {
     const [os, cpu] = runtimePlatform.split("-");
     const libc = os.endsWith("musl") ? " --libc=musl" : "";
     help.push(

package/lib/index.d.ts

@@ -1404,7 +1404,7 @@ declare namespace sharp {
         chromaSubsampling?: '4:4:4' | '4:2:0';
     }
 
-    interface JxlOptions extends OutputOptions {
+    interface JxlOptions extends OutputOptions, AnimationOptions {
         /** Maximum encoding error, between 0 (highest quality) and 15 (lowest quality) (optional, default 1.0) */
         distance?: number;
         /** Calculate distance based on JPEG-like quality, between 1 and 100, overrides distance if specified */
@@ -1413,7 +1413,7 @@ declare namespace sharp {
         decodingTier?: number;
         /** Use lossless compression (optional, default false) */
         lossless?: boolean;
-        /** CPU effort, between 3 (fastest) and 9 (slowest) (optional, default 7) */
+        /** CPU effort, between 1 (fastest) and 9 (slowest) (optional, default 7) */
         effort?: number | 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.4",
+  "version": "0.35.5-rc.1",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -163,31 +163,31 @@
     "semver": "^7.8.5"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.35.4",
-    "@img/sharp-darwin-x64": "0.35.4",
-    "@img/sharp-freebsd-wasm32": "0.35.4",
-    "@img/sharp-libvips-darwin-arm64": "1.3.3",
-    "@img/sharp-libvips-darwin-x64": "1.3.3",
-    "@img/sharp-libvips-linux-arm": "1.3.3",
-    "@img/sharp-libvips-linux-arm64": "1.3.3",
-    "@img/sharp-libvips-linux-ppc64": "1.3.3",
-    "@img/sharp-libvips-linux-riscv64": "1.3.3",
-    "@img/sharp-libvips-linux-s390x": "1.3.3",
-    "@img/sharp-libvips-linux-x64": "1.3.3",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.3.3",
-    "@img/sharp-libvips-linuxmusl-x64": "1.3.3",
-    "@img/sharp-linux-arm": "0.35.4",
-    "@img/sharp-linux-arm64": "0.35.4",
-    "@img/sharp-linux-ppc64": "0.35.4",
-    "@img/sharp-linux-riscv64": "0.35.4",
-    "@img/sharp-linux-s390x": "0.35.4",
-    "@img/sharp-linux-x64": "0.35.4",
-    "@img/sharp-linuxmusl-arm64": "0.35.4",
-    "@img/sharp-linuxmusl-x64": "0.35.4",
-    "@img/sharp-webcontainers-wasm32": "0.35.4",
-    "@img/sharp-win32-arm64": "0.35.4",
-    "@img/sharp-win32-ia32": "0.35.4",
-    "@img/sharp-win32-x64": "0.35.4"
+    "@img/sharp-darwin-arm64": "0.35.5-rc.1",
+    "@img/sharp-darwin-x64": "0.35.5-rc.1",
+    "@img/sharp-freebsd-wasm32": "0.35.5-rc.1",
+    "@img/sharp-libvips-darwin-arm64": "1.3.4-rc.1",
+    "@img/sharp-libvips-darwin-x64": "1.3.4-rc.1",
+    "@img/sharp-libvips-linux-arm": "1.3.4-rc.1",
+    "@img/sharp-libvips-linux-arm64": "1.3.4-rc.1",
+    "@img/sharp-libvips-linux-ppc64": "1.3.4-rc.1",
+    "@img/sharp-libvips-linux-riscv64": "1.3.4-rc.1",
+    "@img/sharp-libvips-linux-s390x": "1.3.4-rc.1",
+    "@img/sharp-libvips-linux-x64": "1.3.4-rc.1",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.3.4-rc.1",
+    "@img/sharp-libvips-linuxmusl-x64": "1.3.4-rc.1",
+    "@img/sharp-linux-arm": "0.35.5-rc.1",
+    "@img/sharp-linux-arm64": "0.35.5-rc.1",
+    "@img/sharp-linux-ppc64": "0.35.5-rc.1",
+    "@img/sharp-linux-riscv64": "0.35.5-rc.1",
+    "@img/sharp-linux-s390x": "0.35.5-rc.1",
+    "@img/sharp-linux-x64": "0.35.5-rc.1",
+    "@img/sharp-linuxmusl-arm64": "0.35.5-rc.1",
+    "@img/sharp-linuxmusl-x64": "0.35.5-rc.1",
+    "@img/sharp-webcontainers-wasm32": "0.35.5-rc.1",
+    "@img/sharp-win32-arm64": "0.35.5-rc.1",
+    "@img/sharp-win32-ia32": "0.35.5-rc.1",
+    "@img/sharp-win32-x64": "0.35.5-rc.1"
   },
   "peerDependenciesMeta": {
     "@types/node": {
@@ -195,31 +195,31 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.10",
+    "@biomejs/biome": "^2.5.14",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.11.3",
-    "@img/sharp-libvips-dev": "1.3.3",
-    "@img/sharp-libvips-dev-wasm32": "1.3.3",
-    "@img/sharp-libvips-win32-arm64": "1.3.3",
-    "@img/sharp-libvips-win32-ia32": "1.3.3",
-    "@img/sharp-libvips-win32-x64": "1.3.3",
+    "@img/sharp-libvips-dev": "1.3.4-rc.1",
+    "@img/sharp-libvips-dev-wasm32": "1.3.4-rc.1",
+    "@img/sharp-libvips-win32-arm64": "1.3.4-rc.1",
+    "@img/sharp-libvips-win32-ia32": "1.3.4-rc.1",
+    "@img/sharp-libvips-win32-x64": "1.3.4-rc.1",
     "@types/node": "*",
     "emnapi": "^1.11.3",
     "exif-reader": "^2.0.3",
-    "yauzl": "^3.4.0",
     "icc": "^4.0.0",
     "node-addon-api": "^8.9.2",
     "node-gyp": "^12.4.0",
     "publint": "^0.3.24",
     "tar-fs": "^3.1.3",
-    "tsd": "^0.33.0"
+    "tsd": "^0.33.0",
+    "yauzl": "^3.4.0"
   },
   "license": "Apache-2.0",
   "engines": {
     "node": ">=20.9.0"
   },
   "config": {
-    "libvips": ">=8.18.6"
+    "libvips": ">=8.18.7"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/binding.gyp

@@ -1,7 +1,7 @@
 # Copyright 2013 Lovell Fuller and others.
 # SPDX-License-Identifier: Apache-2.0
 
-{
+{ # noqa: B018
   'variables': {
     'vips_version': '<!(node -p "require(\'../dist/libvips.cjs\').minimumLibvipsVersion")',
     'platform_and_arch': '<!(node -p "require(\'../dist/libvips.cjs\').buildPlatformArch()")',

package/src/common.cc

@@ -540,10 +540,10 @@ namespace sharp {
           if (channels == 4) {
             background.push_back(descriptor->createBackground[3]);
           }
-          image = VImage::new_matrix(descriptor->createWidth, descriptor->createHeight)
-            .copy(VImage::option()->set("interpretation",
-              channels < 3 ? VIPS_INTERPRETATION_B_W : VIPS_INTERPRETATION_sRGB))
-            .new_from_image(background);
+          image = VImage::black(descriptor->createWidth, descriptor->createHeight,
+            VImage::option()->set("bands", channels))
+            .copy(VImage::option()->set("interpretation", VIPS_INTERPRETATION_sRGB))
+            .linear(std::vector<double>(channels, 0.0), background, VImage::option()->set("uchar", true));
         }
         if (descriptor->createPageHeight > 0) {
           image.set(VIPS_META_PAGE_HEIGHT, descriptor->createPageHeight);

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

package/src/pipeline.cc

@@ -56,9 +56,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           hasAlpha |= image.has_alpha();
         }
         if (hasAlpha) {
-          for (auto &image : images) {
-            if (!image.has_alpha()) {
-              image = sharp::EnsureAlpha(image, 1);
+          for (size_t i = 0; i < images.size(); i++) {
+            if (!images[i].has_alpha()) {
+              images[i] = sharp::EnsureAlpha(images[i], 1);
             }
           }
         } else {
@@ -94,7 +94,10 @@ class PipelineWorker : public Napi::AsyncWorker {
       // Calculate angle of rotation
       VipsAngle rotation = VIPS_ANGLE_D0;
       VipsAngle autoRotation = VIPS_ANGLE_D0;
+      VipsAngle gainMapRotation = VIPS_ANGLE_D0;
       bool autoFlop = false;
+      bool gainMapFlip = false;
+      bool gainMapFlop = false;
 
       if (baton->input->autoOrient) {
         // Rotate and flip image according to Exif orientation
@@ -115,11 +118,13 @@ class PipelineWorker : public Napi::AsyncWorker {
             MultiPageUnsupported(nPages, "Rotate");
           }
           image = image.rot(autoRotation);
+          gainMapRotation = autoRotation;
           autoRotation = VIPS_ANGLE_D0;
         }
         if (autoFlop) {
           image = image.flip(VIPS_DIRECTION_HORIZONTAL);
           autoFlop = false;
+          gainMapFlop = true;
         }
       }
 
@@ -128,20 +133,24 @@ class PipelineWorker : public Napi::AsyncWorker {
         if (baton->flip) {
           image = image.flip(VIPS_DIRECTION_VERTICAL);
           baton->flip = false;
+          gainMapFlip = true;
         }
         if (baton->flop) {
           image = image.flip(VIPS_DIRECTION_HORIZONTAL);
           baton->flop = false;
+          gainMapFlop = true;
         }
         if (rotation != VIPS_ANGLE_D0) {
           if (rotation != VIPS_ANGLE_D180) {
             MultiPageUnsupported(nPages, "Rotate");
           }
           image = image.rot(rotation);
+          gainMapRotation = rotation;
           rotation = VIPS_ANGLE_D0;
         }
         if (baton->rotationAngle != 0.0) {
           MultiPageUnsupported(nPages, "Rotate");
+          KeepGainMapUnsupported(baton->keepGainMap, "Rotate");
           std::vector<double> background;
           std::tie(image, background) = sharp::ApplyAlpha(image, baton->rotationBackground, false);
           image = image.rotate(baton->rotationAngle, VImage::option()->set("background", background)).copy_memory();
@@ -152,6 +161,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       // Trim
       if (baton->trimThreshold >= 0.0) {
         MultiPageUnsupported(nPages, "Trim");
+        KeepGainMapUnsupported(baton->keepGainMap, "Trim");
         image = sharp::StaySequential(image);
         image = sharp::Trim(image, baton->trimBackground, baton->trimThreshold, baton->trimLineArt, baton->trimMargin);
         baton->trimOffsetLeft = image.xoffset();
@@ -306,6 +316,20 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (image.get_typeof("gainmap-scale-factor") == G_TYPE_INT) {
             gainMapScaleFactor = image.get_int("gainmap-scale-factor");
           }
+          if (gainMapFlip) {
+            gainMap = gainMap.flip(VIPS_DIRECTION_VERTICAL);
+          }
+          if (gainMapFlop) {
+            gainMap = gainMap.flip(VIPS_DIRECTION_HORIZONTAL);
+          }
+          if (gainMapRotation != VIPS_ANGLE_D0) {
+            gainMap = gainMap.rot(gainMapRotation);
+          }
+          if (baton->topOffsetPre != -1) {
+            gainMap = gainMap.extract_area(
+              baton->leftOffsetPre / gainMapScaleFactor, baton->topOffsetPre / gainMapScaleFactor,
+              baton->widthPre / gainMapScaleFactor, baton->heightPre / gainMapScaleFactor);
+          }
         } else if (baton->withGainMap) {
           image = image.uhdr2scRGB();
         }
@@ -557,6 +581,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       // Rotate post-extract non-90 angle
       if (!baton->rotateBefore && baton->rotationAngle != 0.0) {
         MultiPageUnsupported(nPages, "Rotate");
+        KeepGainMapUnsupported(baton->keepGainMap, "Rotate");
         image = sharp::StaySequential(image);
         std::vector<double> background;
         std::tie(image, background) = sharp::ApplyAlpha(image, baton->rotationBackground, shouldPremultiplyAlpha);

package/src/utilities.cc

@@ -133,7 +133,7 @@ Napi::Value format(const Napi::CallbackInfo& info) {
     input.Set("file", hasInputFile);
     input.Set("buffer", hasInputBuffer);
     input.Set("stream", hasInputBuffer);
-    if (hasInputFile) {
+    if (oc) {
       const VipsForeignClass *fc = VIPS_FOREIGN_CLASS(oc);
       if (fc->suffs) {
         Napi::Array fileSuffix = Napi::Array::New(env);