Skip to content

Commit dbf7398

Browse files
committed
fix: improve base32/base64 types for format: 'buffer'
1 parent 93472b6 commit dbf7398

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

base32.d.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,9 @@ export function toBase32crockford(arr: Uint8Array, options?: ToBase32Options): s
7676
* @param options - Decoding options
7777
* @returns The decoded bytes
7878
*/
79-
export function fromBase32(string: string, options?: FromBase32Options): Uint8ArrayBuffer;
79+
export function fromBase32(string: string, options?: FromBase32Options & { format?: 'uint8' }): Uint8ArrayBuffer;
8080
export function fromBase32(string: string, options: FromBase32Options & { format: 'buffer' }): Buffer;
81+
export function fromBase32(string: string, options?: FromBase32Options): Uint8ArrayBuffer | Buffer;
8182

8283
/**
8384
* Decode a base32hex string to bytes
@@ -88,8 +89,9 @@ export function fromBase32(string: string, options: FromBase32Options & { format
8889
* @param options - Decoding options
8990
* @returns The decoded bytes
9091
*/
91-
export function fromBase32hex(string: string, options?: FromBase32Options): Uint8ArrayBuffer;
92+
export function fromBase32hex(string: string, options?: FromBase32Options & { format?: 'uint8' }): Uint8ArrayBuffer;
9293
export function fromBase32hex(string: string, options: FromBase32Options & { format: 'buffer' }): Buffer;
94+
export function fromBase32hex(string: string, options?: FromBase32Options): Uint8ArrayBuffer | Buffer;
9395

9496
/**
9597
* Decode a Crockford base32 string to bytes
@@ -102,5 +104,6 @@ export function fromBase32hex(string: string, options: FromBase32Options & { for
102104
* @param options - Decoding options
103105
* @returns The decoded bytes
104106
*/
105-
export function fromBase32crockford(string: string, options?: FromBase32Options): Uint8ArrayBuffer;
107+
export function fromBase32crockford(string: string, options?: FromBase32Options & { format?: 'uint8' }): Uint8ArrayBuffer;
106108
export function fromBase32crockford(string: string, options: FromBase32Options & { format: 'buffer' }): Buffer;
109+
export function fromBase32crockford(string: string, options?: FromBase32Options): Uint8ArrayBuffer | Buffer;

base64.d.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,9 @@ export function toBase64url(arr: Uint8Array, options?: ToBase64Options): string;
6868
* @param options - Decoding options
6969
* @returns The decoded bytes
7070
*/
71-
export function fromBase64(string: string, options?: FromBase64Options): Uint8ArrayBuffer;
71+
export function fromBase64(string: string, options?: FromBase64Options & { format?: 'uint8' }): Uint8ArrayBuffer;
7272
export function fromBase64(string: string, options: FromBase64Options & { format: 'buffer' }): Buffer;
73+
export function fromBase64(string: string, options?: FromBase64Options): Uint8ArrayBuffer | Buffer;
7374

7475
/**
7576
* Decode a base64url string to bytes
@@ -80,8 +81,9 @@ export function fromBase64(string: string, options: FromBase64Options & { format
8081
* @param options - Decoding options (padding defaults to false)
8182
* @returns The decoded bytes
8283
*/
83-
export function fromBase64url(string: string, options?: FromBase64Options): Uint8ArrayBuffer;
84+
export function fromBase64url(string: string, options?: FromBase64Options & { format?: 'uint8' }): Uint8ArrayBuffer;
8485
export function fromBase64url(string: string, options: FromBase64Options & { format: 'buffer' }): Buffer;
86+
export function fromBase64url(string: string, options?: FromBase64Options): Uint8ArrayBuffer | Buffer;
8587

8688
/**
8789
* Decode either base64 or base64url string to bytes
@@ -92,5 +94,6 @@ export function fromBase64url(string: string, options: FromBase64Options & { for
9294
* @param options - Decoding options
9395
* @returns The decoded bytes
9496
*/
95-
export function fromBase64any(string: string, options?: FromBase64Options): Uint8ArrayBuffer;
97+
export function fromBase64any(string: string, options?: FromBase64Options & { format?: 'uint8' }): Uint8ArrayBuffer;
9698
export function fromBase64any(string: string, options: FromBase64Options & { format: 'buffer' }): Buffer;
99+
export function fromBase64url(string: string, options?: FromBase64Options): Uint8ArrayBuffer | Buffer;

0 commit comments

Comments
 (0)