sharp 0.35.0-rc.0 → 0.35.0-rc.2

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.0-rc.0",
+  "version": "0.35.0-rc.2",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -103,6 +103,7 @@
     "test-leak": "./test/leak/leak.sh",
     "test-unit": "node --experimental-test-coverage test/unit.mjs",
     "package-from-local-build": "node npm/from-local-build.js",
+    "package-wasm-wrappers": "node npm/wasm-wrappers.js",
     "package-release-notes": "node npm/release-notes.js",
     "docs-build": "node docs/build.mjs",
     "docs-serve": "cd docs && npm start",
@@ -139,53 +140,54 @@
     "vips"
   ],
   "dependencies": {
-    "@img/colour": "^1.0.0",
+    "@img/colour": "^1.1.0",
     "detect-libc": "^2.1.2",
-    "semver": "^7.7.3"
+    "semver": "^7.7.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.35.0-rc.0",
-    "@img/sharp-darwin-x64": "0.35.0-rc.0",
-    "@img/sharp-libvips-darwin-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-darwin-x64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-arm": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-ppc64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-riscv64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-s390x": "1.3.0-rc.2",
-    "@img/sharp-libvips-linux-x64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-linuxmusl-x64": "1.3.0-rc.2",
-    "@img/sharp-linux-arm": "0.35.0-rc.0",
-    "@img/sharp-linux-arm64": "0.35.0-rc.0",
-    "@img/sharp-linux-ppc64": "0.35.0-rc.0",
-    "@img/sharp-linux-riscv64": "0.35.0-rc.0",
-    "@img/sharp-linux-s390x": "0.35.0-rc.0",
-    "@img/sharp-linux-x64": "0.35.0-rc.0",
-    "@img/sharp-linuxmusl-arm64": "0.35.0-rc.0",
-    "@img/sharp-linuxmusl-x64": "0.35.0-rc.0",
-    "@img/sharp-wasm32": "0.35.0-rc.0",
-    "@img/sharp-win32-arm64": "0.35.0-rc.0",
-    "@img/sharp-win32-ia32": "0.35.0-rc.0",
-    "@img/sharp-win32-x64": "0.35.0-rc.0"
+    "@img/sharp-darwin-arm64": "0.35.0-rc.2",
+    "@img/sharp-darwin-x64": "0.35.0-rc.2",
+    "@img/sharp-freebsd-wasm32": "0.35.0-rc.2",
+    "@img/sharp-libvips-darwin-arm64": "1.3.0-rc.4",
+    "@img/sharp-libvips-darwin-x64": "1.3.0-rc.4",
+    "@img/sharp-libvips-linux-arm": "1.3.0-rc.4",
+    "@img/sharp-libvips-linux-arm64": "1.3.0-rc.4",
+    "@img/sharp-libvips-linux-ppc64": "1.3.0-rc.4",
+    "@img/sharp-libvips-linux-riscv64": "1.3.0-rc.4",
+    "@img/sharp-libvips-linux-s390x": "1.3.0-rc.4",
+    "@img/sharp-libvips-linux-x64": "1.3.0-rc.4",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.3.0-rc.4",
+    "@img/sharp-libvips-linuxmusl-x64": "1.3.0-rc.4",
+    "@img/sharp-linux-arm": "0.35.0-rc.2",
+    "@img/sharp-linux-arm64": "0.35.0-rc.2",
+    "@img/sharp-linux-ppc64": "0.35.0-rc.2",
+    "@img/sharp-linux-riscv64": "0.35.0-rc.2",
+    "@img/sharp-linux-s390x": "0.35.0-rc.2",
+    "@img/sharp-linux-x64": "0.35.0-rc.2",
+    "@img/sharp-linuxmusl-arm64": "0.35.0-rc.2",
+    "@img/sharp-linuxmusl-x64": "0.35.0-rc.2",
+    "@img/sharp-webcontainers-wasm32": "0.35.0-rc.2",
+    "@img/sharp-win32-arm64": "0.35.0-rc.2",
+    "@img/sharp-win32-ia32": "0.35.0-rc.2",
+    "@img/sharp-win32-x64": "0.35.0-rc.2"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.3.10",
+    "@biomejs/biome": "^2.4.10",
     "@cpplint/cli": "^0.1.0",
-    "@emnapi/runtime": "^1.7.1",
-    "@img/sharp-libvips-dev": "1.3.0-rc.2",
-    "@img/sharp-libvips-dev-wasm32": "1.3.0-rc.2",
-    "@img/sharp-libvips-win32-arm64": "1.3.0-rc.2",
-    "@img/sharp-libvips-win32-ia32": "1.3.0-rc.2",
-    "@img/sharp-libvips-win32-x64": "1.3.0-rc.2",
+    "@emnapi/runtime": "^1.9.2",
+    "@img/sharp-libvips-dev": "1.3.0-rc.4",
+    "@img/sharp-libvips-dev-wasm32": "1.3.0-rc.4",
+    "@img/sharp-libvips-win32-arm64": "1.3.0-rc.4",
+    "@img/sharp-libvips-win32-ia32": "1.3.0-rc.4",
+    "@img/sharp-libvips-win32-x64": "1.3.0-rc.4",
     "@types/node": "*",
-    "emnapi": "^1.7.1",
+    "emnapi": "^1.9.2",
     "exif-reader": "^2.0.3",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
-    "node-addon-api": "^8.5.0",
-    "node-gyp": "^12.1.0",
-    "tar-fs": "^3.1.1",
+    "node-addon-api": "^8.7.0",
+    "node-gyp": "^12.2.0",
+    "tar-fs": "^3.1.2",
     "tsd": "^0.33.0"
   },
   "license": "Apache-2.0",
@@ -193,7 +195,7 @@
     "node": ">=20.9.0"
   },
   "config": {
-    "libvips": ">=8.18.0"
+    "libvips": ">=8.18.2"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/binding.gyp

@@ -21,6 +21,7 @@
         'defines': [
           '_VIPS_PUBLIC=__declspec(dllexport)',
           '_ALLOW_KEYWORD_MACROS',
+          '_HAS_EXCEPTIONS=1',
           'G_DISABLE_ASSERT',
           'G_DISABLE_CAST_CHECKS',
           'G_DISABLE_CHECKS'
@@ -148,7 +149,8 @@
           ['OS == "win"', {
             'defines': [
               '_ALLOW_KEYWORD_MACROS',
-              '_FILE_OFFSET_BITS=64'
+              '_FILE_OFFSET_BITS=64',
+              '_HAS_EXCEPTIONS=1'
             ],
             'link_settings': {
               'libraries': [
@@ -203,14 +205,16 @@
           }],
           ['OS == "emscripten"', {
             'product_extension': 'node.js',
+            'cflags_cc': [
+              '-fwasm-exceptions'
+            ],
             'link_settings': {
               'ldflags': [
-                '-fexceptions',
+                '-fwasm-exceptions',
                 '--pre-js=<!(node -p "require.resolve(\'./emscripten/pre.js\')")',
                 '-Oz',
                 '-sALLOW_MEMORY_GROWTH',
                 '-sENVIRONMENT=node',
-                '-sEXPORTED_FUNCTIONS=emnapiInit,_vips_shutdown,_uv_library_shutdown',
                 '-sNODERAWFS',
                 '-sWASM_ASYNC_COMPILATION=0'
               ],

package/src/common.cc

@@ -426,7 +426,7 @@ namespace sharp {
     }
     if (ImageTypeSupportsPage(imageType)) {
       option->set("n", descriptor->pages);
-      option->set("page", descriptor->page);
+      option->set("page", std::max(0, descriptor->page));
     }
     switch (imageType) {
       case ImageType::SVG:
@@ -456,6 +456,22 @@ namespace sharp {
     return option;
   }
 
+  /*
+    Should HEIF image be re-opened using the primary item?
+  */
+  static bool HeifPrimaryPageReopen(VImage image, InputDescriptor *descriptor) {
+    if (image.get_typeof(VIPS_META_N_PAGES) == G_TYPE_INT && image.get_typeof("heif-primary") == G_TYPE_INT) {
+      if (image.get_int(VIPS_META_N_PAGES) > 1 && descriptor->pages == 1 && descriptor->page == -1) {
+        int const pagePrimary = image.get_int("heif-primary");
+        if (pagePrimary != 0) {
+          descriptor->page = pagePrimary;
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+
   /*
     Open an image from the given InputDescriptor (filesystem, compressed buffer, raw pixel data)
   */
@@ -490,12 +506,15 @@ namespace sharp {
             image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
             if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
               image = SetDensity(image, descriptor->density);
+            } else if (imageType == ImageType::HEIF && HeifPrimaryPageReopen(image, descriptor)) {
+              option = GetOptionsForImageType(imageType, descriptor);
+              image = VImage::new_from_buffer(descriptor->buffer, descriptor->bufferLength, nullptr, option);
             }
-          } catch (vips::VError const &err) {
-            throw vips::VError(std::string("Input buffer has corrupt header: ") + err.what());
+          } catch (std::runtime_error const &err) {
+            throw std::runtime_error(std::string("Input buffer has corrupt header: ") + err.what());
           }
         } else {
-          throw vips::VError("Input buffer contains unsupported image format");
+          throw std::runtime_error("Input buffer contains unsupported image format");
         }
       }
     } else {
@@ -566,10 +585,10 @@ namespace sharp {
         imageType = DetermineImageType(descriptor->file.data());
         if (imageType == ImageType::MISSING) {
           if (descriptor->file.find("<svg") != std::string::npos) {
-            throw vips::VError("Input file is missing, did you mean "
+            throw std::runtime_error("Input file is missing, did you mean "
               "sharp(Buffer.from('" + descriptor->file.substr(0, 8) + "...')?");
           }
-          throw vips::VError("Input file is missing: " + descriptor->file);
+          throw std::runtime_error("Input file is missing: " + descriptor->file);
         }
         if (imageType != ImageType::UNKNOWN) {
           try {
@@ -577,12 +596,15 @@ namespace sharp {
             image = VImage::new_from_file(descriptor->file.data(), option);
             if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
               image = SetDensity(image, descriptor->density);
+            } else if (imageType == ImageType::HEIF && HeifPrimaryPageReopen(image, descriptor)) {
+              option = GetOptionsForImageType(imageType, descriptor);
+              image = VImage::new_from_file(descriptor->file.data(), option);
             }
-          } catch (vips::VError const &err) {
-            throw vips::VError(std::string("Input file has corrupt header: ") + err.what());
+          } catch (std::runtime_error const &err) {
+            throw std::runtime_error(std::string("Input file has corrupt header: ") + err.what());
           }
         } else {
-          throw vips::VError("Input file contains unsupported image format");
+          throw std::runtime_error("Input file contains unsupported image format");
         }
       }
     }
@@ -590,7 +612,7 @@ namespace sharp {
     // Limit input images to a given number of pixels, where pixels = width * height
     if (descriptor->limitInputPixels > 0 &&
       static_cast<uint64_t>(image.width()) * image.height() > descriptor->limitInputPixels) {
-      throw vips::VError("Input image exceeds pixel limit");
+      throw std::runtime_error("Input image exceeds pixel limit");
     }
     return std::make_tuple(image, imageType);
   }
@@ -766,19 +788,19 @@ namespace sharp {
       : image.height();
     if (imageType == ImageType::JPEG) {
       if (image.width() > 65535 || height > 65535) {
-        throw vips::VError("Processed image is too large for the JPEG format");
+        throw std::runtime_error("Processed image is too large for the JPEG format");
       }
     } else if (imageType == ImageType::WEBP) {
       if (image.width() > 16383 || height > 16383) {
-        throw vips::VError("Processed image is too large for the WebP format");
+        throw std::runtime_error("Processed image is too large for the WebP format");
       }
     } else if (imageType == ImageType::GIF) {
       if (image.width() > 65535 || height > 65535) {
-        throw vips::VError("Processed image is too large for the GIF format");
+        throw std::runtime_error("Processed image is too large for the GIF format");
       }
     } else if (imageType == ImageType::HEIF) {
       if (image.width() > 16384 || height > 16384) {
-        throw vips::VError("Processed image is too large for the HEIF format");
+        throw std::runtime_error("Processed image is too large for the HEIF format");
       }
     }
   }
@@ -1142,7 +1164,8 @@ namespace sharp {
     Does this image have a gain map?
   */
   bool HasGainMap(VImage image) {
-    return image.get_typeof("gainmap-data") == VIPS_TYPE_BLOB;
+    return image.get_typeof("gainmap") == VIPS_TYPE_BLOB ||
+      image.get_typeof("gainmap-data") == VIPS_TYPE_BLOB;
   }
 
   /*
@@ -1150,6 +1173,7 @@ namespace sharp {
   */
   VImage RemoveGainMap(VImage image) {
     VImage copy = image.copy();
+    copy.remove("gainmap");
     copy.remove("gainmap-data");
     return copy;
   }

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 < 0)
-#error "libvips version 8.18.0+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 18 && VIPS_MICRO_VERSION < 2)
+#error "libvips version 8.18.2+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if defined(__has_include)
@@ -29,6 +29,12 @@
 #endif
 #endif
 
+#ifdef __EMSCRIPTEN__
+#define SHARP_CALLBACK_FN_NAME Call
+#else
+#define SHARP_CALLBACK_FN_NAME MakeCallback
+#endif
+
 using vips::VImage;
 
 namespace sharp {
@@ -105,7 +111,7 @@ namespace sharp {
       rawPremultiplied(false),
       rawPageHeight(0),
       pages(1),
-      page(0),
+      page(-1),
       createChannels(0),
       createWidth(0),
       createHeight(0),

package/src/metadata.cc

@@ -31,7 +31,7 @@ class MetadataWorker : public Napi::AsyncWorker {
     sharp::ImageType imageType = sharp::ImageType::UNKNOWN;
     try {
       std::tie(image, imageType) = OpenInput(baton->input);
-    } catch (vips::VError const &err) {
+    } catch (std::runtime_error const &err) {
       (baton->err).append(err.what());
     }
     if (imageType != sharp::ImageType::UNKNOWN) {
@@ -151,6 +151,50 @@ class MetadataWorker : public Napi::AsyncWorker {
       }
       // PNG comments
       vips_image_map(image.get_image(), readPNGComment, &baton->comments);
+      // Media type
+      std::string mediaType;
+      switch (imageType) {
+        case sharp::ImageType::JPEG:
+        case sharp::ImageType::PNG:
+        case sharp::ImageType::WEBP:
+        case sharp::ImageType::JP2:
+        case sharp::ImageType::TIFF:
+        case sharp::ImageType::GIF:
+        case sharp::ImageType::FITS:
+        case sharp::ImageType::JXL:
+          baton->mediaType = "image/" + baton->format;
+          break;
+        case sharp::ImageType::SVG:
+          baton->mediaType = "image/svg+xml";
+          break;
+        case sharp::ImageType::HEIF:
+          if (baton->compression == "av1") {
+            baton->mediaType = "image/avif";
+          } else if (baton->compression == "hevc") {
+            baton->mediaType = "image/heic";
+          }
+          break;
+        case sharp::ImageType::PDF:
+          baton->mediaType = "application/pdf";
+          break;
+        case sharp::ImageType::OPENSLIDE:
+          baton->mediaType = "image/tiff";
+          break;
+        case sharp::ImageType::PPM:
+          baton->mediaType = "image/x-portable-pixmap";
+          break;
+        case sharp::ImageType::EXR:
+          baton->mediaType = "image/x-exr";
+          break;
+        case sharp::ImageType::RAD:
+          baton->mediaType = "image/vnd.radiance";
+          break;
+        case sharp::ImageType::UHDR:
+          baton->mediaType = "image/jpeg";
+          break;
+        default:
+          break;
+      }
     }
 
     // Clean up
@@ -165,13 +209,16 @@ class MetadataWorker : public Napi::AsyncWorker {
     // Handle warnings
     std::string warning = sharp::VipsWarningPop();
     while (!warning.empty()) {
-      debuglog.Call(Receiver().Value(), { Napi::String::New(env, warning) });
+      debuglog.SHARP_CALLBACK_FN_NAME(Receiver().Value(), { Napi::String::New(env, warning) });
       warning = sharp::VipsWarningPop();
     }
 
     if (baton->err.empty()) {
       Napi::Object info = Napi::Object::New(env);
       info.Set("format", baton->format);
+      if (!baton->mediaType.empty()) {
+        info.Set("mediaType", baton->mediaType);
+      }
       if (baton->input->bufferLength > 0) {
         info.Set("size", baton->input->bufferLength);
       }
@@ -297,9 +344,10 @@ class MetadataWorker : public Napi::AsyncWorker {
         }
         info.Set("comments", comments);
       }
-      Callback().Call(Receiver().Value(), { env.Null(), info });
+      Callback().SHARP_CALLBACK_FN_NAME(Receiver().Value(), { env.Null(), info });
     } else {
-      Callback().Call(Receiver().Value(), { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
+      Callback().SHARP_CALLBACK_FN_NAME(Receiver().Value(),
+        { Napi::Error::New(env, sharp::TrimEnd(baton->err)).Value() });
     }
 
     delete baton->input;

package/src/metadata.h

@@ -19,6 +19,7 @@ struct MetadataBaton {
   sharp::InputDescriptor *input;
   // Output
   std::string format;
+  std::string mediaType;
   int width;
   int height;
   std::string space;

package/src/operations.cc

@@ -14,7 +14,6 @@
 #include "./operations.h"
 
 using vips::VImage;
-using vips::VError;
 
 namespace sharp {
   /*
@@ -287,7 +286,7 @@ namespace sharp {
   */
   VImage Trim(VImage image, std::vector<double> background, double threshold, bool const lineArt, int const margin) {
     if (image.width() < 3 && image.height() < 3) {
-      throw VError("Image to trim must be at least 3x3 pixels");
+      throw std::runtime_error("Image to trim must be at least 3x3 pixels");
     }
     if (background.size() == 0) {
       // Top-left pixel provides the default background colour if none is given
@@ -361,7 +360,7 @@ namespace sharp {
   VImage Linear(VImage image, std::vector<double> const a, std::vector<double> const b) {
     size_t const bands = static_cast<size_t>(image.bands());
     if (a.size() > bands) {
-      throw VError("Band expansion using linear is unsupported");
+      throw std::runtime_error("Band expansion using linear is unsupported");
     }
     bool const uchar = !Is16Bit(image.interpretation());
     if (image.has_alpha() && a.size() != bands && (a.size() == 1 || a.size() == bands - 1 || bands - 1 == 1)) {