@revizly/sharp 0.35.0-revizly55 → 0.35.0-revizly56

package/dist/constructor.cjs

@@ -202,7 +202,7 @@ const queueListener = (queueLength) => {
  * @param {string} [options.text.wrap='word'] - word wrapping style when width is provided, one of: 'word', 'char', 'word-char' (prefer word, fallback to char) or 'none'.
  * @param {Object} [options.join] - describes how an array of input images should be joined.
  * @param {number} [options.join.across=1] - number of images to join horizontally.
- * @param {boolean} [options.join.animated=false] - set this to `true` to join the images as an animated image.
+ * @param {boolean} [options.join.animated=false] - set this to `true` to join the images as an animated image, cannot be used with `across` or `shim`.
  * @param {number} [options.join.shim=0] - number of pixels to insert between joined images.
  * @param {string|Object} [options.join.background] - parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
  * @param {string} [options.join.halign='left'] - horizontal alignment style for images joined horizontally (`'left'`, `'centre'`, `'center'`, `'right'`).

package/dist/constructor.mjs

@@ -202,7 +202,7 @@ const queueListener = (queueLength) => {
  * @param {string} [options.text.wrap='word'] - word wrapping style when width is provided, one of: 'word', 'char', 'word-char' (prefer word, fallback to char) or 'none'.
  * @param {Object} [options.join] - describes how an array of input images should be joined.
  * @param {number} [options.join.across=1] - number of images to join horizontally.
- * @param {boolean} [options.join.animated=false] - set this to `true` to join the images as an animated image.
+ * @param {boolean} [options.join.animated=false] - set this to `true` to join the images as an animated image, cannot be used with `across` or `shim`.
  * @param {number} [options.join.shim=0] - number of pixels to insert between joined images.
  * @param {string|Object} [options.join.background] - parsed by the [color](https://www.npmjs.org/package/color) module to extract values for red, green, blue and alpha.
  * @param {string} [options.join.halign='left'] - horizontal alignment style for images joined horizontally (`'left'`, `'centre'`, `'center'`, `'right'`).

package/dist/index.d.cts

@@ -1,3 +1,4 @@
+/* cspell:disable */
 /**
  * Copyright 2017 François Nguyen and others.
  *
@@ -22,6 +23,7 @@
  * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+/* cspell:enable */
 
 // SPDX-License-Identifier: MIT
 
@@ -408,7 +410,7 @@ declare namespace sharp {
 
         /**
          * Alias for calling `rotate()` with no arguments, which orients the image based
-         * on EXIF orientsion.
+         * on EXIF orientation.
          *
          * This operation is aliased to emphasize its purpose, helping to remove any
          * confusion between rotation and orientation.
@@ -580,7 +582,7 @@ declare namespace sharp {
         convolve(kernel: Kernel): Sharp;
 
         /**
-         * Any pixel value greather than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
+         * Any pixel value greater than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
          * @param threshold a value in the range 0-255 representing the level at which the threshold will be applied. (optional, default 128)
          * @param options threshold options
          * @throws {Error} Invalid parameters
@@ -1703,7 +1705,7 @@ declare namespace sharp {
         left?: number | undefined;
         /** set to true to repeat the overlay image across the entire image with the given  gravity. (optional, default false) */
         tile?: boolean | undefined;
-        /** Set to true to avoid premultipling the image below. Equivalent to the --premultiplied vips option. */
+        /** Set to true to avoid premultiplying the image below. Equivalent to the --premultiplied vips option. */
         premultiplied?: boolean | undefined;
         /** number representing the DPI for vector overlay image. (optional, default 72)*/
         density?: number | undefined;

package/dist/index.d.mts

@@ -1,3 +1,4 @@
+/* cspell:disable */
 /**
  * Copyright 2017 François Nguyen and others.
  *
@@ -22,6 +23,7 @@
  * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+/* cspell:enable */
 
 // SPDX-License-Identifier: MIT
 
@@ -402,7 +404,7 @@ export interface Sharp extends Duplex {
 
     /**
      * Alias for calling `rotate()` with no arguments, which orients the image based
-     * on EXIF orientsion.
+     * on EXIF orientation.
      *
      * This operation is aliased to emphasize its purpose, helping to remove any
      * confusion between rotation and orientation.
@@ -574,7 +576,7 @@ export interface Sharp extends Duplex {
     convolve(kernel: Kernel): Sharp;
 
     /**
-     * Any pixel value greather than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
+     * Any pixel value greater than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
      * @param threshold a value in the range 0-255 representing the level at which the threshold will be applied. (optional, default 128)
      * @param options threshold options
      * @throws {Error} Invalid parameters
@@ -1697,7 +1699,7 @@ export interface OverlayOptions extends SharpOptions {
     left?: number | undefined;
     /** set to true to repeat the overlay image across the entire image with the given  gravity. (optional, default false) */
     tile?: boolean | undefined;
-    /** Set to true to avoid premultipling the image below. Equivalent to the --premultiplied vips option. */
+    /** Set to true to avoid premultiplying the image below. Equivalent to the --premultiplied vips option. */
     premultiplied?: boolean | undefined;
     /** number representing the DPI for vector overlay image. (optional, default 72)*/
     density?: number | undefined;

package/dist/input.cjs

@@ -511,6 +511,9 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
             throw is.invalidParameterError('join.valign', 'valid alignment', inputOptions.join.valign);
           }
         }
+        if (inputDescriptor.joinAnimated && (inputDescriptor.joinAcross > 1 || inputDescriptor.joinShim > 0)) {
+          throw new Error('Expected neither join.across nor join.shim when join.animated is set');
+        }
       } else {
         throw new Error('Expected input to be an array of images to join');
       }

package/dist/input.mjs

@@ -511,6 +511,9 @@ function _createInputDescriptor (input, inputOptions, containerOptions) {
             throw is.invalidParameterError('join.valign', 'valid alignment', inputOptions.join.valign);
           }
         }
+        if (inputDescriptor.joinAnimated && (inputDescriptor.joinAcross > 1 || inputDescriptor.joinShim > 0)) {
+          throw new Error('Expected neither join.across nor join.shim when join.animated is set');
+        }
       } else {
         throw new Error('Expected input to be an array of images to join');
       }

package/dist/operation.cjs

@@ -62,7 +62,7 @@ function rotate (angle, options) {
     this.options.rotationAngle = 0;
   }
   if (is.integer(angle) && !(angle % 90)) {
-    this.options.angle = angle;
+    this.options.angle = angle % 360;
   } else if (is.number(angle)) {
     this.options.rotationAngle = angle;
     if (is.object(options) && options.background) {

package/dist/operation.mjs

@@ -62,7 +62,7 @@ function rotate (angle, options) {
     this.options.rotationAngle = 0;
   }
   if (is.integer(angle) && !(angle % 90)) {
-    this.options.angle = angle;
+    this.options.angle = angle % 360;
   } else if (is.number(angle)) {
     this.options.rotationAngle = angle;
     if (is.object(options) && options.background) {

package/dist/output.cjs

@@ -1524,7 +1524,7 @@ function tile (options) {
     // Angle of rotation,
     if (is.defined(options.angle)) {
       if (is.integer(options.angle) && !(options.angle % 90)) {
-        this.options.tileAngle = options.angle;
+        this.options.tileAngle = options.angle % 360;
       } else {
         throw is.invalidParameterError('angle', 'positive/negative multiple of 90', options.angle);
       }

package/dist/output.mjs

@@ -1524,7 +1524,7 @@ function tile (options) {
     // Angle of rotation,
     if (is.defined(options.angle)) {
       if (is.integer(options.angle) && !(options.angle % 90)) {
-        this.options.tileAngle = options.angle;
+        this.options.tileAngle = options.angle % 360;
       } else {
         throw is.invalidParameterError('angle', 'positive/negative multiple of 90', options.angle);
       }

package/dist/resize.cjs

@@ -52,7 +52,7 @@ const extendWith = {
 };
 
 /**
- * Strategies for automagic cover behaviour.
+ * Strategies for cover behaviour.
  * @member
  * @private
  */

package/dist/resize.mjs

@@ -52,7 +52,7 @@ const extendWith = {
 };
 
 /**
- * Strategies for automagic cover behaviour.
+ * Strategies for cover behaviour.
  * @member
  * @private
  */

package/lib/index.d.ts

@@ -1,3 +1,4 @@
+/* cspell:disable */
 /**
  * Copyright 2017 François Nguyen and others.
  *
@@ -22,6 +23,7 @@
  * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
+/* cspell:enable */
 
 // SPDX-License-Identifier: MIT
 
@@ -408,7 +410,7 @@ declare namespace sharp {
 
         /**
          * Alias for calling `rotate()` with no arguments, which orients the image based
-         * on EXIF orientsion.
+         * on EXIF orientation.
          *
          * This operation is aliased to emphasize its purpose, helping to remove any
          * confusion between rotation and orientation.
@@ -580,7 +582,7 @@ declare namespace sharp {
         convolve(kernel: Kernel): Sharp;
 
         /**
-         * Any pixel value greather than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
+         * Any pixel value greater than or equal to the threshold value will be set to 255, otherwise it will be set to 0.
          * @param threshold a value in the range 0-255 representing the level at which the threshold will be applied. (optional, default 128)
          * @param options threshold options
          * @throws {Error} Invalid parameters
@@ -1703,7 +1705,7 @@ declare namespace sharp {
         left?: number | undefined;
         /** set to true to repeat the overlay image across the entire image with the given  gravity. (optional, default false) */
         tile?: boolean | undefined;
-        /** Set to true to avoid premultipling the image below. Equivalent to the --premultiplied vips option. */
+        /** Set to true to avoid premultiplying the image below. Equivalent to the --premultiplied vips option. */
         premultiplied?: boolean | undefined;
         /** number representing the DPI for vector overlay image. (optional, default 72)*/
         density?: number | 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-revizly55",
+  "version": "0.35.0-revizly56",
   "author": "Lovell Fuller <npm@lovell.info>",
   "homepage": "https://sharp.pixelplumbing.com",
   "contributors": [
@@ -98,10 +98,11 @@
     "build:dist": "node scripts/build.mjs",
     "clean": "rm -rf src/build/ test/fixtures/output.*",
     "test": "npm run lint && npm run test-unit",
-    "lint": "npm run lint-cpp && npm run lint-js && npm run lint-types && npm run lint-publish",
+    "lint": "npm run lint-cpp && npm run lint-js && npm run lint-types && npm run lint-spell && npm run lint-publish",
     "lint-cpp": "cpplint --quiet src/*.h src/*.cc",
     "lint-js": "biome lint",
     "lint-publish": "publint --strict",
+    "lint-spell": "cspell --config ./test/spell/cspell.jsonc --no-progress .",
     "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",
@@ -163,10 +164,10 @@
     "semver": "^7.8.5"
   },
   "optionalDependencies": {
-    "@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"
+    "@revizly/sharp-libvips-linux-arm64": "1.0.56",
+    "@revizly/sharp-libvips-linux-x64": "1.0.56",
+    "@revizly/sharp-linux-arm64": "0.35.0-revizly56",
+    "@revizly/sharp-linux-x64": "0.35.0-revizly56"
   },
   "peerDependenciesMeta": {
     "@types/node": {
@@ -174,17 +175,18 @@
     }
   },
   "devDependencies": {
-    "@biomejs/biome": "^2.5.14",
+    "@biomejs/biome": "^2.5.15",
     "@cpplint/cli": "^0.1.0",
     "@emnapi/runtime": "^1.11.3",
-    "@revizly/sharp-libvips-dev": "1.0.55",
+    "@revizly/sharp-libvips-dev": "1.0.56",
     "@types/node": "*",
+    "cspell": "^10.4.0",
     "emnapi": "^1.11.3",
     "exif-reader": "^2.0.3",
     "icc": "^4.0.0",
     "node-addon-api": "^8.9.2",
     "node-gyp": "^12.4.0",
-    "publint": "^0.3.24",
+    "publint": "^0.3.25",
     "tar-fs": "^3.1.3",
     "tsd": "^0.33.0",
     "yauzl": "^3.4.0"

package/src/common.cc

@@ -198,7 +198,7 @@ namespace sharp {
     }
     descriptor->limitInputPixels = static_cast<uint64_t>(AttrAsInt64(input, "limitInputPixels"));
     descriptor->limitInputChannels = static_cast<uint64_t>(AttrAsInt64(input, "limitInputChannels"));
-    if (HasAttr(input, "access")) {
+    if (HasAttr(input, "sequentialRead")) {
       descriptor->access = AttrAsBool(input, "sequentialRead") ? VIPS_ACCESS_SEQUENTIAL : VIPS_ACCESS_RANDOM;
     }
     // Remove safety features and allow unlimited input

package/src/operations.cc

@@ -97,7 +97,7 @@ namespace sharp {
   }
 
   /*
-   * Contrast limiting adapative histogram equalization (CLAHE)
+   * Contrast limiting adaptive histogram equalization (CLAHE)
    */
   VImage Clahe(VImage image, int const width, int const height, int const maxSlope) {
     return image.hist_local(width, height, VImage::option()->set("max_slope", maxSlope));

package/src/operations.h

@@ -28,7 +28,7 @@ namespace sharp {
   VImage Normalise(VImage image, int const lower, int const upper);
 
   /*
-   * Contrast limiting adapative histogram equalization (CLAHE)
+   * Contrast limiting adaptive histogram equalization (CLAHE)
    */
   VImage Clahe(VImage image, int const width, int const height, int const maxSlope);
 

package/src/pipeline.cc

@@ -270,7 +270,12 @@ class PipelineWorker : public Napi::AsyncWorker {
         if (baton->input->buffer != nullptr) {
           // Reload JPEG buffer
           VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-          image = VImage::jpegload_buffer(blob, option);
+          try {
+            image = VImage::jpegload_buffer(blob, option);
+          } catch (...) {
+            vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+            throw;
+          }
           vips_area_unref(reinterpret_cast<VipsArea*>(blob));
         } else {
           // Reload JPEG file
@@ -282,7 +287,12 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->input->buffer != nullptr) {
             // Reload WebP buffer
             VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-            image = VImage::webpload_buffer(blob, option);
+            try {
+              image = VImage::webpload_buffer(blob, option);
+            } catch (...) {
+              vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+              throw;
+            }
             vips_area_unref(reinterpret_cast<VipsArea*>(blob));
           } else {
             // Reload WebP file
@@ -292,7 +302,12 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->input->buffer != nullptr) {
             // Reload SVG buffer
             VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-            image = VImage::svgload_buffer(blob, option);
+            try {
+              image = VImage::svgload_buffer(blob, option);
+            } catch (...) {
+              vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+              throw;
+            }
             vips_area_unref(reinterpret_cast<VipsArea*>(blob));
           } else {
             // Reload SVG file
@@ -306,7 +321,12 @@ class PipelineWorker : public Napi::AsyncWorker {
           if (baton->input->buffer != nullptr) {
             // Reload PDF buffer
             VipsBlob *blob = vips_blob_new(nullptr, baton->input->buffer, baton->input->bufferLength);
-            image = VImage::pdfload_buffer(blob, option);
+            try {
+              image = VImage::pdfload_buffer(blob, option);
+            } catch (...) {
+              vips_area_unref(reinterpret_cast<VipsArea*>(blob));
+              throw;
+            }
             vips_area_unref(reinterpret_cast<VipsArea*>(blob));
           } else {
             // Reload PDF file
@@ -1867,9 +1887,9 @@ Napi::Value pipeline(const Napi::CallbackInfo& info) {
     baton->convKernelOffset = sharp::AttrAsDouble(kernel, "offset");
     size_t const kernelSize = static_cast<size_t>(baton->convKernelWidth * baton->convKernelHeight);
     baton->convKernel.resize(kernelSize);
-    Napi::Array kdata = kernel.Get("kernel").As<Napi::Array>();
+    Napi::Array kernelData = kernel.Get("kernel").As<Napi::Array>();
     for (unsigned int i = 0; i < kernelSize; i++) {
-      baton->convKernel[i] = sharp::AttrAsDouble(kdata, i);
+      baton->convKernel[i] = sharp::AttrAsDouble(kernelData, i);
     }
   }
   if (options.Has("recombMatrix")) {

package/src/stats.cc

@@ -60,7 +60,7 @@ class StatsWorker : public Napi::AsyncWorker {
             static_cast<int>(stats.getpoint(STAT_MAXY_INDEX, b).front()));
           baton->channelStats.push_back(cStats);
         }
-        // Image is not opaque when alpha layer is present and contains a non-mamixa value
+        // Image is not opaque when alpha layer is present and contains a non-maxima value
         if (image.has_alpha()) {
           double const minAlpha = static_cast<double>(stats.getpoint(STAT_MIN_INDEX, bands).front());
           if (minAlpha != vips_interpretation_max_alpha(image.interpretation())) {