From 49c54c0805ab26410a62e0251fee3a28b98c0e13 Mon Sep 17 00:00:00 2001
From: Benjamin Lupton <b@lupton.cc>
Date: Wed, 24 Jun 2020 12:32:43 +1000
Subject: fix(std/node): fix readFile types, add encoding types (#6451)

---
 std/node/_fs/promises/_fs_readFile.ts | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

(limited to 'std/node/_fs/promises/_fs_readFile.ts')

diff --git a/std/node/_fs/promises/_fs_readFile.ts b/std/node/_fs/promises/_fs_readFile.ts
index 9e4a4ed43..83ef9ac50 100644
--- a/std/node/_fs/promises/_fs_readFile.ts
+++ b/std/node/_fs/promises/_fs_readFile.ts
@@ -1,16 +1,28 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-import { FileOptions } from "../_fs_common.ts";
-import { MaybeEmpty } from "../../_utils.ts";
-
+import {
+  FileOptionsArgument,
+  BinaryOptionsArgument,
+  TextOptionsArgument,
+} from "../_fs_common.ts";
 import { readFile as readFileCallback } from "../_fs_readFile.ts";
 
 export function readFile(
   path: string | URL,
-  options?: FileOptions | string
-): Promise<MaybeEmpty<string | Uint8Array>> {
+  options: TextOptionsArgument
+): Promise<string>;
+export function readFile(
+  path: string | URL,
+  options?: BinaryOptionsArgument
+): Promise<Uint8Array>;
+export function readFile(
+  path: string | URL,
+  options?: FileOptionsArgument
+): Promise<string | Uint8Array> {
   return new Promise((resolve, reject) => {
     readFileCallback(path, options, (err, data): void => {
       if (err) return reject(err);
+      if (data == null)
+        return reject(new Error("Invalid state: data missing, but no error"));
       resolve(data);
     });
   });
-- 
cgit v1.2.3