Commit b703bcd for mammothjs

commit b703bcd2990768beb581be4da96b7ceaee21230b
Author: Michael Williamson <mike@zwobble.org>
Date:   Wed Sep 16 23:16:52 2026 +0100

    Remove promises.when()

diff --git a/lib/fs.js b/lib/fs.js
index 5e2e583..f0c09cf 100644
--- a/lib/fs.js
+++ b/lib/fs.js
@@ -3,11 +3,11 @@ var fs = require("fs");
 var promises = require("./promises");

 function readFile(path, options) {
-    return promises.when(fs.promises.readFile(path, options));
+    return promises.resolve(fs.promises.readFile(path, options));
 }

 function writeFile(path, data, options) {
-    return promises.when(fs.promises.writeFile(path, data, options));
+    return promises.resolve(fs.promises.writeFile(path, data, options));
 }

 exports.createWriteStream = fs.createWriteStream.bind(fs);
diff --git a/lib/images.js b/lib/images.js
index 7c49dbe..2ef609b 100644
--- a/lib/images.js
+++ b/lib/images.js
@@ -7,7 +7,7 @@ exports.imgElement = imgElement;

 function imgElement(func) {
     return function(element, messages) {
-        return promises.when(func(element)).then(function(result) {
+        return promises.resolve(func(element)).then(function(result) {
             var attributes = {};
             if (element.altText) {
                 attributes.alt = element.altText;
diff --git a/lib/promises.js b/lib/promises.js
index 0ad6a62..1d6d23c 100644
--- a/lib/promises.js
+++ b/lib/promises.js
@@ -2,7 +2,6 @@ var _ = require("underscore");
 var bluebird = require("bluebird/js/release/promise")();

 exports.defer = defer;
-exports.when = bluebird.resolve;
 exports.resolve = bluebird.resolve;
 exports.all = bluebird.all;
 exports.props = bluebird.props;
diff --git a/test/document-to-html.tests.js b/test/document-to-html.tests.js
index 8dc1e60..34b8545 100644
--- a/test/document-to-html.tests.js
+++ b/test/document-to-html.tests.js
@@ -785,7 +785,7 @@ test('images are written with data URIs', function() {
     var imageBuffer = new Buffer("Not an image at all!");
     var image = new documents.Image({
         readImage: function(encoding) {
-            return promises.when(imageBuffer.toString(encoding));
+            return promises.resolve(imageBuffer.toString(encoding));
         },
         contentType: "image/png"
     });
@@ -799,7 +799,7 @@ test('images have alt attribute if available', function() {
     var imageBuffer = new Buffer("Not an image at all!");
     var image = new documents.Image({
         readImage: function() {
-            return promises.when(imageBuffer);
+            return promises.resolve(imageBuffer);
         },
         altText: "It's a hat"
     });
@@ -817,7 +817,7 @@ test('can add custom handler for images', function() {
     var imageBuffer = new Buffer("Not an image at all!");
     var image = new documents.Image({
         readImage: function(encoding) {
-            return promises.when(imageBuffer.toString(encoding));
+            return promises.resolve(imageBuffer.toString(encoding));
         },
         contentType: "image/png"
     });
@@ -837,7 +837,7 @@ test('when custom image handler throws error then error is stored in error messa
     var error = new Error("Failed to convert image");
     var image = new documents.Image({
         readImage: function(encoding) {
-            return promises.when(new Buffer().toString(encoding));
+            return promises.resolve(new Buffer().toString(encoding));
         },
         contentType: "image/png"
     });
diff --git a/test/images.tests.js b/test/images.tests.js
index 5bcf3ba..617722f 100644
--- a/test/images.tests.js
+++ b/test/images.tests.js
@@ -22,7 +22,7 @@ test('mammoth.images.dataUri() encodes images in base64', function() {
     var imageBuffer = new Buffer("abc");
     var image = new documents.Image({
         readImage: function(encoding) {
-            return promises.when(imageBuffer.toString(encoding));
+            return promises.resolve(imageBuffer.toString(encoding));
         },
         contentType: "image/jpeg"
     });
@@ -40,7 +40,7 @@ test('mammoth.images.imgElement()', {
         var imageBuffer = new Buffer("abc");
         var image = new documents.Image({
             readImage: function(encoding) {
-                return promises.when(imageBuffer.toString(encoding));
+                return promises.resolve(imageBuffer.toString(encoding));
             },
             contentType: "image/jpeg"
         });
@@ -64,7 +64,7 @@ test('mammoth.images.imgElement()', {
         var imageBuffer = new Buffer("abc");
         var image = new documents.Image({
             readImage: function(encoding) {
-                return promises.when(imageBuffer.toString(encoding));
+                return promises.resolve(imageBuffer.toString(encoding));
             },
             contentType: "image/jpeg",
             altText: "<alt>"
@@ -89,7 +89,7 @@ test('mammoth.images.imgElement()', {
         var imageBuffer = new Buffer("abc");
         var image = new documents.Image({
             readImage: function(encoding) {
-                return promises.when(imageBuffer.toString(encoding));
+                return promises.resolve(imageBuffer.toString(encoding));
             },
             contentType: "image/jpeg",
             altText: "<alt>"
diff --git a/test/testing.js b/test/testing.js
index ef21ba9..b560b1d 100644
--- a/test/testing.js
+++ b/test/testing.js
@@ -38,7 +38,7 @@ function createFakeFiles(files) {

 function createRead(files) {
     function read(path, encoding) {
-        return promises.when(files[path], function(buffer) {
+        return promises.resolve(files[path], function(buffer) {
             if (_.isString(buffer)) {
                 buffer = new Buffer(buffer);
             }
@@ -46,9 +46,9 @@ function createRead(files) {
             if (!Buffer.isBuffer(buffer)) {
                 return promises.reject(new Error("file was not a buffer"));
             } else if (encoding) {
-                return promises.when(buffer.toString(encoding));
+                return promises.resolve(buffer.toString(encoding));
             } else {
-                return promises.when(buffer.buffer);
+                return promises.resolve(buffer.buffer);
             }
         });
     }