@revizly/sharp 0.35.0-revizly53 → 0.35.0-revizly55

package/dist/index.d.cts

@@ -1462,8 +1462,8 @@ declare namespace sharp {
     interface HeifOptions extends OutputOptions {
         /** quality, integer 1-100 (optional, default 50) */
         quality?: number | undefined;
-        /** compression format: av1, hevc (optional, default 'av1') */
-        compression?: HeifCompression | undefined;
+        /** compression format: av1, hevc */
+        compression: HeifCompression;
         /** use lossless compression (optional, default false) */
         lossless?: boolean | undefined;
         /** Level of CPU effort to reduce file size, between 0 (fastest) and 9 (slowest) (optional, default 4) */
@@ -1472,7 +1472,7 @@ declare namespace sharp {
         chromaSubsampling?: string | undefined;
         /** Set bitdepth to 8, 10 or 12 bit (optional, default 8) */
         bitdepth?: 8 | 10 | 12 | undefined;
-        /** Tune output for a quality metric, one of 'auto', 'iq', 'psnr' or 'ssim' (optional, default 'auto') */
+        /** Tune output for a quality metric, one of 'auto' (av1 default), 'iq' (av1 only), 'psnr' or 'ssim' (hevc default) */
         tune?: HeifTune | undefined;
         /** Which encoder libheif uses (must be compiled in) (optional, default 'auto') */
         encoder?: 'auto' | 'aom' | 'rav1e' | 'svt' | 'x265' | undefined;

package/dist/index.d.mts

@@ -1456,8 +1456,8 @@ export interface AvifOptions extends OutputOptions {
 export interface HeifOptions extends OutputOptions {
     /** quality, integer 1-100 (optional, default 50) */
     quality?: number | undefined;
-    /** compression format: av1, hevc (optional, default 'av1') */
-    compression?: HeifCompression | undefined;
+    /** compression format: av1, hevc */
+    compression: HeifCompression;
     /** use lossless compression (optional, default false) */
     lossless?: boolean | undefined;
     /** Level of CPU effort to reduce file size, between 0 (fastest) and 9 (slowest) (optional, default 4) */
@@ -1466,7 +1466,7 @@ export interface HeifOptions extends OutputOptions {
     chromaSubsampling?: string | undefined;
     /** Set bitdepth to 8, 10 or 12 bit (optional, default 8) */
     bitdepth?: 8 | 10 | 12 | undefined;
-    /** Tune output for a quality metric, one of 'auto', 'iq', 'psnr' or 'ssim' (optional, default 'auto') */
+    /** Tune output for a quality metric, one of 'auto' (av1 default), 'iq' (av1 only), 'psnr' or 'ssim' (hevc default) */
     tune?: HeifTune | undefined;
     /** Which encoder libheif uses (must be compiled in) (optional, default 'auto') */
     encoder?: 'auto' | 'aom' | 'rav1e' | 'svt' | 'x265' | undefined;

package/dist/is.cjs

@@ -13,7 +13,7 @@ const defined = (val) => typeof val !== 'undefined' && val !== null;
  * Is this value an object?
  * @private
  */
-const object = (val) => typeof val === 'object';
+const object = (val) => typeof val === 'object' && val !== null;
 
 /**
  * Is this value a plain object?

package/dist/is.mjs

@@ -13,7 +13,7 @@ const defined = (val) => typeof val !== 'undefined' && val !== null;
  * Is this value an object?
  * @private
  */
-const object = (val) => typeof val === 'object';
+const object = (val) => typeof val === 'object' && val !== null;
 
 /**
  * Is this value a plain object?

package/dist/output.cjs

@@ -205,15 +205,15 @@ function toUint8Array () {
  *   .withDensity(96)
  *   .toBuffer();
  *
- * @param {number} density Number of pixels per inch (DPI).
+ * @param {number} density Number of pixels per inch (DPI), between 1 and 100000.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
 function withDensity (density) {
-  if (is.number(density) && density > 0) {
+  if (is.number(density) && is.inRange(density, 1, 100000)) {
     this.options.withMetadataDensity = density;
   } else {
-    throw is.invalidParameterError('density', 'positive number', density);
+    throw is.invalidParameterError('density', 'number between 1 and 100000', density);
   }
   return this.keepExif();
 }
@@ -520,7 +520,7 @@ function keepMetadata () {
  *
  * @param {Object} [options]
  * @param {number} [options.orientation] Used to update the EXIF `Orientation` tag, integer between 1 and 8.
- * @param {number} [options.density] Number of pixels per inch (DPI).
+ * @param {number} [options.density] Number of pixels per inch (DPI), between 1 and 100000.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
@@ -536,10 +536,10 @@ function withMetadata (options) {
       }
     }
     if (is.defined(options.density)) {
-      if (is.number(options.density) && options.density > 0) {
+      if (is.number(options.density) && is.inRange(options.density, 1, 100000)) {
         this.options.withMetadataDensity = options.density;
       } else {
-        throw is.invalidParameterError('density', 'positive number', options.density);
+        throw is.invalidParameterError('density', 'number between 1 and 100000', options.density);
       }
     }
     if (is.defined(options.icc)) {
@@ -1250,7 +1250,7 @@ function avif (options) {
  * @param {number} [options.effort=4] - CPU effort, between 0 (fastest) and 9 (slowest)
  * @param {string} [options.chromaSubsampling='4:4:4'] - set to '4:2:0' to use chroma subsampling
  * @param {number} [options.bitdepth=8] - set bitdepth to 8, 10 or 12 bit
- * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (default), 'iq', 'psnr' or 'ssim'
+ * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (av1 default), 'iq' (av1 only), 'psnr' or 'ssim' (hevc default)
  * @returns {Sharp}
  * @throws {Error} Invalid options
  */
@@ -1258,6 +1258,9 @@ function heif (options) {
   if (is.object(options)) {
     if (is.string(options.compression) && is.inArray(options.compression, ['av1', 'hevc'])) {
       this.options.heifCompression = options.compression;
+      if (options.compression === 'hevc' && this.options.heifTune === 'auto') {
+        this.options.heifTune = 'ssim';
+      }
     } else {
       throw is.invalidParameterError('compression', 'one of: av1, hevc', options.compression);
     }
@@ -1297,14 +1300,24 @@ function heif (options) {
       }
     }
     if (is.defined(options.tune)) {
-      if (is.string(options.tune) && is.inArray(options.tune, ['auto', 'iq', 'psnr', 'ssim'])) {
-        if (this.options.heifLossless && options.tune === 'iq') {
-          this.options.heifTune = 'ssim';
-        } else {
+      if (is.string(options.tune)) {
+        if (this.options.heifCompression === 'av1') {
+          if (is.inArray(options.tune, ['auto', 'iq', 'psnr', 'ssim'])) {
+            if (this.options.heifLossless && options.tune === 'iq') {
+              this.options.heifTune = 'ssim';
+            } else {
+              this.options.heifTune = options.tune;
+            }
+          } else {
+            throw is.invalidParameterError('tune', 'one of: auto, iq, psnr, ssim', options.tune);
+          }
+        } else if (is.inArray(options.tune, ['psnr', 'ssim'])) {
           this.options.heifTune = options.tune;
+        } else {
+          throw is.invalidParameterError('tune', 'one of: psnr, ssim', options.tune);
         }
       } else {
-        throw is.invalidParameterError('tune', 'one of: auto, iq, psnr, ssim', options.tune);
+        throw is.invalidParameterError('tune', 'string', options.tune);
       }
     }
     if (is.defined(options.encoder)) {

package/dist/output.mjs

@@ -205,15 +205,15 @@ function toUint8Array () {
  *   .withDensity(96)
  *   .toBuffer();
  *
- * @param {number} density Number of pixels per inch (DPI).
+ * @param {number} density Number of pixels per inch (DPI), between 1 and 100000.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
 function withDensity (density) {
-  if (is.number(density) && density > 0) {
+  if (is.number(density) && is.inRange(density, 1, 100000)) {
     this.options.withMetadataDensity = density;
   } else {
-    throw is.invalidParameterError('density', 'positive number', density);
+    throw is.invalidParameterError('density', 'number between 1 and 100000', density);
   }
   return this.keepExif();
 }
@@ -520,7 +520,7 @@ function keepMetadata () {
  *
  * @param {Object} [options]
  * @param {number} [options.orientation] Used to update the EXIF `Orientation` tag, integer between 1 and 8.
- * @param {number} [options.density] Number of pixels per inch (DPI).
+ * @param {number} [options.density] Number of pixels per inch (DPI), between 1 and 100000.
  * @returns {Sharp}
  * @throws {Error} Invalid parameters
  */
@@ -536,10 +536,10 @@ function withMetadata (options) {
       }
     }
     if (is.defined(options.density)) {
-      if (is.number(options.density) && options.density > 0) {
+      if (is.number(options.density) && is.inRange(options.density, 1, 100000)) {
         this.options.withMetadataDensity = options.density;
       } else {
-        throw is.invalidParameterError('density', 'positive number', options.density);
+        throw is.invalidParameterError('density', 'number between 1 and 100000', options.density);
       }
     }
     if (is.defined(options.icc)) {
@@ -1250,7 +1250,7 @@ function avif (options) {
  * @param {number} [options.effort=4] - CPU effort, between 0 (fastest) and 9 (slowest)
  * @param {string} [options.chromaSubsampling='4:4:4'] - set to '4:2:0' to use chroma subsampling
  * @param {number} [options.bitdepth=8] - set bitdepth to 8, 10 or 12 bit
- * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (default), 'iq', 'psnr' or 'ssim'
+ * @param {string} [options.tune='auto'] - tune output for a quality metric, one of 'auto' (av1 default), 'iq' (av1 only), 'psnr' or 'ssim' (hevc default)
  * @returns {Sharp}
  * @throws {Error} Invalid options
  */
@@ -1258,6 +1258,9 @@ function heif (options) {
   if (is.object(options)) {
     if (is.string(options.compression) && is.inArray(options.compression, ['av1', 'hevc'])) {
       this.options.heifCompression = options.compression;
+      if (options.compression === 'hevc' && this.options.heifTune === 'auto') {
+        this.options.heifTune = 'ssim';
+      }
     } else {
       throw is.invalidParameterError('compression', 'one of: av1, hevc', options.compression);
     }
@@ -1297,14 +1300,24 @@ function heif (options) {
       }
     }
     if (is.defined(options.tune)) {
-      if (is.string(options.tune) && is.inArray(options.tune, ['auto', 'iq', 'psnr', 'ssim'])) {
-        if (this.options.heifLossless && options.tune === 'iq') {
-          this.options.heifTune = 'ssim';
-        } else {
+      if (is.string(options.tune)) {
+        if (this.options.heifCompression === 'av1') {
+          if (is.inArray(options.tune, ['auto', 'iq', 'psnr', 'ssim'])) {
+            if (this.options.heifLossless && options.tune === 'iq') {
+              this.options.heifTune = 'ssim';
+            } else {
+              this.options.heifTune = options.tune;
+            }
+          } else {
+            throw is.invalidParameterError('tune', 'one of: auto, iq, psnr, ssim', options.tune);
+          }
+        } else if (is.inArray(options.tune, ['psnr', 'ssim'])) {
           this.options.heifTune = options.tune;
+        } else {
+          throw is.invalidParameterError('tune', 'one of: psnr, ssim', options.tune);
         }
       } else {
-        throw is.invalidParameterError('tune', 'one of: auto, iq, psnr, ssim', options.tune);
+        throw is.invalidParameterError('tune', 'string', options.tune);
       }
     }
     if (is.defined(options.encoder)) {

package/lib/index.d.ts

@@ -1462,8 +1462,8 @@ declare namespace sharp {
     interface HeifOptions extends OutputOptions {
         /** quality, integer 1-100 (optional, default 50) */
         quality?: number | undefined;
-        /** compression format: av1, hevc (optional, default 'av1') */
-        compression?: HeifCompression | undefined;
+        /** compression format: av1, hevc */
+        compression: HeifCompression;
         /** use lossless compression (optional, default false) */
         lossless?: boolean | undefined;
         /** Level of CPU effort to reduce file size, between 0 (fastest) and 9 (slowest) (optional, default 4) */
@@ -1472,7 +1472,7 @@ declare namespace sharp {
         chromaSubsampling?: string | undefined;
         /** Set bitdepth to 8, 10 or 12 bit (optional, default 8) */
         bitdepth?: 8 | 10 | 12 | undefined;
-        /** Tune output for a quality metric, one of 'auto', 'iq', 'psnr' or 'ssim' (optional, default 'auto') */
+        /** Tune output for a quality metric, one of 'auto' (av1 default), 'iq' (av1 only), 'psnr' or 'ssim' (hevc default) */
         tune?: HeifTune | undefined;
         /** Which encoder libheif uses (must be compiled in) (optional, default 'auto') */
         encoder?: 'auto' | 'aom' | 'rav1e' | 'svt' | 'x265' | 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-revizly53",
+  "version": "0.35.0-revizly55",
   "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.54",
-    "@revizly/sharp-libvips-linux-x64": "1.0.54",
-    "@revizly/sharp-linux-arm64": "0.35.0-revizly53",
-    "@revizly/sharp-linux-x64": "0.35.0-revizly53"
+    "@revizly/sharp-libvips-linux-arm64": "1.0.55",
+    "@revizly/sharp-libvips-linux-x64": "1.0.55",
+    "@revizly/sharp-linux-arm64": "0.35.0-revizly55",
+    "@revizly/sharp-linux-x64": "0.35.0-revizly55"
   },
   "peerDependenciesMeta": {
     "@types/node": {
@@ -177,7 +177,7 @@
     "@biomejs/biome": "^2.5.14",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.11.3",
-    "@revizly/sharp-libvips-dev": "1.0.54",
+    "@revizly/sharp-libvips-dev": "1.0.55",
     "@types/node": "*",
     "emnapi": "^1.11.3",
     "exif-reader": "^2.0.3",

package/src/common.cc

@@ -399,6 +399,7 @@ namespace sharp {
       imageType == ImageType::JP2 ||
       imageType == ImageType::TIFF ||
       imageType == ImageType::HEIF ||
+      imageType == ImageType::JXL ||
       imageType == ImageType::PDF;
   }
 

package/src/pipeline.cc

@@ -40,6 +40,7 @@ class PipelineWorker : public Napi::AsyncWorker {
     // Increment processing task counter
     sharp::counterProcess++;
 
+    std::pair<char*, size_t> inputProfile(nullptr, 0);
     try {
       // Open input
       vips::VImage image;
@@ -325,7 +326,7 @@ class PipelineWorker : public Napi::AsyncWorker {
       int gainMapScaleFactor = 1;
       if (sharp::HasGainMap(image)) {
         if (baton->keepGainMap) {
-          gainMap = image.gainmap();
+          gainMap = image.gainmap().copy_memory();
           if (image.get_typeof("gainmap-scale-factor") == G_TYPE_INT) {
             gainMapScaleFactor = image.get_int("gainmap-scale-factor");
           }
@@ -378,7 +379,6 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
 
       // Ensure we're using a device-independent colour space
-      std::pair<char*, size_t> inputProfile(nullptr, 0);
       if ((baton->keepMetadata & VIPS_FOREIGN_KEEP_ICC) && baton->withIccProfile.empty()) {
         // Cache input profile for use with output
         inputProfile = sharp::GetProfile(image);
@@ -481,14 +481,14 @@ class PipelineWorker : public Napi::AsyncWorker {
         }
         image = image.rot(autoRotation);
         if (baton->keepGainMap) {
-          gainMap = sharp::StaySequential(gainMap).rot(autoRotation);
+          gainMap = gainMap.rot(autoRotation);
         }
       }
       // Mirror vertically (up-down) about the x-axis
       if (baton->flip) {
         image = image.flip(VIPS_DIRECTION_VERTICAL);
         if (baton->keepGainMap) {
-          gainMap = sharp::StaySequential(gainMap).flip(VIPS_DIRECTION_VERTICAL);
+          gainMap = gainMap.flip(VIPS_DIRECTION_VERTICAL);
         }
       }
       // Mirror horizontally (left-right) about the y-axis
@@ -505,7 +505,7 @@ class PipelineWorker : public Napi::AsyncWorker {
         }
         image = image.rot(rotation);
         if (baton->keepGainMap) {
-          gainMap = sharp::StaySequential(gainMap).rot(rotation);
+          gainMap = gainMap.rot(rotation);
         }
       }
 
@@ -931,11 +931,8 @@ class PipelineWorker : public Napi::AsyncWorker {
         image = image.colourspace(baton->colourspace, VImage::option()->set("source_space", image.interpretation()));
         if (inputProfile.first != nullptr && baton->withIccProfile.empty()) {
           image = sharp::SetProfile(image, inputProfile);
-        } else {
-          g_free(inputProfile.first);
+          inputProfile.first = nullptr;
         }
-      } else {
-        g_free(inputProfile.first);
       }
 
       // Extract channel
@@ -945,10 +942,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->extractChannel == 3 && image.has_alpha()) {
             baton->extractChannel = image.bands() - 1;
           } else {
-            (baton->err)
-              .append("Cannot extract channel ").append(std::to_string(baton->extractChannel))
-              .append(" from image with channels 0-").append(std::to_string(image.bands() - 1));
-            return Error();
+            throw std::runtime_error(
+              std::string("Cannot extract channel ").append(std::to_string(baton->extractChannel))
+              .append(" from image with channels 0-").append(std::to_string(image.bands() - 1)));
           }
         }
         VipsInterpretation colourspace = sharp::Is16Bit(image.interpretation())
@@ -1206,7 +1202,6 @@ class PipelineWorker : public Napi::AsyncWorker {
         } else if (baton->formatOut == "jxl" ||
           (baton->formatOut == "input" && inputImageType == sharp::ImageType::JXL)) {
           // Write JXL to buffer
-          image = sharp::RemoveAnimationProperties(image);
           VipsArea *area = reinterpret_cast<VipsArea*>(image.jxlsave_buffer(VImage::option()
             ->set("keep", baton->keepMetadata)
             ->set("distance", baton->jxlDistance)
@@ -1399,7 +1394,6 @@ class PipelineWorker : public Napi::AsyncWorker {
         } else if (baton->formatOut == "jxl" || (mightMatchInput && isJxl) ||
           (willMatchInput && inputImageType == sharp::ImageType::JXL)) {
           // Write JXL to file
-          image = sharp::RemoveAnimationProperties(image);
           image.jxlsave(const_cast<char*>(baton->fileOut.data()), VImage::option()
             ->set("keep", baton->keepMetadata)
             ->set("distance", baton->jxlDistance)
@@ -1446,6 +1440,8 @@ class PipelineWorker : public Napi::AsyncWorker {
         }
       }
     }
+    g_free(inputProfile.first);
+
     // Clean up libvips' per-request data and threads
     vips_error_clear();
     vips_thread_shutdown();