Prerelease 0.33.0-alpha.9

.circleci/config.yml

@@ -38,7 +38,7 @@ jobs:
       - run: sudo docker exec sharp sh -c "npm test"
       - run: |
           sudo docker exec sharp sh -c "npm run package-from-local-build"
-          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linux-arm64=file:./npm/linux-arm64\""
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@img/sharp-linux-arm64=file:./npm/linux-arm64\""
           sudo docker exec sharp sh -c "npm run clean"
           sudo docker exec sharp sh -c "npm install --ignore-scripts"
           sudo docker exec sharp sh -c "npm test"
@@ -62,7 +62,7 @@ jobs:
       - run: sudo docker exec sharp sh -c "npm test"
       - run: |
           sudo docker exec sharp sh -c "npm run package-from-local-build"
-          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linux-arm64=file:./npm/linux-arm64\""
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@img/sharp-linux-arm64=file:./npm/linux-arm64\""
           sudo docker exec sharp sh -c "npm run clean"
           sudo docker exec sharp sh -c "npm install --ignore-scripts"
           sudo docker exec sharp sh -c "npm test"
@@ -79,7 +79,7 @@ jobs:
       - run: sudo docker exec sharp sh -c "npm test"
       - run: |
           sudo docker exec sharp sh -c "npm run package-from-local-build"
-          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linuxmusl-arm64=file:./npm/linuxmusl-arm64\""
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@img/sharp-linuxmusl-arm64=file:./npm/linuxmusl-arm64\""
           sudo docker exec sharp sh -c "npm run clean"
           sudo docker exec sharp sh -c "npm install --ignore-scripts"
           sudo docker exec sharp sh -c "npm test"
@@ -99,7 +99,7 @@ jobs:
       - run: sudo docker exec sharp sh -c "npm test"
       - run: |
           sudo docker exec sharp sh -c "npm run package-from-local-build"
-          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@sharpen/sharp-linuxmusl-arm64=file:./npm/linuxmusl-arm64\""
+          sudo docker exec sharp sh -c "npm pkg set \"optionalDependencies.@img/sharp-linuxmusl-arm64=file:./npm/linuxmusl-arm64\""
           sudo docker exec sharp sh -c "npm run clean"
           sudo docker exec sharp sh -c "npm install --ignore-scripts"
           sudo docker exec sharp sh -c "npm test"

.gitattributes

@@ -1 +0,0 @@
-src/libvips/* linguist-vendored

.github/workflows/ci.yml

@@ -106,7 +106,7 @@ jobs:
       - name: Test packaging
         run: |
           npm run package-from-local-build
-          npm pkg set "optionalDependencies.@sharpen/sharp-${{ matrix.platform }}=file:./npm/${{ matrix.platform }}"
+          npm pkg set "optionalDependencies.@img/sharp-${{ matrix.platform }}=file:./npm/${{ matrix.platform }}"
           npm run clean
           npm install --ignore-scripts
           npm test
@@ -141,7 +141,7 @@ jobs:
             npm install --build-from-source
             npx mocha --no-config --spec=test/unit/io.js
             npm run package-from-local-build
-            npm pkg set "optionalDependencies.@sharpen/sharp-linux-arm=file:./npm/linux-arm"
+            npm pkg set "optionalDependencies.@img/sharp-linux-arm=file:./npm/linux-arm"
             npm run clean
             npm install --ignore-scripts
             npx mocha --no-config --spec=test/unit/io.js --timeout=30000
@@ -182,7 +182,7 @@ jobs:
       - name: Test packaging
         run: |
           npm run package-from-local-build
-          npm pkg set "optionalDependencies.@sharpen/sharp-${{ matrix.platform }}=file:./npm/${{ matrix.platform }}"
+          npm pkg set "optionalDependencies.@img/sharp-${{ matrix.platform }}=file:./npm/${{ matrix.platform }}"
           npm run clean
           npm install --ignore-scripts
           npm test

.github/workflows/npm.yml

@@ -9,33 +9,84 @@ permissions: {}
 
 jobs:
   release-smoke-test:
-    name: "${{ github.ref }} ${{ matrix.name }}"
-    runs-on: ${{ matrix.os }}
+    name: "${{ github.ref_name }} ${{ matrix.name }}"
+    runs-on: ${{ matrix.runs-on }}
     strategy:
       fail-fast: false
       matrix:
         include:
-          - name: linux-x64
-            os: ubuntu-22.04
-          - name: darwin-x64
-            os: macos-11
-          - name: win32-x64
-            os: windows-2019
+          - name: linux-x64-node-npm
+            runs-on: ubuntu-22.04
+            runtime: node
+            package-manager: npm
+          - name: linux-x64-node-pnpm
+            runs-on: ubuntu-22.04
+            runtime: node
+            package-manager: pnpm
+          - name: linux-x64-node-yarn
+            runs-on: ubuntu-22.04
+            runtime: node
+            package-manager: yarn
+          - name: linux-x64-deno
+            runs-on: ubuntu-22.04
+            runtime: deno
+          - name: linux-x64-bun
+            runs-on: ubuntu-22.04
+            runtime: bun
+
+          - name: darwin-x64-node-npm
+            runs-on: macos-11
+            runtime: node
+            package-manager: npm
+          - name: darwin-x64-node-pnpm
+            runs-on: macos-11
+            runtime: node
+            package-manager: pnpm
+          - name: darwin-x64-node-yarn
+            runs-on: macos-11
+            runtime: node
+            package-manager: yarn
+          - name: darwin-x64-deno
+            runs-on: macos-11
+            runtime: deno
+          - name: darwin-x64-bun
+            runs-on: macos-11
+            runtime: bun
+
+          - name: win32-x64-node-npm
+            runs-on: windows-2019
+            runtime: node
+            package-manager: npm
+          - name: win32-x64-node-pnpm
+            runs-on: windows-2019
+            runtime: node
+            package-manager: pnpm
+          - name: win32-x64-node-yarn
+            runs-on: windows-2019
+            runtime: node
+            package-manager: yarn
+          - name: win32-x64-deno
+            runs-on: windows-2019
+            runtime: deno
+
     steps:
       - name: Install Node.js
+        if: ${{ matrix.runtime == 'node' }}
         uses: actions/setup-node@v3
         with:
           node-version: 20
       - name: Install pnpm
+        if: ${{ matrix.package-manager == 'pnpm' }}
         uses: pnpm/action-setup@v2
         with:
           version: 8
       - name: Install Deno
+        if: ${{ matrix.runtime == 'deno' }}
         uses: denoland/setup-deno@v1
         with:
           deno-version: v1.x
       - name: Install Bun
-        if: ${{ !contains(matrix.os, 'windows') }}
+        if: ${{ matrix.runtime == 'bun' }}
         uses: oven-sh/setup-bun@v1
         with:
           bun-version: latest
@@ -68,33 +119,34 @@ jobs:
             deepStrictEqual(['.jpg', '.jpeg', '.jpe'], sharp.format.jpeg.input.fileSuffix);
 
       - name: Run with Node.js + npm
+        if: ${{ matrix.runtime == 'node' && matrix.package-manager == 'npm' }}
         run: |
           npm install --ignore-scripts
           node release.mjs
-          rm -r node_modules/ package-lock.json
 
       - name: Run with Node.js + pnpm
+        if: ${{ matrix.runtime == 'node' && matrix.package-manager == 'pnpm' }}
         run: |
           pnpm install --ignore-scripts
           node release.mjs
-          rm -r node_modules/ pnpm-lock.yaml
 
       - name: Run with Node.js + yarn
+        if: ${{ matrix.runtime == 'node' && matrix.package-manager == 'yarn' }}
         run: |
           corepack enable
           yarn set version stable
+          yarn config set enableImmutableInstalls false
           yarn config set enableScripts false
           yarn config set nodeLinker node-modules
           yarn install
           node release.mjs
-          rm -r node_modules/ .yarn/ yarn.lock .yarnrc.yml
-          corepack disable
 
       - name: Run with Deno
+        if: ${{ matrix.runtime == 'deno' }}
         run: deno run --allow-read --allow-ffi release.mjs
 
       - name: Run with Bun
-        if: ${{ !contains(matrix.os, 'windows') }}
+        if: ${{ matrix.runtime == 'bun' }}
         run: |
           bun install --ignore-scripts
           bun release.mjs

.gitignore

@@ -8,11 +8,6 @@ test/bench/node_modules
 test/fixtures/output*
 test/fixtures/vips-properties.xml
 test/leak/libvips.supp
-test/saliency/report.json
-test/saliency/Image*
-test/saliency/[Uu]serData*
-!test/saliency/userData.js
-.gitattributes
 .DS_Store
 .nyc_output
 .vscode/

docs/changelog.md

@@ -14,6 +14,9 @@ Requires libvips v8.14.5
 
 * Remove `sharp.vendor`.
 
+* Ensure all `Error` objects contain a `stack` property.
+  [#3653](https://github.com/lovell/sharp/issues/3653)
+
 * Make `compression` option of `heif` mandatory to help reduce HEIF vs HEIC confusion.
   [#3740](https://github.com/lovell/sharp/issues/3740)
 

docs/install.md

@@ -106,14 +106,14 @@ must include binaries for either the linux-x64 or linux-arm64 platforms
 depending on the chosen architecture.
 
 When building your deployment package on a machine that differs from the target architecture,
-you will need to install either `@sharpen/sharp-linux-x64` or `@sharpen/sharp-linux-arm64` package.
+you will need to install either `@img/sharp-linux-x64` or `@img/sharp-linux-arm64` package.
 
 ```sh
-npm install --force @sharpen/sharp-linux-x64
+npm install --force @img/sharp-linux-x64
 ```
 
 ```sh
-npm install --force @sharpen/sharp-linux-arm64
+npm install --force @img/sharp-linux-arm64
 ```
 
 To get the best performance select the largest memory available.
@@ -165,7 +165,7 @@ custom:
       - sharp
     packagerOptions:
       scripts:
-        - npm install --force @sharpen/sharp-linux-x64
+        - npm install --force @img/sharp-linux-x64
 ```
 
 ## TypeScript

lib/index.d.ts

@@ -640,7 +640,7 @@ declare namespace sharp {
          * @param withMetadata
          * @throws {Error} Invalid parameters.
          */
-        withMetadata(withMetadata?: WriteableMetadata): Sharp;
+        withMetadata(withMetadata?: boolean | WriteableMetadata): Sharp;
 
         /**
          * Use these JPEG options for output image.
@@ -1275,10 +1275,10 @@ declare namespace sharp {
     }
 
     interface NormaliseOptions {
-      /** Percentile below which luminance values will be underexposed. */
-      lower?: number | undefined;
-      /** Percentile above which luminance values will be overexposed. */
-      upper?: number | undefined;
+        /** Percentile below which luminance values will be underexposed. */
+        lower?: number | undefined;
+        /** Percentile above which luminance values will be overexposed. */
+        upper?: number | undefined;
     }
 
     interface ResizeOptions {

lib/input.js

@@ -483,14 +483,27 @@ function _isStreamInput () {
  * @returns {Promise<Object>|Sharp}
  */
 function metadata (callback) {
+  const stack = Error();
   if (is.fn(callback)) {
     if (this._isStreamInput()) {
       this.on('finish', () => {
         this._flattenBufferIn();
-        sharp.metadata(this.options, callback);
+        sharp.metadata(this.options, (err, metadata) => {
+          if (err) {
+            callback(is.nativeError(err, stack));
+          } else {
+            callback(null, metadata);
+          }
+        });
       });
     } else {
-      sharp.metadata(this.options, callback);
+      sharp.metadata(this.options, (err, metadata) => {
+        if (err) {
+          callback(is.nativeError(err, stack));
+        } else {
+          callback(null, metadata);
+        }
+      });
     }
     return this;
   } else {
@@ -500,7 +513,7 @@ function metadata (callback) {
           this._flattenBufferIn();
           sharp.metadata(this.options, (err, metadata) => {
             if (err) {
-              reject(err);
+              reject(is.nativeError(err, stack));
             } else {
               resolve(metadata);
             }
@@ -516,7 +529,7 @@ function metadata (callback) {
       return new Promise((resolve, reject) => {
         sharp.metadata(this.options, (err, metadata) => {
           if (err) {
-            reject(err);
+            reject(is.nativeError(err, stack));
           } else {
             resolve(metadata);
           }
@@ -572,14 +585,27 @@ function metadata (callback) {
  * @returns {Promise<Object>}
  */
 function stats (callback) {
+  const stack = Error();
   if (is.fn(callback)) {
     if (this._isStreamInput()) {
       this.on('finish', () => {
         this._flattenBufferIn();
-        sharp.stats(this.options, callback);
+        sharp.stats(this.options, (err, stats) => {
+          if (err) {
+            callback(is.nativeError(err, stack));
+          } else {
+            callback(null, stats);
+          }
+        });
       });
     } else {
-      sharp.stats(this.options, callback);
+      sharp.stats(this.options, (err, stats) => {
+        if (err) {
+          callback(is.nativeError(err, stack));
+        } else {
+          callback(null, stats);
+        }
+      });
     }
     return this;
   } else {
@@ -589,7 +615,7 @@ function stats (callback) {
           this._flattenBufferIn();
           sharp.stats(this.options, (err, stats) => {
             if (err) {
-              reject(err);
+              reject(is.nativeError(err, stack));
             } else {
               resolve(stats);
             }
@@ -600,7 +626,7 @@ function stats (callback) {
       return new Promise((resolve, reject) => {
         sharp.stats(this.options, (err, stats) => {
           if (err) {
-            reject(err);
+            reject(is.nativeError(err, stack));
           } else {
             resolve(stats);
           }

lib/is.js

@@ -137,6 +137,19 @@ const invalidParameterError = function (name, expected, actual) {
   );
 };
 
+/**
+ * Ensures an Error from C++ contains a JS stack.
+ *
+ * @param {Error} native - Error with message from C++.
+ * @param {Error} context - Error with stack from JS.
+ * @returns {Error} Error with message and stack.
+ * @private
+ */
+const nativeError = function (native, context) {
+  context.message = native.message;
+  return context;
+};
+
 module.exports = {
   defined,
   object,
@@ -151,5 +164,6 @@ module.exports = {
   integer,
   inRange,
   inArray,
-  invalidParameterError
+  invalidParameterError,
+  nativeError
 };

lib/libvips.js

@@ -48,7 +48,7 @@ const buildPlatformArch = () => {
 
 const buildSharpLibvipsIncludeDir = () => {
   try {
-    return require('@sharpen/sharp-libvips-dev/include');
+    return require('@img/sharp-libvips-dev/include');
   } catch {}
   /* istanbul ignore next */
   return '';
@@ -56,7 +56,7 @@ const buildSharpLibvipsIncludeDir = () => {
 
 const buildSharpLibvipsCPlusPlusDir = () => {
   try {
-    return require('@sharpen/sharp-libvips-dev/cplusplus');
+    return require('@img/sharp-libvips-dev/cplusplus');
   } catch {}
   /* istanbul ignore next */
   return '';
@@ -64,7 +64,7 @@ const buildSharpLibvipsCPlusPlusDir = () => {
 
 const buildSharpLibvipsLibDir = () => {
   try {
-    return require(`@sharpen/sharp-libvips-${buildPlatformArch()}/lib`);
+    return require(`@img/sharp-libvips-${buildPlatformArch()}/lib`);
   } catch {}
   /* istanbul ignore next */
   return '';

lib/output.js

@@ -86,7 +86,8 @@ function toFile (fileOut, callback) {
     }
   } else {
     this.options.fileOut = fileOut;
-    return this._pipeline(callback);
+    const stack = Error();
+    return this._pipeline(callback, stack);
   }
   return this;
 }
@@ -157,7 +158,8 @@ function toBuffer (options, callback) {
     this.options.resolveWithObject = false;
   }
   this.options.fileOut = '';
-  return this._pipeline(is.fn(options) ? options : callback);
+  const stack = Error();
+  return this._pipeline(is.fn(options) ? options : callback, stack);
 }
 
 /**
@@ -1282,7 +1284,8 @@ function _read () {
   /* istanbul ignore else */
   if (!this.options.streamOut) {
     this.options.streamOut = true;
-    this._pipeline();
+    const stack = Error();
+    this._pipeline(undefined, stack);
   }
 }
 
@@ -1291,18 +1294,30 @@ function _read () {
  * Supports callback, stream and promise variants
  * @private
  */
-function _pipeline (callback) {
+function _pipeline (callback, stack) {
   if (typeof callback === 'function') {
     // output=file/buffer
     if (this._isStreamInput()) {
       // output=file/buffer, input=stream
       this.on('finish', () => {
         this._flattenBufferIn();
-        sharp.pipeline(this.options, callback);
+        sharp.pipeline(this.options, (err, data, info) => {
+          if (err) {
+            callback(is.nativeError(err, stack));
+          } else {
+            callback(null, data, info);
+          }
+        });
       });
     } else {
       // output=file/buffer, input=file/buffer
-      sharp.pipeline(this.options, callback);
+      sharp.pipeline(this.options, (err, data, info) => {
+        if (err) {
+          callback(is.nativeError(err, stack));
+        } else {
+          callback(null, data, info);
+        }
+      });
     }
     return this;
   } else if (this.options.streamOut) {
@@ -1313,7 +1328,7 @@ function _pipeline (callback) {
         this._flattenBufferIn();
         sharp.pipeline(this.options, (err, data, info) => {
           if (err) {
-            this.emit('error', err);
+            this.emit('error', is.nativeError(err, stack));
           } else {
             this.emit('info', info);
             this.push(data);
@@ -1329,7 +1344,7 @@ function _pipeline (callback) {
       // output=stream, input=file/buffer
       sharp.pipeline(this.options, (err, data, info) => {
         if (err) {
-          this.emit('error', err);
+          this.emit('error', is.nativeError(err, stack));
         } else {
           this.emit('info', info);
           this.push(data);
@@ -1348,7 +1363,7 @@ function _pipeline (callback) {
           this._flattenBufferIn();
           sharp.pipeline(this.options, (err, data, info) => {
             if (err) {
-              reject(err);
+              reject(is.nativeError(err, stack));
             } else {
               if (this.options.resolveWithObject) {
                 resolve({ data, info });
@@ -1364,7 +1379,7 @@ function _pipeline (callback) {
       return new Promise((resolve, reject) => {
         sharp.pipeline(this.options, (err, data, info) => {
           if (err) {
-            reject(err);
+            reject(is.nativeError(err, stack));
           } else {
             if (this.options.resolveWithObject) {
               resolve({ data, info });

lib/sharp.js

@@ -18,7 +18,7 @@ try {
 } catch (errLocal) {
   try {
     // Check for runtime package
-    module.exports = require(`@sharpen/sharp-${runtimePlatform}/sharp.node`);
+    module.exports = require(`@img/sharp-${runtimePlatform}/sharp.node`);
   } catch (errPackage) {
     const help = ['Could not load the "sharp" module at runtime'];
     if (errLocal.code !== 'MODULE_NOT_FOUND') {
@@ -31,13 +31,13 @@ try {
     // Common error messages
     if (prebuiltPlatforms.includes(runtimePlatform)) {
       help.push('- Add an explicit dependency for the runtime platform:');
-      help.push(`    npm install --force @sharpen/sharp-${runtimePlatform}"`);
+      help.push(`    npm install --force @img/sharp-${runtimePlatform}`);
     } else {
       help.push(`- The ${runtimePlatform} platform requires manual installation of libvips >= ${minimumLibvipsVersion}`);
     }
     if (isLinux && /symbol not found/i.test(errPackage)) {
       try {
-        const { engines } = require(`@sharpen/sharp-libvips-${runtimePlatform}/package`);
+        const { engines } = require(`@img/sharp-libvips-${runtimePlatform}/package`);
         const libcFound = `${familySync()} ${versionSync()}`;
         const libcRequires = `${engines.musl ? 'musl' : 'glibc'} ${engines.musl || engines.glibc}`;
         help.push('- Update your OS:');

lib/utility.js

@@ -60,10 +60,10 @@ let versions = {
 /* istanbul ignore next */
 if (!libvipsVersion.isGlobal) {
   try {
-    versions = require(`@sharpen/sharp-${runtimePlatform}/versions`);
+    versions = require(`@img/sharp-${runtimePlatform}/versions`);
   } catch (_) {
     try {
-      versions = require(`@sharpen/sharp-libvips-${runtimePlatform}/versions`);
+      versions = require(`@img/sharp-libvips-${runtimePlatform}/versions`);
     } catch (_) {}
   }
 }

npm/darwin-arm64/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-darwin-arm64",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-darwin-arm64",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with macOS ARM64",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -14,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.2"
+    "@img/sharp-libvips-darwin-arm64": "0.0.1"
   },
   "files": [
     "lib"

npm/darwin-x64/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-darwin-x64",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-darwin-x64",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with macOS x64",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -14,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@sharpen/sharp-libvips-darwin-x64": "0.0.1-alpha.2"
+    "@img/sharp-libvips-darwin-x64": "0.0.1"
   },
   "files": [
     "lib"

npm/from-github-release.js

@@ -5,7 +5,7 @@
 
 // Populate contents of all packages with the current GitHub release
 
-const { writeFile, copyFile, rm } = require('node:fs/promises');
+const { readFile, writeFile, appendFile, copyFile, rm } = require('node:fs/promises');
 const path = require('node:path');
 const { Readable } = require('node:stream');
 const { pipeline } = require('node:stream/promises');
@@ -60,11 +60,12 @@ workspaces.map(async platform => {
   await copyFile(path.join(__dirname, '..', 'LICENSE'), path.join(dir, 'LICENSE'));
   // Copy Windows-specific files
   if (platform.startsWith('win32-')) {
-    const sharpLibvipsDir = path.join(require(`@sharpen/sharp-libvips-${platform}/lib`), '..');
-    await Promise.all(
-      ['versions.json', 'THIRD-PARTY-NOTICES.md'].map(
-        filename => copyFile(path.join(sharpLibvipsDir, filename), path.join(dir, filename))
-      )
-    );
+    const sharpLibvipsDir = path.join(require(`@img/sharp-libvips-${platform}/lib`), '..');
+    // Copy versions.json
+    await copyFile(path.join(sharpLibvipsDir, 'versions.json'), path.join(dir, 'versions.json'));
+    // Append third party licensing to README
+    const readme = await readFile(path.join(sharpLibvipsDir, 'README.md'), { encoding: 'utf-8' });
+    const thirdParty = readme.substring(readme.indexOf('\nThis software contains'));
+    appendFile(path.join(dir, 'README.md'), thirdParty);
   }
 });

npm/linux-arm/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-linux-arm",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-linux-arm",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with Linux (glibc) ARM (32-bit)",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -14,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@sharpen/sharp-libvips-linux-arm": "0.0.1-alpha.2"
+    "@img/sharp-libvips-linux-arm": "0.0.1"
   },
   "files": [
     "lib"

npm/linux-arm64/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-linux-arm64",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-linux-arm64",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with Linux (glibc) ARM64",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -14,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@sharpen/sharp-libvips-linux-arm64": "0.0.1-alpha.2"
+    "@img/sharp-libvips-linux-arm64": "0.0.1"
   },
   "files": [
     "lib"

npm/linux-x64/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-linux-x64",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-linux-x64",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with Linux (glibc) x64",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -14,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@sharpen/sharp-libvips-linux-x64": "0.0.1-alpha.2"
+    "@img/sharp-libvips-linux-x64": "0.0.1"
   },
   "files": [
     "lib"

npm/linuxmusl-arm64/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-linuxmusl-arm64",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-linuxmusl-arm64",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with Linux (musl) ARM64",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -14,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@sharpen/sharp-libvips-linuxmusl-arm64": "0.0.1-alpha.2"
+    "@img/sharp-libvips-linuxmusl-arm64": "0.0.1"
   },
   "files": [
     "lib"

npm/linuxmusl-x64/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-linuxmusl-x64",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-linuxmusl-x64",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with Linux (musl) x64",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -14,7 +15,7 @@
   },
   "preferUnplugged": true,
   "optionalDependencies": {
-    "@sharpen/sharp-libvips-linuxmusl-x64": "0.0.1-alpha.2"
+    "@img/sharp-libvips-linuxmusl-x64": "0.0.1"
   },
   "files": [
     "lib"

npm/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@sharpen/sharp",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp",
+  "version": "0.33.0-alpha.9",
   "private": "true",
   "workspaces": [
     "darwin-x64",

npm/win32-ia32/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-win32-ia32",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-win32-ia32",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with Windows x86 (32-bit)",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -15,8 +16,7 @@
   "preferUnplugged": true,
   "files": [
     "lib",
-    "versions.json",
-    "THIRD-PARTY-NOTICES.md"
+    "versions.json"
   ],
   "publishConfig": {
     "access": "public"

npm/win32-x64/package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@sharpen/sharp-win32-x64",
-  "version": "0.0.1-alpha.8",
+  "name": "@img/sharp-win32-x64",
+  "version": "0.33.0-alpha.9",
   "description": "Prebuilt sharp for use with Windows x64",
+  "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "repository": {
     "type": "git",
@@ -15,8 +16,7 @@
   "preferUnplugged": true,
   "files": [
     "lib",
-    "versions.json",
-    "THIRD-PARTY-NOTICES.md"
+    "versions.json"
   ],
   "publishConfig": {
     "access": "public"
@@ -24,7 +24,8 @@
   "type": "commonjs",
   "exports": {
     "./sharp.node": "./lib/sharp-win32-x64.node",
-    "./package": "./package.json"
+    "./package": "./package.json",
+    "./versions": "./versions.json"
   },
   "engines": {
     "node": "^18.17.0 || ^20.3.0 || >=21.0.0",

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.0-alpha.8",
+  "version": "0.33.0-alpha.9",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://github.com/lovell/sharp",
   "contributors": [
@@ -139,27 +139,27 @@
     "semver": "^7.5.4"
   },
   "optionalDependencies": {
-    "@sharpen/sharp-darwin-arm64": "0.0.1-alpha.8",
-    "@sharpen/sharp-darwin-x64": "0.0.1-alpha.8",
-    "@sharpen/sharp-libvips-darwin-arm64": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-darwin-x64": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-linux-arm": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-linux-arm64": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-linux-x64": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-linuxmusl-arm64": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-linuxmusl-x64": "0.0.1-alpha.2",
-    "@sharpen/sharp-linux-arm": "0.0.1-alpha.8",
-    "@sharpen/sharp-linux-arm64": "0.0.1-alpha.8",
-    "@sharpen/sharp-linux-x64": "0.0.1-alpha.8",
-    "@sharpen/sharp-linuxmusl-arm64": "0.0.1-alpha.8",
-    "@sharpen/sharp-linuxmusl-x64": "0.0.1-alpha.8",
-    "@sharpen/sharp-win32-ia32": "0.0.1-alpha.8",
-    "@sharpen/sharp-win32-x64": "0.0.1-alpha.8"
+    "@img/sharp-darwin-arm64": "0.33.0-alpha.9",
+    "@img/sharp-darwin-x64": "0.33.0-alpha.9",
+    "@img/sharp-libvips-darwin-arm64": "0.0.1",
+    "@img/sharp-libvips-darwin-x64": "0.0.1",
+    "@img/sharp-libvips-linux-arm": "0.0.1",
+    "@img/sharp-libvips-linux-arm64": "0.0.1",
+    "@img/sharp-libvips-linux-x64": "0.0.1",
+    "@img/sharp-libvips-linuxmusl-arm64": "0.0.1",
+    "@img/sharp-libvips-linuxmusl-x64": "0.0.1",
+    "@img/sharp-linux-arm": "0.33.0-alpha.9",
+    "@img/sharp-linux-arm64": "0.33.0-alpha.9",
+    "@img/sharp-linux-x64": "0.33.0-alpha.9",
+    "@img/sharp-linuxmusl-arm64": "0.33.0-alpha.9",
+    "@img/sharp-linuxmusl-x64": "0.33.0-alpha.9",
+    "@img/sharp-win32-ia32": "0.33.0-alpha.9",
+    "@img/sharp-win32-x64": "0.33.0-alpha.9"
   },
   "devDependencies": {
-    "@sharpen/sharp-libvips-dev": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-win32-ia32": "0.0.1-alpha.2",
-    "@sharpen/sharp-libvips-win32-x64": "0.0.1-alpha.2",
+    "@img/sharp-libvips-dev": "0.0.1",
+    "@img/sharp-libvips-win32-ia32": "0.0.1",
+    "@img/sharp-libvips-win32-x64": "0.0.1",
     "@types/node": "*",
     "async": "^3.2.4",
     "cc": "^3.0.1",

src/binding.gyp

@@ -157,8 +157,8 @@
               'OTHER_LDFLAGS': [
                 # Ensure runtime linking is relative to sharp.node
                 '-Wl,-rpath,\'@loader_path/../../sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath,\'@loader_path/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
+                '-Wl,-rpath,\'@loader_path/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath,\'@loader_path/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
               ]
             }
           }],
@@ -178,8 +178,8 @@
                 '-Wl,-s',
                 '-Wl,--disable-new-dtags',
                 '-Wl,-rpath=\'$$ORIGIN/../../sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath=\'$$ORIGIN/../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\'',
-                '-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@sharpen/sharp-libvips-<(platform_and_arch)/lib\''
+                '-Wl,-rpath=\'$$ORIGIN/../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\'',
+                '-Wl,-rpath=\'$$ORIGIN/../../../node_modules/@img/sharp-libvips-<(platform_and_arch)/lib\''
               ]
             }
           }]

test/types/sharp.test-d.ts

@@ -659,3 +659,6 @@ sharp('input.tiff').webp({ preset: 'drawing' }).toFile('out.webp');
 sharp('input.tiff').webp({ preset: 'text' }).toFile('out.webp');
 sharp('input.tiff').webp({ preset: 'default' }).toFile('out.webp');
 
+// Allow a boolean or an object for metadata options.
+// https://github.com/lovell/sharp/issues/3822
+sharp(input).withMetadata().withMetadata({}).withMetadata(false);

test/unit/io.js

@@ -459,27 +459,29 @@ describe('Input/output', function () {
     });
   });
 
-  it('Fail when input is invalid Buffer', function (done) {
-    sharp(Buffer.from([0x1, 0x2, 0x3, 0x4])).toBuffer().then(function () {
-      assert(false);
-      done();
-    }).catch(function (err) {
-      assert(err instanceof Error);
-      assert.strictEqual('Input buffer contains unsupported image format', err.message);
-      done();
-    });
-  });
+  it('Fail when input is invalid Buffer', async () =>
+    assert.rejects(
+      () => sharp(Buffer.from([0x1, 0x2, 0x3, 0x4])).toBuffer(),
+      (err) => {
+        assert.strictEqual(err.message, 'Input buffer contains unsupported image format');
+        assert(err.stack.includes('at Sharp.toBuffer'));
+        assert(err.stack.includes(__filename));
+        return true;
+      }
+    )
+  );
 
-  it('Fail when input file path is missing', function (done) {
-    sharp('does-not-exist').toBuffer().then(function () {
-      assert(false);
-      done();
-    }).catch(function (err) {
-      assert(err instanceof Error);
-      assert.strictEqual('Input file is missing: does-not-exist', err.message);
-      done();
-    });
-  });
+  it('Fail when input file path is missing', async () =>
+    assert.rejects(
+      () => sharp('does-not-exist').toFile('fail'),
+      (err) => {
+        assert.strictEqual(err.message, 'Input file is missing: does-not-exist');
+        assert(err.stack.includes('at Sharp.toFile'));
+        assert(err.stack.includes(__filename));
+        return true;
+      }
+    )
+  );
 
   describe('Fail for unsupported input', function () {
     it('Undefined', function () {

test/unit/metadata.js

@@ -395,13 +395,27 @@ describe('Image metadata', function () {
     });
   });
 
-  it('Non-existent file in, Promise out', function (done) {
-    sharp('fail').metadata().then(function (metadata) {
-      throw new Error('Non-existent file');
-    }, function (err) {
-      assert.ok(!!err);
-      done();
-    });
+  it('Non-existent file in, Promise out', async () =>
+    assert.rejects(
+      () => sharp('fail').metadata(),
+      (err) => {
+        assert.strictEqual(err.message, 'Input file is missing: fail');
+        assert(err.stack.includes('at Sharp.metadata'));
+        assert(err.stack.includes(__filename));
+        return true;
+      }
+    )
+  );
+
+  it('Invalid stream in, callback out', (done) => {
+    fs.createReadStream(__filename).pipe(
+      sharp().metadata((err) => {
+        assert.strictEqual(err.message, 'Input buffer contains unsupported image format');
+        assert(err.stack.includes('at Sharp.metadata'));
+        assert(err.stack.includes(__filename));
+        done();
+      })
+    );
   });
 
   it('Stream in, Promise out', function (done) {

test/unit/stats.js

@@ -690,11 +690,25 @@ describe('Image Stats', function () {
   it('File input with corrupt header fails gracefully', function (done) {
     sharp(fixtures.inputJpgWithCorruptHeader)
       .stats(function (err) {
-        assert.strictEqual(true, !!err);
+        assert(err.message.includes('Input file has corrupt header'));
+        assert(err.stack.includes('at Sharp.stats'));
+        assert(err.stack.includes(__filename));
         done();
       });
   });
 
+  it('Stream input with corrupt header fails gracefully', function (done) {
+    fs.createReadStream(fixtures.inputJpgWithCorruptHeader).pipe(
+      sharp()
+        .stats(function (err) {
+          assert(err.message.includes('Input buffer has corrupt header'));
+          assert(err.stack.includes('at Sharp.stats'));
+          assert(err.stack.includes(__filename));
+          done();
+        })
+    );
+  });
+
   it('File input with corrupt header fails gracefully, Promise out', function () {
     return sharp(fixtures.inputJpgWithCorruptHeader)
       .stats().then(function (stats) {