sharp 0.35.1 → 0.35.2-rc.1

package/dist/operation.cjs

@@ -424,10 +424,10 @@ function blur (options) {
 function dilate (width) {
   if (!is.defined(width)) {
     this.options.dilateWidth = 1;
-  } else if (is.integer(width) && width > 0) {
+  } else if (is.integer(width) && is.inRange(width, 1, 65536)) {
     this.options.dilateWidth = width;
   } else {
-    throw is.invalidParameterError('dilate', 'positive integer', dilate);
+    throw is.invalidParameterError('width', 'integer between 1 and 65536', width);
   }
   return this;
 }
@@ -447,10 +447,10 @@ function dilate (width) {
 function erode (width) {
   if (!is.defined(width)) {
     this.options.erodeWidth = 1;
-  } else if (is.integer(width) && width > 0) {
+  } else if (is.integer(width) && is.inRange(width, 1, 65536)) {
     this.options.erodeWidth = width;
   } else {
-    throw is.invalidParameterError('erode', 'positive integer', erode);
+    throw is.invalidParameterError('width', 'integer between 1 and 65536', width);
   }
   return this;
 }
@@ -862,10 +862,13 @@ function recomb (inputMatrix) {
   if (inputMatrix.length !== 3 && inputMatrix.length !== 4) {
     throw is.invalidParameterError('inputMatrix', '3x3 or 4x4 array', inputMatrix.length);
   }
-  const recombMatrix = inputMatrix.flat().map(Number);
+  const recombMatrix = inputMatrix.flat();
   if (recombMatrix.length !== 9 && recombMatrix.length !== 16) {
     throw is.invalidParameterError('inputMatrix', 'cardinality of 9 or 16', recombMatrix.length);
   }
+  if (!recombMatrix.every(is.number)) {
+    throw is.invalidParameterError('inputMatrix', 'array of numbers', recombMatrix);
+  }
   this.options.recombMatrix = recombMatrix;
   return this;
 }

package/dist/operation.mjs

@@ -424,10 +424,10 @@ function blur (options) {
 function dilate (width) {
   if (!is.defined(width)) {
     this.options.dilateWidth = 1;
-  } else if (is.integer(width) && width > 0) {
+  } else if (is.integer(width) && is.inRange(width, 1, 65536)) {
     this.options.dilateWidth = width;
   } else {
-    throw is.invalidParameterError('dilate', 'positive integer', dilate);
+    throw is.invalidParameterError('width', 'integer between 1 and 65536', width);
   }
   return this;
 }
@@ -447,10 +447,10 @@ function dilate (width) {
 function erode (width) {
   if (!is.defined(width)) {
     this.options.erodeWidth = 1;
-  } else if (is.integer(width) && width > 0) {
+  } else if (is.integer(width) && is.inRange(width, 1, 65536)) {
     this.options.erodeWidth = width;
   } else {
-    throw is.invalidParameterError('erode', 'positive integer', erode);
+    throw is.invalidParameterError('width', 'integer between 1 and 65536', width);
   }
   return this;
 }
@@ -862,10 +862,13 @@ function recomb (inputMatrix) {
   if (inputMatrix.length !== 3 && inputMatrix.length !== 4) {
     throw is.invalidParameterError('inputMatrix', '3x3 or 4x4 array', inputMatrix.length);
   }
-  const recombMatrix = inputMatrix.flat().map(Number);
+  const recombMatrix = inputMatrix.flat();
   if (recombMatrix.length !== 9 && recombMatrix.length !== 16) {
     throw is.invalidParameterError('inputMatrix', 'cardinality of 9 or 16', recombMatrix.length);
   }
+  if (!recombMatrix.every(is.number)) {
+    throw is.invalidParameterError('inputMatrix', 'array of numbers', recombMatrix);
+  }
   this.options.recombMatrix = recombMatrix;
   return this;
 }

package/dist/output.cjs

@@ -929,7 +929,7 @@ function gif (options) {
       }
     }
     if (is.defined(options.effort)) {
-      if (is.number(options.effort) && is.inRange(options.effort, 1, 10)) {
+      if (is.integer(options.effort) && is.inRange(options.effort, 1, 10)) {
         this.options.gifEffort = options.effort;
       } else {
         throw is.invalidParameterError('effort', 'integer between 1 and 10', options.effort);

package/dist/output.mjs

@@ -929,7 +929,7 @@ function gif (options) {
       }
     }
     if (is.defined(options.effort)) {
-      if (is.number(options.effort) && is.inRange(options.effort, 1, 10)) {
+      if (is.integer(options.effort) && is.inRange(options.effort, 1, 10)) {
         this.options.gifEffort = options.effort;
       } else {
         throw is.invalidParameterError('effort', 'integer between 1 and 10', options.effort);

package/dist/sharp.cjs

@@ -82,11 +82,8 @@ if (!sharp) {
       case "linux-wasm32":
         sharp = require("@img/sharp-webcontainers-wasm32/sharp.node");
         break;
-      default:
-        sharp = require("@img/sharp-wasm32/sharp.node");
-        break;
     }
-    if (["linux-x64", "linuxmusl-x64"].includes(runtimePlatform) && !sharp._isUsingX64V2()) {
+    if (sharp && ["linux-x64", "linuxmusl-x64"].includes(runtimePlatform) && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for Linux x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -96,6 +93,13 @@ if (!sharp) {
     errors.push(err);
   }
 }
+if (!sharp) {
+  try {
+    sharp = require("@img/sharp-wasm32/sharp.node");
+  } catch (err) {
+    errors.push(err);
+  }
+}
 
 if (!sharp) {
   const [isLinux, isMacOs, isWindows] = ["linux", "darwin", "win32"].map((os) => runtimePlatform.startsWith(os));

package/dist/sharp.mjs

@@ -82,11 +82,8 @@ if (!sharp) {
       case "linux-wasm32":
         sharp = require("@img/sharp-webcontainers-wasm32/sharp.node");
         break;
-      default:
-        sharp = require("@img/sharp-wasm32/sharp.node");
-        break;
     }
-    if (["linux-x64", "linuxmusl-x64"].includes(runtimePlatform) && !sharp._isUsingX64V2()) {
+    if (sharp && ["linux-x64", "linuxmusl-x64"].includes(runtimePlatform) && !sharp._isUsingX64V2()) {
       const err = new Error("Prebuilt binaries for Linux x64 require v2 microarchitecture");
       err.code = "Unsupported CPU";
       errors.push(err);
@@ -96,6 +93,13 @@ if (!sharp) {
     errors.push(err);
   }
 }
+if (!sharp) {
+  try {
+    sharp = require("@img/sharp-wasm32/sharp.node");
+  } catch (err) {
+    errors.push(err);
+  }
+}
 
 if (!sharp) {
   const [isLinux, isMacOs, isWindows] = ["linux", "darwin", "win32"].map((os) => runtimePlatform.startsWith(os));

package/lib/index.d.ts

@@ -1187,6 +1187,23 @@ declare namespace sharp {
 
     type Unit = 'inch' | 'cm';
 
+    type MediaType =
+        'application/pdf' |
+        'image/avif' |
+        'image/fits' |
+        'image/gif' |
+        'image/heic' |
+        'image/jp2' |
+        'image/jpeg' |
+        'image/jxl' |
+        'image/png' |
+        'image/svg+xml' |
+        'image/tiff' |
+        'image/vnd.radiance' |
+        'image/webp' |
+        'image/x-exr' |
+        'image/x-portable-pixmap';
+
     interface WriteableMetadata {
         /** Number of pixels per inch (DPI) */
         density?: number | undefined;
@@ -1280,6 +1297,8 @@ declare namespace sharp {
         comments?: CommentsMetadata[] | undefined;
         /** HDR gain map, if present */
         gainMap?: GainMapMetadata | undefined;
+        /** Media Type (MIME Type) */
+        mediaType?: MediaType | undefined;
     }
 
     interface LevelMetadata {
@@ -1973,4 +1992,4 @@ declare namespace sharp {
     type Matrix4x4 = [[number, number, number, number], [number, number, number, number], [number, number, number, number], [number, number, number, number]];
 }
 
-export default sharp;
+export = sharp;

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.1",
+  "version": "0.35.2-rc.1",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -102,7 +102,7 @@
     "lint-cpp": "cpplint --quiet src/*.h src/*.cc",
     "lint-js": "biome lint",
     "lint-publish": "publint --strict",
-    "lint-types": "tsd --files ./test/types/sharp.test-d.ts",
+    "lint-types": "tsd --files ./test/types/sharp.test-d.{cts,mts}",
     "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",
@@ -163,9 +163,9 @@
     "semver": "^7.8.4"
   },
   "optionalDependencies": {
-    "@img/sharp-darwin-arm64": "0.35.1",
-    "@img/sharp-darwin-x64": "0.35.1",
-    "@img/sharp-freebsd-wasm32": "0.35.1",
+    "@img/sharp-darwin-arm64": "0.35.2-rc.1",
+    "@img/sharp-darwin-x64": "0.35.2-rc.1",
+    "@img/sharp-freebsd-wasm32": "0.35.2-rc.1",
     "@img/sharp-libvips-darwin-arm64": "1.3.0",
     "@img/sharp-libvips-darwin-x64": "1.3.0",
     "@img/sharp-libvips-linux-arm": "1.3.0",
@@ -176,21 +176,21 @@
     "@img/sharp-libvips-linux-x64": "1.3.0",
     "@img/sharp-libvips-linuxmusl-arm64": "1.3.0",
     "@img/sharp-libvips-linuxmusl-x64": "1.3.0",
-    "@img/sharp-linux-arm": "0.35.1",
-    "@img/sharp-linux-arm64": "0.35.1",
-    "@img/sharp-linux-ppc64": "0.35.1",
-    "@img/sharp-linux-riscv64": "0.35.1",
-    "@img/sharp-linux-s390x": "0.35.1",
-    "@img/sharp-linux-x64": "0.35.1",
-    "@img/sharp-linuxmusl-arm64": "0.35.1",
-    "@img/sharp-linuxmusl-x64": "0.35.1",
-    "@img/sharp-webcontainers-wasm32": "0.35.1",
-    "@img/sharp-win32-arm64": "0.35.1",
-    "@img/sharp-win32-ia32": "0.35.1",
-    "@img/sharp-win32-x64": "0.35.1"
+    "@img/sharp-linux-arm": "0.35.2-rc.1",
+    "@img/sharp-linux-arm64": "0.35.2-rc.1",
+    "@img/sharp-linux-ppc64": "0.35.2-rc.1",
+    "@img/sharp-linux-riscv64": "0.35.2-rc.1",
+    "@img/sharp-linux-s390x": "0.35.2-rc.1",
+    "@img/sharp-linux-x64": "0.35.2-rc.1",
+    "@img/sharp-linuxmusl-arm64": "0.35.2-rc.1",
+    "@img/sharp-linuxmusl-x64": "0.35.2-rc.1",
+    "@img/sharp-webcontainers-wasm32": "0.35.2-rc.1",
+    "@img/sharp-win32-arm64": "0.35.2-rc.1",
+    "@img/sharp-win32-ia32": "0.35.2-rc.1",
+    "@img/sharp-win32-x64": "0.35.2-rc.1"
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.4.16",
+    "@biomejs/biome": "^2.5.0",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.11.0",
     "@img/sharp-libvips-dev": "1.3.0",