@revizly/sharp 0.34.4-revizly1 → 0.34.4-revizly11

package/install/build.js

@@ -0,0 +1,36 @@
+// Copyright 2013 Lovell Fuller and others.
+// SPDX-License-Identifier: Apache-2.0
+
+const {
+  useGlobalLibvips,
+  globalLibvipsVersion,
+  log,
+  spawnRebuild,
+} = require('../lib/libvips');
+
+log('Attempting to build from source via node-gyp');
+log('See https://sharp.pixelplumbing.com/install#building-from-source');
+
+try {
+  const addonApi = require('node-addon-api');
+  log(`Found node-addon-api ${addonApi.version || ''}`);
+} catch (_err) {
+  log('Please add node-addon-api to your dependencies');
+  process.exit(1);
+}
+try {
+  const gyp = require('node-gyp');
+  log(`Found node-gyp ${gyp().version}`);
+} catch (_err) {
+  log('Please add node-gyp to your dependencies');
+  process.exit(1);
+}
+
+if (useGlobalLibvips(log)) {
+  log(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
+}
+
+const status = spawnRebuild();
+if (status !== 0) {
+  process.exit(status);
+}

package/install/check.js

@@ -1,39 +1,10 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 try {
-  const { useGlobalLibvips, globalLibvipsVersion, log, spawnRebuild } = require('../lib/libvips');
-
-  const buildFromSource = (msg) => {
-    log(msg);
-    log('Attempting to build from source via node-gyp');
-    try {
-      const addonApi = require('node-addon-api');
-      log(`Found node-addon-api ${addonApi.version || ''}`);
-    } catch (err) {
-      log('Please add node-addon-api to your dependencies');
-      return;
-    }
-    try {
-      const gyp = require('node-gyp');
-      log(`Found node-gyp ${gyp().version}`);
-    } catch (err) {
-      log('Please add node-gyp to your dependencies');
-      return;
-    }
-    log('See https://sharp.pixelplumbing.com/install#building-from-source');
-    const status = spawnRebuild();
-    if (status !== 0) {
-      process.exit(status);
-    }
-  };
-
-  if (useGlobalLibvips(log)) {
-    buildFromSource(`Detected globally-installed libvips v${globalLibvipsVersion()}`);
-  } else if (process.env.npm_config_build_from_source) {
-    buildFromSource('Detected --build-from-source flag');
+  const { useGlobalLibvips } = require('../lib/libvips');
+  if (useGlobalLibvips() || process.env.npm_config_build_from_source) {
+    process.exit(1);
   }
 } catch (err) {
   const summary = err.message.split(/\n/).slice(0, 1);

package/lib/channel.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const is = require('./is');
 
 /**

package/lib/colour.js

@@ -1,9 +1,7 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
-const color = require('color');
+const color = require('@img/colour');
 const is = require('./is');
 
 /**
@@ -141,7 +139,10 @@ function toColorspace (colorspace) {
  * @throws {Error} Invalid value
  */
 function _getBackgroundColourOption (value) {
-  if (is.object(value) || is.string(value)) {
+  if (
+    is.object(value) ||
+    (is.string(value) && value.length >= 3 && value.length <= 200)
+  ) {
     const colour = color(value);
     return [
       colour.red(),

package/lib/composite.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const is = require('./is');
 
 /**

package/lib/constructor.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const util = require('node:util');
 const stream = require('node:stream');
 const is = require('./is');
@@ -205,6 +203,7 @@ const debuglog = util.debuglog('sharp');
  * @throws {Error} Invalid parameters
  */
 const Sharp = function (input, options) {
+  // biome-ignore lint/complexity/noArguments: constructor factory
   if (arguments.length === 1 && !is.defined(input)) {
     throw new Error('Invalid input');
   }
@@ -353,6 +352,7 @@ const Sharp = function (input, options) {
     gifProgressive: false,
     tiffQuality: 80,
     tiffCompression: 'jpeg',
+    tiffBigtiff: false,
     tiffPredictor: 'horizontal',
     tiffPyramid: false,
     tiffMiniswhite: false,

package/lib/index.d.ts

@@ -27,7 +27,7 @@
 
 /// <reference types="node" />
 
-import { Duplex } from 'stream';
+import type { Duplex } from 'node:stream';
 
 //#region Constructor functions
 
@@ -1460,6 +1460,8 @@ declare namespace sharp {
         quality?: number | undefined;
         /** Compression options: none, jpeg, deflate, packbits, ccittfax4, lzw, webp, zstd, jp2k (optional, default 'jpeg') */
         compression?: string | undefined;
+        /** Use BigTIFF variant (has no effect when compression is none) (optional, default false) */
+        bigtiff?: boolean | undefined;
         /** Compression predictor options: none, horizontal, float (optional, default 'horizontal') */
         predictor?: string | undefined;
         /** Write an image pyramid (optional, default false) */

package/lib/index.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const Sharp = require('./constructor');
 require('./input')(Sharp);
 require('./resize')(Sharp);

package/lib/input.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const is = require('./is');
 const sharp = require('./sharp');
 
@@ -54,7 +52,7 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
   const inputDescriptor = {
     autoOrient: false,
     failOn: 'warning',
-    limitInputPixels: Math.pow(0x3FFF, 2),
+    limitInputPixels: 0x3FFF ** 2,
     ignoreIcc: false,
     unlimited: false,
     sequentialRead: true
@@ -150,7 +148,7 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
     if (is.defined(inputOptions.limitInputPixels)) {
       if (is.bool(inputOptions.limitInputPixels)) {
         inputDescriptor.limitInputPixels = inputOptions.limitInputPixels
-          ? Math.pow(0x3FFF, 2)
+          ? 0x3FFF ** 2
           : 0;
       } else if (is.integer(inputOptions.limitInputPixels) && is.inRange(inputOptions.limitInputPixels, 0, Number.MAX_SAFE_INTEGER)) {
         inputDescriptor.limitInputPixels = inputOptions.limitInputPixels;
@@ -513,7 +511,7 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
       }
     }
   } else if (is.defined(inputOptions)) {
-    throw new Error('Invalid input options ' + inputOptions);
+    throw new Error(`Invalid input options ${inputOptions}`);
   }
   return inputDescriptor;
 }
@@ -525,10 +523,8 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
  * @param {string} encoding - unused
  * @param {Function} callback
  */
-function _write (chunk, encoding, callback) {
-  /* istanbul ignore else */
+function _write (chunk, _encoding, callback) {
   if (Array.isArray(this.options.input.buffer)) {
-    /* istanbul ignore else */
     if (is.buffer(chunk)) {
       if (this.options.input.buffer.length === 0) {
         this.on('finish', () => {

package/lib/is.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 /**
  * Is this value defined and not null?
  * @private

package/lib/libvips.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const { spawnSync } = require('node:child_process');
 const { createHash } = require('node:crypto');
 const semverCoerce = require('semver/functions/coerce');
@@ -12,13 +10,13 @@ const detectLibc = require('detect-libc');
 
 const { config, engines, optionalDependencies } = require('../package.json');
 
-const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || /* istanbul ignore next */
-  config.libvips;
+/* node:coverage ignore next */
+const minimumLibvipsVersionLabelled = process.env.npm_package_config_libvips || config.libvips;
 const minimumLibvipsVersion = semverCoerce(minimumLibvipsVersionLabelled).version;
 
 const prebuiltPlatforms = [
   'darwin-arm64', 'darwin-x64',
-  'linux-arm', 'linux-arm64', 'linux-ppc64', 'linux-s390x', 'linux-x64',
+  'linux-arm', 'linux-arm64', 'linux-ppc64', 'linux-riscv64', 'linux-s390x', 'linux-x64',
   'linuxmusl-arm64', 'linuxmusl-x64',
   'win32-arm64', 'win32-ia32', 'win32-x64'
 ];
@@ -36,17 +34,16 @@ const log = (item) => {
   }
 };
 
-/* istanbul ignore next */
+/* node:coverage ignore next */
 const runtimeLibc = () => detectLibc.isNonGlibcLinuxSync() ? detectLibc.familySync() : '';
 
 const runtimePlatformArch = () => `${process.platform}${runtimeLibc()}-${process.arch}`;
 
-/* istanbul ignore next */
 const buildPlatformArch = () => {
+  /* node:coverage ignore next 3 */
   if (isEmscripten()) {
     return 'wasm32';
   }
-  /* eslint camelcase: ["error", { allow: ["^npm_config_"] }] */
   const { npm_config_arch, npm_config_platform, npm_config_libc } = process.env;
   const libc = typeof npm_config_libc === 'string' ? npm_config_libc : runtimeLibc();
   return `${npm_config_platform || process.platform}${libc}-${npm_config_arch || process.arch}`;
@@ -56,19 +53,19 @@ const buildSharpLibvipsIncludeDir = () => {
   try {
     return require(`@revizly/sharp-libvips-dev-${buildPlatformArch()}/include`);
   } catch {
+    /* node:coverage ignore next 5 */
     try {
       return require('@revizly/sharp-libvips-dev/include');
     } catch {}
   }
-  /* istanbul ignore next */
   return '';
 };
 
 const buildSharpLibvipsCPlusPlusDir = () => {
+  /* node:coverage ignore next 4 */
   try {
     return require('@revizly/sharp-libvips-dev/cplusplus');
   } catch {}
-  /* istanbul ignore next */
   return '';
 };
 
@@ -76,16 +73,17 @@ const buildSharpLibvipsLibDir = () => {
   try {
     return require(`@revizly/sharp-libvips-dev-${buildPlatformArch()}/lib`);
   } catch {
+    /* node:coverage ignore next 5 */
     try {
       return require(`@revizly/sharp-libvips-${buildPlatformArch()}/lib`);
     } catch {}
   }
-  /* istanbul ignore next */
   return '';
 };
 
+/* node:coverage disable */
+
 const isUnsupportedNodeRuntime = () => {
-  /* istanbul ignore next */
   if (process.release?.name === 'node' && process.versions) {
     if (!semverSatisfies(process.versions.node, engines.node)) {
       return { found: process.versions.node, expected: engines.node };
@@ -93,14 +91,12 @@ const isUnsupportedNodeRuntime = () => {
   }
 };
 
-/* istanbul ignore next */
 const isEmscripten = () => {
   const { CC } = process.env;
-  return Boolean(CC && CC.endsWith('/emcc'));
+  return Boolean(CC?.endsWith('/emcc'));
 };
 
 const isRosetta = () => {
-  /* istanbul ignore next */
   if (process.platform === 'darwin' && process.arch === 'x64') {
     const translated = spawnSync('sysctl sysctl.proc_translated', spawnSyncOptions).stdout;
     return (translated || '').trim() === 'sysctl.proc_translated: 1';
@@ -108,6 +104,8 @@ const isRosetta = () => {
   return false;
 };
 
+/* node:coverage enable */
+
 const sha512 = (s) => createHash('sha512').update(s).digest('hex');
 
 const yarnLocator = () => {
@@ -121,7 +119,8 @@ const yarnLocator = () => {
   return '';
 };
 
-/* istanbul ignore next */
+/* node:coverage disable */
+
 const spawnRebuild = () =>
   spawnSync(`node-gyp rebuild --directory=src ${isEmscripten() ? '--nodedir=emscripten' : ''}`, {
     ...spawnSyncOptions,
@@ -137,16 +136,17 @@ const globalLibvipsVersion = () => {
         PKG_CONFIG_PATH: pkgConfigPath()
       }
     }).stdout;
-    /* istanbul ignore next */
     return (globalLibvipsVersion || '').trim();
   } else {
     return '';
   }
 };
 
-/* istanbul ignore next */
+/* node:coverage enable */
+
 const pkgConfigPath = () => {
   if (process.platform !== 'win32') {
+    /* node:coverage ignore next 4 */
     const brewPkgConfigPath = spawnSync(
       'which brew >/dev/null 2>&1 && brew environment --plain | grep PKG_CONFIG_LIBDIR | cut -d" " -f2',
       spawnSyncOptions
@@ -178,13 +178,13 @@ const useGlobalLibvips = (logger) => {
   if (Boolean(process.env.SHARP_FORCE_GLOBAL_LIBVIPS) === true) {
     return skipSearch(true, 'SHARP_FORCE_GLOBAL_LIBVIPS', logger);
   }
-  /* istanbul ignore next */
+  /* node:coverage ignore next 3 */
   if (isRosetta()) {
     return skipSearch(false, 'Rosetta', logger);
   }
   const globalVipsVersion = globalLibvipsVersion();
-  return !!globalVipsVersion && /* istanbul ignore next */
-    semverGreaterThanOrEqualTo(globalVipsVersion, minimumLibvipsVersion);
+  /* node:coverage ignore next */
+  return !!globalVipsVersion && semverGreaterThanOrEqualTo(globalVipsVersion, minimumLibvipsVersion);
 };
 
 module.exports = {

package/lib/operation.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const is = require('./is');
 
 /**

package/lib/output.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const path = require('node:path');
 const is = require('./is');
 const sharp = require('./sharp');
@@ -845,7 +843,6 @@ function gif (options) {
   return this._updateFormatOut('gif', options);
 }
 
-/* istanbul ignore next */
 /**
  * Use these JP2 options for output image.
  *
@@ -880,6 +877,7 @@ function gif (options) {
  * @throws {Error} Invalid options
  */
 function jp2 (options) {
+  /* node:coverage ignore next 41 */
   if (!this.constructor.format.jp2k.output.buffer) {
     throw errJp2Save();
   }
@@ -976,6 +974,7 @@ function trySetAnimationOptions (source, target) {
  * @param {number} [options.quality=80] - quality, integer 1-100
  * @param {boolean} [options.force=true] - force TIFF output, otherwise attempt to use input format
  * @param {string} [options.compression='jpeg'] - compression options: none, jpeg, deflate, packbits, ccittfax4, lzw, webp, zstd, jp2k
+ * @param {boolean} [options.bigtiff=false] - use BigTIFF variant (has no effect when compression is none)
  * @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
@@ -1054,6 +1053,10 @@ function tiff (options) {
         throw is.invalidParameterError('compression', 'one of: none, jpeg, deflate, packbits, ccittfax4, lzw, webp, zstd, jp2k', options.compression);
       }
     }
+    // bigtiff
+    if (is.defined(options.bigtiff)) {
+      this._setBooleanOption('tiffBigtiff', options.bigtiff);
+    }
     // predictor
     if (is.defined(options.predictor)) {
       if (is.string(options.predictor) && is.inArray(options.predictor, ['none', 'horizontal', 'float'])) {
@@ -1502,7 +1505,6 @@ function _setBooleanOption (key, val) {
  * @private
  */
 function _read () {
-  /* istanbul ignore else */
   if (!this.options.streamOut) {
     this.options.streamOut = true;
     const stack = Error();

package/lib/resize.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const is = require('./is');
 
 /**

package/lib/sharp.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 // Inspects the runtime environment and exports the relevant sharp.node binary
 
 const { familySync, versionSync } = require('detect-libc');
@@ -17,6 +15,8 @@ const paths = [
   '@revizly/sharp-wasm32/sharp.node'
 ];
 
+/* node:coverage disable */
+
 let path, sharp;
 const errors = [];
 for (path of paths) {
@@ -24,12 +24,10 @@ for (path of paths) {
     sharp = require(path);
     break;
   } catch (err) {
-    /* istanbul ignore next */
     errors.push(err);
   }
 }
 
-/* istanbul ignore next */
 if (sharp && path.startsWith('@img/sharp-linux-x64') && !sharp._isUsingX64V2()) {
   const err = new Error('Prebuilt binaries for linux-x64 require v2 microarchitecture');
   err.code = 'Unsupported CPU';
@@ -37,7 +35,6 @@ if (sharp && path.startsWith('@img/sharp-linux-x64') && !sharp._isUsingX64V2())
   sharp = null;
 }
 
-/* istanbul ignore next */
 if (sharp) {
   module.exports = sharp;
 } else {
@@ -88,7 +85,7 @@ if (sharp) {
         `    Found ${libcFound}`,
         `    Requires ${libcRequires}`
       );
-    } catch (errEngines) {}
+    } catch (_errEngines) {}
   }
   if (isLinux && /\/snap\/core[0-9]{2}/.test(messages)) {
     help.push(

package/lib/utility.js

@@ -1,8 +1,6 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-'use strict';
-
 const events = require('node:events');
 const detectLibc = require('detect-libc');
 
@@ -57,7 +55,7 @@ const interpolators = {
 let versions = {
   vips: libvipsVersion.semver
 };
-/* istanbul ignore next */
+/* node:coverage ignore next 15 */
 if (!libvipsVersion.isGlobal) {
   if (!libvipsVersion.isWasm) {
     try {
@@ -75,7 +73,7 @@ if (!libvipsVersion.isGlobal) {
 }
 versions.sharp = require('../package.json').version;
 
-/* istanbul ignore next */
+/* node:coverage ignore next 5 */
 if (versions.heif && format.heif) {
   // Prebuilt binaries provide AV1
   format.heif.input.fileSuffix = ['.avif'];
@@ -150,7 +148,7 @@ cache(true);
 function concurrency (concurrency) {
   return sharp.concurrency(is.integer(concurrency) ? concurrency : null);
 }
-/* istanbul ignore next */
+/* node:coverage ignore next 7 */
 if (detectLibc.familySync() === detectLibc.GLIBC && !sharp._isUsingJemalloc()) {
   // Reduce default concurrency to 1 when using glibc memory allocator
   sharp.concurrency(1);

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.34.4-revizly1",
+  "version": "0.34.4-revizly11",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -92,14 +92,16 @@
     "Don Denton <don@happycollision.com>"
   ],
   "scripts": {
-    "install": "node install/check.js",
+    "build": "node install/build.js",
+    "install": "node install/check.js || npm run build",
     "clean": "rm -rf src/build/ .nyc_output/ coverage/ test/fixtures/output.*",
-    "test": "npm run test-lint && npm run test-unit && npm run test-licensing && npm run test-types",
-    "test-lint": "semistandard && cpplint",
-    "test-unit": "nyc --reporter=lcov --reporter=text --check-coverage --branches=100 mocha",
-    "test-licensing": "license-checker --production --summary --onlyAllow=\"Apache-2.0;BSD;ISC;LGPL-3.0-or-later;MIT\"",
+    "test": "npm run lint && npm run test-unit",
+    "lint": "npm run lint-cpp && npm run lint-js && npm run lint-types",
+    "lint-cpp": "cpplint --quiet src/*.h src/*.cc",
+    "lint-js": "biome lint",
+    "lint-types": "tsd --files ./test/types/sharp.test-d.ts",
     "test-leak": "./test/leak/leak.sh",
-    "test-types": "tsd",
+    "test-unit": "node --experimental-test-coverage test/unit.mjs",
     "package-from-local-build": "node npm/from-local-build.js",
     "package-release-notes": "node npm/release-notes.js",
     "docs-build": "node docs/build.mjs",
@@ -137,33 +139,30 @@
     "vips"
   ],
   "dependencies": {
-    "color": "^4.2.3",
-    "detect-libc": "^2.0.4",
-    "semver": "^7.7.2"
+    "@img/colour": "^1.0.0",
+    "detect-libc": "^2.1.2",
+    "semver": "^7.7.3"
   },
   "optionalDependencies": {
-    "@revizly/sharp-libvips-linux-arm64": "1.0.21",
-    "@revizly/sharp-libvips-linux-x64": "1.0.21",
-    "@revizly/sharp-linux-arm64": "0.34.1-revizly12",
-    "@revizly/sharp-linux-x64": "0.34.1-revizly12"
+    "@revizly/sharp-libvips-linux-arm64": "1.0.24",
+    "@revizly/sharp-libvips-linux-x64": "1.0.24",
+    "@revizly/sharp-linux-arm64": "0.34.4-revizly8",
+    "@revizly/sharp-linux-x64": "0.34.4-revizly8"
   },
   "devDependencies": {
-    "@emnapi/runtime": "^1.4.5",
-    "@revizly/sharp-libvips-dev": "1.0.21",
+    "@biomejs/biome": "^2.2.6",
+    "@cpplint/cli": "^0.1.0",
+    "@emnapi/runtime": "^1.5.0",
+    "@revizly/sharp-libvips-dev": "1.0.24",
     "@types/node": "*",
-    "cc": "^3.0.1",
-    "emnapi": "^1.4.5",
+    "emnapi": "^1.5.0",
     "exif-reader": "^2.0.2",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
-    "jsdoc-to-markdown": "^9.1.2",
-    "license-checker": "^25.0.1",
-    "mocha": "^11.7.1",
+    "jsdoc-to-markdown": "^9.1.3",
     "node-addon-api": "^8.5.0",
-    "node-gyp": "^11.4.1",
-    "nyc": "^17.1.0",
-    "semistandard": "^17.0.0",
-    "tar-fs": "^3.1.0",
+    "node-gyp": "^11.5.0",
+    "tar-fs": "^3.1.1",
     "tsd": "^0.33.0"
   },
   "license": "Apache-2.0",
@@ -171,28 +170,15 @@
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0"
   },
   "config": {
-    "libvips": ">=8.17.1"
+    "libvips": ">=8.17.2"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"
   },
-  "semistandard": {
-    "env": [
-      "mocha"
-    ]
-  },
   "cc": {
     "linelength": "120",
     "filter": [
       "build/include"
     ]
-  },
-  "nyc": {
-    "include": [
-      "lib"
-    ]
-  },
-  "tsd": {
-    "directory": "test/types/"
   }
 }

package/src/binding.gyp

@@ -168,6 +168,7 @@
                 # Ensure runtime linking is relative to sharp.node
                 '-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../sharp-libvips-<(platform_and_arch)/<(sharp_libvips_version)/lib\'',
+                '-Wl,-rpath,\'@loader_path/../node_modules/@revizly/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../node_modules/@revizly/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../node_modules/@revizly/sharp-libvips-<(platform_and_arch)/lib\'',
                 '-Wl,-rpath,\'@loader_path/../../../../../@revizly-sharp-libvips-<(platform_and_arch)-npm-<(sharp_libvips_version)-<(sharp_libvips_yarn_locator)/node_modules/@revizly/sharp-libvips-<(platform_and_arch)/lib\''

package/src/common.cc

@@ -1,18 +1,20 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
+#include <algorithm>
 #include <cstdlib>
+#include <map>
+#include <mutex>
+#include <queue>
 #include <string>
-#include <string.h>
+#include <tuple>
+#include <utility>
 #include <vector>
-#include <queue>
-#include <map>
-#include <mutex>  // NOLINT(build/c++11)
 
 #include <napi.h>
 #include <vips/vips8>
 
-#include "common.h"
+#include "./common.h"
 
 using vips::VImage;
 
@@ -396,6 +398,7 @@ namespace sharp {
       imageType == ImageType::JPEG ||
       imageType == ImageType::PNG ||
       imageType == ImageType::SVG ||
+      imageType == ImageType::TIFF ||
       imageType == ImageType::HEIF;
   }
 
@@ -420,14 +423,14 @@ namespace sharp {
               ->set("high_bitdepth", descriptor->svgHighBitdepth);
         break;
       case ImageType::TIFF:
-        option->set("tiffSubifd", descriptor->tiffSubifd);
+        option->set("subifd", descriptor->tiffSubifd);
         break;
       case ImageType::PDF:
         option->set("dpi", descriptor->density)
               ->set("background", descriptor->pdfBackground);
         break;
       case ImageType::OPENSLIDE:
-        option->set("openSlideLevel", descriptor->openSlideLevel);
+        option->set("level", descriptor->openSlideLevel);
         break;
       case ImageType::JP2:
         option->set("oneshot", descriptor->jp2Oneshot);

package/src/common.h

@@ -4,10 +4,11 @@
 #ifndef SRC_COMMON_H_
 #define SRC_COMMON_H_
 
+#include <atomic>
 #include <string>
 #include <tuple>
+#include <utility>
 #include <vector>
-#include <atomic>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -16,8 +17,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 17) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 1)
-#error "libvips version 8.17.1+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 17 && VIPS_MICRO_VERSION < 2)
+#error "libvips version 8.17.2+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)
@@ -30,7 +31,7 @@ using vips::VImage;
 
 namespace sharp {
 
-  struct InputDescriptor {  // NOLINT(runtime/indentation_namespace)
+  struct InputDescriptor {
     std::string name;
     std::string file;
     bool autoOrient;

package/src/metadata.cc

@@ -1,15 +1,17 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
+#include <cmath>
 #include <numeric>
+#include <string>
+#include <utility>
 #include <vector>
-#include <cmath>
 
 #include <napi.h>
 #include <vips/vips8>
 
-#include "common.h"
-#include "metadata.h"
+#include "./common.h"
+#include "./metadata.h"
 
 static void* readPNGComment(VipsImage *image, const char *field, GValue *value, void *p);
 
@@ -261,11 +263,11 @@ class MetadataWorker : public Napi::AsyncWorker {
         info.Set("iptc", Napi::Buffer<char>::NewOrCopy(env, baton->iptc, baton->iptcLength, sharp::FreeCallback));
       }
       if (baton->xmpLength > 0) {
-        info.Set("xmp", Napi::Buffer<char>::NewOrCopy(env, baton->xmp, baton->xmpLength, sharp::FreeCallback));
         if (g_utf8_validate(static_cast<char const *>(baton->xmp), baton->xmpLength, nullptr)) {
           info.Set("xmpAsString",
             Napi::String::New(env, static_cast<char const *>(baton->xmp), baton->xmpLength));
         }
+        info.Set("xmp", Napi::Buffer<char>::NewOrCopy(env, baton->xmp, baton->xmpLength, sharp::FreeCallback));
       }
       if (baton->tifftagPhotoshopLength > 0) {
         info.Set("tifftagPhotoshop",

package/src/metadata.h

@@ -5,6 +5,7 @@
 #define SRC_METADATA_H_
 
 #include <string>
+#include <vector>
 #include <napi.h>
 
 #include "./common.h"

package/src/operations.cc

@@ -8,8 +8,8 @@
 #include <vector>
 #include <vips/vips8>
 
-#include "common.h"
-#include "operations.h"
+#include "./common.h"
+#include "./operations.h"
 
 using vips::VImage;
 using vips::VError;

package/src/operations.h

@@ -8,6 +8,7 @@
 #include <functional>
 #include <memory>
 #include <tuple>
+#include <vector>
 #include <vips/vips8>
 
 using vips::VImage;

package/src/pipeline.cc

@@ -3,7 +3,7 @@
 
 #include <algorithm>
 #include <cmath>
-#include <filesystem>
+#include <filesystem>  // NOLINT(build/c++17)
 #include <map>
 #include <memory>
 #include <numeric>
@@ -17,9 +17,9 @@
 #include <vips/vips8>
 #include <napi.h>
 
-#include "common.h"
-#include "operations.h"
-#include "pipeline.h"
+#include "./common.h"
+#include "./operations.h"
+#include "./pipeline.h"
 
 class PipelineWorker : public Napi::AsyncWorker {
  public:
@@ -1009,6 +1009,7 @@ class PipelineWorker : public Napi::AsyncWorker {
             ->set("Q", baton->tiffQuality)
             ->set("bitdepth", baton->tiffBitdepth)
             ->set("compression", baton->tiffCompression)
+            ->set("bigtiff", baton->tiffBigtiff)
             ->set("miniswhite", baton->tiffMiniswhite)
             ->set("predictor", baton->tiffPredictor)
             ->set("pyramid", baton->tiffPyramid)
@@ -1211,6 +1212,7 @@ class PipelineWorker : public Napi::AsyncWorker {
             ->set("Q", baton->tiffQuality)
             ->set("bitdepth", baton->tiffBitdepth)
             ->set("compression", baton->tiffCompression)
+            ->set("bigtiff", baton->tiffBigtiff)
             ->set("miniswhite", baton->tiffMiniswhite)
             ->set("predictor", baton->tiffPredictor)
             ->set("pyramid", baton->tiffPyramid)
@@ -1276,7 +1278,12 @@ class PipelineWorker : public Napi::AsyncWorker {
       if (what && what[0]) {
         (baton->err).append(what);
       } else {
-        (baton->err).append("Unknown error");
+        if (baton->input->failOn == VIPS_FAIL_ON_WARNING) {
+          (baton->err).append("Warning treated as error due to failOn setting");
+          baton->errUseWarning = true;
+        } else {
+          (baton->err).append("Unknown error");
+        }
       }
     }
     // Clean up libvips' per-request data and threads
@@ -1291,7 +1298,11 @@ class PipelineWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
+      if (baton->errUseWarning) {
+        (baton->err).append("\n").append(warning);
+      } else {
+        debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
+      }
       warning = sharp::VipsWarningPop();
     }
 
@@ -1750,6 +1761,7 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
   baton->gifReuse = sharp::AttrAsBool(options, "gifReuse");
   baton->gifProgressive = sharp::AttrAsBool(options, "gifProgressive");
   baton->tiffQuality = sharp::AttrAsUint32(options, "tiffQuality");
+  baton->tiffBigtiff = sharp::AttrAsBool(options, "tiffBigtiff");
   baton->tiffPyramid = sharp::AttrAsBool(options, "tiffPyramid");
   baton->tiffMiniswhite = sharp::AttrAsBool(options, "tiffMiniswhite");
   baton->tiffBitdepth = sharp::AttrAsUint32(options, "tiffBitdepth");

package/src/pipeline.h

@@ -6,8 +6,8 @@
 
 #include <memory>
 #include <string>
-#include <vector>
 #include <unordered_map>
+#include <vector>
 
 #include <napi.h>
 #include <vips/vips8>
@@ -175,6 +175,7 @@ struct PipelineBaton {
   bool gifProgressive;
   int tiffQuality;
   VipsForeignTiffCompression tiffCompression;
+  bool tiffBigtiff;
   VipsForeignTiffPredictor tiffPredictor;
   bool tiffPyramid;
   int tiffBitdepth;
@@ -197,6 +198,7 @@ struct PipelineBaton {
   bool jxlLossless;
   VipsBandFormat rawDepth;
   std::string err;
+  bool errUseWarning;
   int keepMetadata;
   int withMetadataOrientation;
   double withMetadataDensity;
@@ -350,6 +352,7 @@ struct PipelineBaton {
     gifProgressive(false),
     tiffQuality(80),
     tiffCompression(VIPS_FOREIGN_TIFF_COMPRESSION_JPEG),
+    tiffBigtiff(false),
     tiffPredictor(VIPS_FOREIGN_TIFF_PREDICTOR_HORIZONTAL),
     tiffPyramid(false),
     tiffBitdepth(8),
@@ -371,6 +374,7 @@ struct PipelineBaton {
     jxlEffort(7),
     jxlLossless(false),
     rawDepth(VIPS_FORMAT_UCHAR),
+    errUseWarning(false),
     keepMetadata(0),
     withMetadataOrientation(-1),
     withMetadataDensity(0.0),

package/src/sharp.cc

@@ -1,16 +1,16 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
-#include <mutex>  // NOLINT(build/c++11)
+#include <mutex>
 
 #include <napi.h>
 #include <vips/vips8>
 
-#include "common.h"
-#include "metadata.h"
-#include "pipeline.h"
-#include "utilities.h"
-#include "stats.h"
+#include "./common.h"
+#include "./metadata.h"
+#include "./pipeline.h"
+#include "./stats.h"
+#include "./utilities.h"
 
 Napi::Object init(Napi::Env env, Napi::Object exports) {
   static std::once_flag sharp_vips_init_once;

package/src/stats.cc

@@ -1,15 +1,16 @@
 // Copyright 2013 Lovell Fuller and others.
 // SPDX-License-Identifier: Apache-2.0
 
+#include <iostream>
 #include <numeric>
+#include <string>
 #include <vector>
-#include <iostream>
 
 #include <napi.h>
 #include <vips/vips8>
 
-#include "common.h"
-#include "stats.h"
+#include "./common.h"
+#include "./stats.h"
 
 class StatsWorker : public Napi::AsyncWorker {
  public:

package/src/stats.h

@@ -5,6 +5,7 @@
 #define SRC_STATS_H_
 
 #include <string>
+#include <vector>
 #include <napi.h>
 
 #include "./common.h"
@@ -24,7 +25,7 @@ struct ChannelStats {
 
   ChannelStats(int minVal, int maxVal, double sumVal, double squaresSumVal,
     double meanVal, double stdevVal, int minXVal, int minYVal, int maxXVal, int maxYVal):
-    min(minVal), max(maxVal), sum(sumVal), squaresSum(squaresSumVal),
+    min(minVal), max(maxVal), sum(sumVal), squaresSum(squaresSumVal),  // NOLINT(build/include_what_you_use)
     mean(meanVal), stdev(stdevVal), minX(minXVal), minY(minYVal), maxX(maxXVal), maxY(maxYVal) {}
 };
 

package/src/utilities.cc

@@ -2,16 +2,16 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <cmath>
-#include <string>
 #include <cstdio>
+#include <string>
 
 #include <napi.h>
 #include <vips/vips8>
 #include <vips/vector.h>
 
-#include "common.h"
-#include "operations.h"
-#include "utilities.h"
+#include "./common.h"
+#include "./operations.h"
+#include "./utilities.h"
 
 /*
   Get and set cache limits