Merge pull request #5 from paras20xx/master

Added support for configuring 'failOnError' for Sharp engine
papandreou · Sep 21, 2021 · b1932c0 · b1932c0
2 parents ec467a0 + f67e55b
commit b1932c0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/src/Impro.js b/src/Impro.js
@@ -30,6 +30,7 @@ module.exports = class Impro {
       'maxOutputPixels',
       'sharpCache',
       'svgAssetPath',
+      'sharpFailOnError',
     ];
 
     this.restrictedOptions = ['svgAssetPath'];

diff --git a/src/engines/sharp.js b/src/engines/sharp.js
@@ -158,6 +158,16 @@ module.exports = {
     options = options ? { ...options } : {};
     const impro = pipeline.impro;
     const cache = pipeline.options.sharpCache || options.cache;
+    const failOnError = (() => {
+      // TODO: Switch to using "Nullish coalescing operator (??)" once only Node.js 14 onwards are supported
+      if (typeof pipeline.options.sharpFailOnError !== 'undefined') {
+        return pipeline.options.sharpFailOnError;
+      } else if (typeof options.failOnError !== 'undefined') {
+        return options.failOnError;
+      } else {
+        return true;
+      }
+    })();
     // Would make sense to move the _sharpCacheSet property to the type, but that breaks some test scenarios:
     if (cache !== 'undefined' && !impro._sharpCacheSet) {
       sharp.cache(cache);
@@ -280,7 +290,7 @@ module.exports = {
     });
 
     // ensure at least one option is present
-    options = { failOnError: true, ...options };
+    options = { failOnError, ...options };
 
     if (pipeline.options.maxInputPixels) {
       options.limitInputPixels = pipeline.options.maxInputPixels;