🤖 Merge PR DefinitelyTyped#72097 [node] buffer: allow ArrayBuffer | string to be passed to Buffer.from by @sapphi-red

Author: sapphi-red

types/node/buffer.buffer.d.ts

@@ -160,6 +160,7 @@ declare module "buffer" {
              * @param encoding The encoding of `string`. **Default:** `'utf8'`.
              */
             from(string: WithImplicitCoercion<string>, encoding?: BufferEncoding): Buffer<ArrayBuffer>;
+            from(arrayOrString: WithImplicitCoercion<ArrayLike<number> | string>): Buffer<ArrayBuffer>;
             /**
              * Creates a new Buffer using the passed {data}
              * @param values to create a new Buffer

types/node/test/buffer.ts

@@ -149,6 +149,17 @@ const result2 = Buffer.concat([utf8Buffer, base64Buffer] as readonly Uint8Array[
         Buffer.from({} as { [Symbol.toPrimitive](): number });
     }
 
+    // ArrayLike or string
+    {
+        const arrayOrString = "foo" as number[] | string;
+        // $ExpectType Buffer || Buffer<ArrayBuffer>
+        Buffer.from(arrayOrString);
+
+        const typedArrayOrString = "foo" as Uint8Array<ArrayBuffer> | string;
+        // $ExpectType Buffer || Buffer<ArrayBuffer>
+        Buffer.from(typedArrayOrString);
+    }
+
     // @ts-expect-error
     Buffer.from({});
     // @ts-expect-error

types/node/ts5.6/buffer.buffer.d.ts

@@ -158,6 +158,7 @@ declare module "buffer" {
              * @param encoding The encoding of `string`. **Default:** `'utf8'`.
              */
             from(string: WithImplicitCoercion<string>, encoding?: BufferEncoding): Buffer;
+            from(arrayOrString: WithImplicitCoercion<ArrayLike<number> | string>): Buffer;
             /**
              * Creates a new Buffer using the passed {data}
              * @param values to create a new Buffer

types/node/v18/buffer.buffer.d.ts

@@ -155,6 +155,7 @@ declare module "buffer" {
              * @param encoding The encoding of `string`. **Default:** `'utf8'`.
              */
             from(string: WithImplicitCoercion<string>, encoding?: BufferEncoding): Buffer<ArrayBuffer>;
+            from(arrayOrString: WithImplicitCoercion<ArrayLike<number> | string>): Buffer<ArrayBuffer>;
             /**
              * Creates a new Buffer using the passed {data}
              * @param values to create a new Buffer

types/node/v18/test/buffer.ts

@@ -148,6 +148,17 @@ const result2 = Buffer.concat([utf8Buffer, base64Buffer] as readonly Uint8Array[
         Buffer.from({} as { [Symbol.toPrimitive](): number });
     }
 
+    // ArrayLike or string
+    {
+        const arrayOrString = "foo" as number[] | string;
+        // $ExpectType Buffer || Buffer<ArrayBuffer>
+        Buffer.from(arrayOrString);
+
+        const typedArrayOrString = "foo" as Uint8Array<ArrayBuffer> | string;
+        // $ExpectType Buffer || Buffer<ArrayBuffer>
+        Buffer.from(typedArrayOrString);
+    }
+
     // @ts-expect-error
     Buffer.from({});
     // @ts-expect-error

types/node/v18/ts5.6/buffer.buffer.d.ts

@@ -153,6 +153,7 @@ declare module "buffer" {
              * @param encoding The encoding of `string`. **Default:** `'utf8'`.
              */
             from(string: WithImplicitCoercion<string>, encoding?: BufferEncoding): Buffer;
+            from(arrayOrString: WithImplicitCoercion<ArrayLike<number> | string>): Buffer;
             /**
              * Creates a new Buffer using the passed {data}
              * @param values to create a new Buffer

types/node/v20/buffer.buffer.d.ts

@@ -160,6 +160,7 @@ declare module "buffer" {
              * @param encoding The encoding of `string`. **Default:** `'utf8'`.
              */
             from(string: WithImplicitCoercion<string>, encoding?: BufferEncoding): Buffer<ArrayBuffer>;
+            from(arrayOrString: WithImplicitCoercion<ArrayLike<number> | string>): Buffer<ArrayBuffer>;
             /**
              * Creates a new Buffer using the passed {data}
              * @param values to create a new Buffer

types/node/v20/test/buffer.ts

@@ -149,6 +149,17 @@ const result2 = Buffer.concat([utf8Buffer, base64Buffer] as readonly Uint8Array[
         Buffer.from({} as { [Symbol.toPrimitive](): number });
     }
 
+    // ArrayLike or string
+    {
+        const arrayOrString = "foo" as number[] | string;
+        // $ExpectType Buffer || Buffer<ArrayBuffer>
+        Buffer.from(arrayOrString);
+
+        const typedArrayOrString = "foo" as Uint8Array<ArrayBuffer> | string;
+        // $ExpectType Buffer || Buffer<ArrayBuffer>
+        Buffer.from(typedArrayOrString);
+    }
+
     // @ts-expect-error
     Buffer.from({});
     // @ts-expect-error

types/node/v20/ts5.6/buffer.buffer.d.ts

@@ -158,6 +158,7 @@ declare module "buffer" {
              * @param encoding The encoding of `string`. **Default:** `'utf8'`.
              */
             from(string: WithImplicitCoercion<string>, encoding?: BufferEncoding): Buffer;
+            from(arrayOrString: WithImplicitCoercion<ArrayLike<number> | string>): Buffer;
             /**
              * Creates a new Buffer using the passed {data}
              * @param values to create a new Buffer