sharp 0.33.1-rc.3 → 0.33.2-rc.0

package/README.md

@@ -8,7 +8,7 @@ smaller, web-friendly JPEG, PNG, WebP, GIF and AVIF images of varying dimensions
 
 It can be used with all JavaScript runtimes
 that provide support for Node-API v9, including
-Node.js >= 18.17.0, Deno and Bun.
+Node.js (^18.17.0 or >= 20.3.0), Deno and Bun.
 
 Resizing an image is typically 4x-5x faster than using the
 quickest ImageMagick and GraphicsMagick settings

package/lib/index.d.ts

@@ -341,6 +341,12 @@ declare namespace sharp {
          */
         metadata(): Promise<Metadata>;
 
+        /**
+         * Keep all metadata (EXIF, ICC, XMP, IPTC) from the input image in the output image.
+         * @returns A sharp instance that can be used to chain operations
+         */
+        keepMetadata(): Sharp;
+
         /**
          * Access to pixel-derived image statistics for every channel in the image.
          * @returns A sharp instance that can be used to chain operations

package/lib/libvips.js

@@ -7,6 +7,7 @@ const { spawnSync } = require('node:child_process');
 const { createHash } = require('node:crypto');
 const semverCoerce = require('semver/functions/coerce');
 const semverGreaterThanOrEqualTo = require('semver/functions/gte');
+const semverSatisfies = require('semver/functions/satisfies');
 const detectLibc = require('detect-libc');
 
 const { engines, optionalDependencies } = require('../package.json');
@@ -83,6 +84,15 @@ const buildSharpLibvipsLibDir = () => {
   return '';
 };
 
+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 };
+    }
+  }
+};
+
 /* istanbul ignore next */
 const isEmscripten = () => {
   const { CC } = process.env;
@@ -174,6 +184,7 @@ module.exports = {
   buildSharpLibvipsIncludeDir,
   buildSharpLibvipsCPlusPlusDir,
   buildSharpLibvipsLibDir,
+  isUnsupportedNodeRuntime,
   runtimePlatformArch,
   log,
   yarnLocator,

package/lib/operation.js

@@ -24,6 +24,8 @@ const is = require('./is');
  * Only one rotation can occur per pipeline.
  * Previous calls to `rotate` in the same pipeline will be ignored.
  *
+ * Multi-page images can only be rotated by 180 degrees.
+ *
  * Method order is important when rotating, resizing and/or extracting regions,
  * for example `.rotate(x).extract(y)` will produce a different result to `.extract(y).rotate(x)`.
  *

package/lib/sharp.js

@@ -7,7 +7,7 @@
 
 const { familySync, versionSync } = require('detect-libc');
 
-const { runtimePlatformArch, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
+const { runtimePlatformArch, isUnsupportedNodeRuntime, prebuiltPlatforms, minimumLibvipsVersion } = require('./libvips');
 const runtimePlatform = runtimePlatformArch();
 
 const paths = [
@@ -44,8 +44,16 @@ if (sharp) {
   const messages = errors.map(err => err.message).join(' ');
   help.push('Possible solutions:');
   // Common error messages
-  if (prebuiltPlatforms.includes(runtimePlatform)) {
+  if (isUnsupportedNodeRuntime()) {
+    const { found, expected } = isUnsupportedNodeRuntime();
+    help.push(
+      '- Please upgrade Node.js:',
+      `    Found ${found}`,
+      `    Requires ${expected}`
+    );
+  } else if (prebuiltPlatforms.includes(runtimePlatform)) {
     const [os, cpu] = runtimePlatform.split('-');
+    const libc = os.endsWith('musl') ? ' --libc=musl' : '';
     help.push(
       '- Ensure optional dependencies can be installed:',
       '    npm install --include=optional sharp',
@@ -53,15 +61,14 @@ if (sharp) {
       '- Ensure your package manager supports multi-platform installation:',
       '    See https://sharp.pixelplumbing.com/install#cross-platform',
       '- Add platform-specific dependencies:',
-      `    npm install --os=${os} --cpu=${cpu} sharp`,
-      `    npm install --force @img/sharp-${runtimePlatform}`
+      `    npm install --os=${os.replace('musl', '')}${libc} --cpu=${cpu} sharp`
     );
   } else {
     help.push(
       `- Manually install libvips >= ${minimumLibvipsVersion}`,
       '- Add experimental WebAssembly-based dependencies:',
       '    npm install --cpu=wasm32 sharp',
-      '    npm install --force @img/sharp-wasm32'
+      '    npm install @img/sharp-wasm32'
     );
   }
   if (isLinux && /(symbol not found|CXXABI_)/i.test(messages)) {

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.33.1-rc.3",
+  "version": "0.33.2-rc.0",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -141,36 +141,36 @@
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.33.1-rc.3",
-    "@img/sharp-darwin-x64": "0.33.1-rc.3",
-    "@img/sharp-libvips-darwin-arm64": "1.0.0",
-    "@img/sharp-libvips-darwin-x64": "1.0.0",
-    "@img/sharp-libvips-linux-arm": "1.0.0",
-    "@img/sharp-libvips-linux-arm64": "1.0.0",
-    "@img/sharp-libvips-linux-s390x": "1.0.0",
-    "@img/sharp-libvips-linux-x64": "1.0.0",
-    "@img/sharp-libvips-linuxmusl-arm64": "1.0.0",
-    "@img/sharp-libvips-linuxmusl-x64": "1.0.0",
-    "@img/sharp-linux-arm": "0.33.1-rc.3",
-    "@img/sharp-linux-arm64": "0.33.1-rc.3",
-    "@img/sharp-linux-s390x": "0.33.1-rc.3",
-    "@img/sharp-linux-x64": "0.33.1-rc.3",
-    "@img/sharp-linuxmusl-arm64": "0.33.1-rc.3",
-    "@img/sharp-linuxmusl-x64": "0.33.1-rc.3",
-    "@img/sharp-wasm32": "0.33.1-rc.3",
-    "@img/sharp-win32-ia32": "0.33.1-rc.3",
-    "@img/sharp-win32-x64": "0.33.1-rc.3"
+    "@img/sharp-darwin-arm64": "0.33.2-rc.0",
+    "@img/sharp-darwin-x64": "0.33.2-rc.0",
+    "@img/sharp-libvips-darwin-arm64": "1.0.1",
+    "@img/sharp-libvips-darwin-x64": "1.0.1",
+    "@img/sharp-libvips-linux-arm": "1.0.1",
+    "@img/sharp-libvips-linux-arm64": "1.0.1",
+    "@img/sharp-libvips-linux-s390x": "1.0.1",
+    "@img/sharp-libvips-linux-x64": "1.0.1",
+    "@img/sharp-libvips-linuxmusl-arm64": "1.0.1",
+    "@img/sharp-libvips-linuxmusl-x64": "1.0.1",
+    "@img/sharp-linux-arm": "0.33.2-rc.0",
+    "@img/sharp-linux-arm64": "0.33.2-rc.0",
+    "@img/sharp-linux-s390x": "0.33.2-rc.0",
+    "@img/sharp-linux-x64": "0.33.2-rc.0",
+    "@img/sharp-linuxmusl-arm64": "0.33.2-rc.0",
+    "@img/sharp-linuxmusl-x64": "0.33.2-rc.0",
+    "@img/sharp-wasm32": "0.33.2-rc.0",
+    "@img/sharp-win32-ia32": "0.33.2-rc.0",
+    "@img/sharp-win32-x64": "0.33.2-rc.0"
   },
   "devDependencies": {
-    "@emnapi/runtime": "^0.44.0",
-    "@img/sharp-libvips-dev": "1.0.0",
-    "@img/sharp-libvips-dev-wasm32": "1.0.0",
-    "@img/sharp-libvips-win32-ia32": "1.0.0",
-    "@img/sharp-libvips-win32-x64": "1.0.0",
+    "@emnapi/runtime": "^0.45.0",
+    "@img/sharp-libvips-dev": "1.0.1",
+    "@img/sharp-libvips-dev-wasm32": "1.0.1",
+    "@img/sharp-libvips-win32-ia32": "1.0.1",
+    "@img/sharp-libvips-win32-x64": "1.0.1",
     "@types/node": "*",
     "async": "^3.2.5",
     "cc": "^3.0.1",
-    "emnapi": "^0.44.0",
+    "emnapi": "^0.45.0",
     "exif-reader": "^2.0.0",
     "extract-zip": "^2.0.1",
     "icc": "^3.0.0",
@@ -182,12 +182,12 @@
     "prebuild": "^12.1.0",
     "semistandard": "^17.0.0",
     "tar-fs": "^3.0.4",
-    "tsd": "^0.29.0"
+    "tsd": "^0.30.3"
   },
   "license": "Apache-2.0",
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0",
-    "libvips": ">=8.15.0"
+    "libvips": ">=8.15.1"
   },
   "funding": {
     "url": "https://opencollective.com/libvips"

package/src/common.h

@@ -16,8 +16,8 @@
 
 #if (VIPS_MAJOR_VERSION < 8) || \
   (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION < 15) || \
-  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 0)
-#error "libvips version 8.15.0+ is required - please see https://sharp.pixelplumbing.com/install"
+  (VIPS_MAJOR_VERSION == 8 && VIPS_MINOR_VERSION == 15 && VIPS_MICRO_VERSION < 1)
+#error "libvips version 8.15.1+ is required - please see https://sharp.pixelplumbing.com/install"
 #endif
 
 #if ((!defined(__clang__)) && defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 6)))

package/src/pipeline.cc

@@ -96,6 +96,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           baton->rotationAngle != 0.0);
 
         if (autoRotation != VIPS_ANGLE_D0) {
+          if (autoRotation != VIPS_ANGLE_D180) {
+            MultiPageUnsupported(nPages, "Rotate");
+          }
           image = image.rot(autoRotation);
           autoRotation = VIPS_ANGLE_D0;
         }
@@ -114,6 +117,9 @@ class PipelineWorker : public Napi::AsyncWorker {
           baton->flop = FALSE;
         }
         if (rotation != VIPS_ANGLE_D0) {
+          if (rotation != VIPS_ANGLE_D180) {
+            MultiPageUnsupported(nPages, "Rotate");
+          }
           image = image.rot(rotation);
           rotation = VIPS_ANGLE_D0;
         }
@@ -397,6 +403,9 @@ class PipelineWorker : public Napi::AsyncWorker {
         rotation != VIPS_ANGLE_D0);
       // Auto-rotate post-extract
       if (autoRotation != VIPS_ANGLE_D0) {
+        if (autoRotation != VIPS_ANGLE_D180) {
+          MultiPageUnsupported(nPages, "Rotate");
+        }
         image = image.rot(autoRotation);
       }
       // Mirror vertically (up-down) about the x-axis
@@ -409,6 +418,9 @@ class PipelineWorker : public Napi::AsyncWorker {
       }
       // Rotate post-extract 90-angle
       if (rotation != VIPS_ANGLE_D0) {
+        if (rotation != VIPS_ANGLE_D180) {
+          MultiPageUnsupported(nPages, "Rotate");
+        }
         image = image.rot(rotation);
       }
 
@@ -561,6 +573,7 @@ class PipelineWorker : public Napi::AsyncWorker {
                 VImage::option()->set("extend", baton->extendWith)->set("background", background));
         } else {
           std::vector<double> ignoredBackground(1);
+          image = sharp::StaySequential(image, baton->input->access);
           image = nPages > 1
             ? sharp::EmbedMultiPage(image,
                 baton->extendLeft, baton->extendTop, baton->width, baton->height,