fs: use encoding in readFile

Benjamin Gruenbaum · lpinca · commit e06ad5faf98a · 2018-03-24T18:23:08.000+01:00
Use the encoding parameter passed to fsPromises.readFile if it is passed. Currently the encoding parameter is ignored in fsPromises. PR-URL: #19296 Fixes: #19286 Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com> Reviewed-By: Evan Lucas <evanlucas@me.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Yuta Hiroto <hello@hiroppy.me>
diff --git a/lib/fs/promises.js b/lib/fs/promises.js
@@ -157,7 +157,12 @@ async function readFileHandle(filehandle, options) {
       chunks.push(buffer.slice(0, totalRead));
   } while (totalRead === chunkSize);
 
-  return Buffer.concat(chunks);
+  const result = Buffer.concat(chunks);
+  if (options.encoding) {
+    return result.toString(options.encoding);
+  } else {
+    return result;
+  }
 }
 
 // All of the functions are defined as async in order to ensure that errors
diff --git a/test/parallel/test-fs-promises-writefile.js b/test/parallel/test-fs-promises-writefile.js
@@ -35,7 +35,15 @@ async function doRead() {
   assert.deepStrictEqual(buf, data);
 }
 
+async function doReadWithEncoding() {
+  const data = await fsPromises.readFile(dest, 'utf-8');
+  const syncData = fs.readFileSync(dest, 'utf-8');
+  assert.strictEqual(typeof data, 'string');
+  assert.deepStrictEqual(data, syncData);
+}
+
 doWrite()
   .then(doAppend)
   .then(doRead)
+  .then(doReadWithEncoding)
   .then(common.mustCall());
