Skip to content

Commit 69a2137

Browse files
authored
fix: type ironing with string buffer (#1251)
1 parent 2e3faf6 commit 69a2137

File tree

2 files changed

+18
-18
lines changed

2 files changed

+18
-18
lines changed

packages/hash-node/src/index.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
import { Hash as IHash, SourceData } from "@aws-sdk/types";
22
import { Buffer } from "buffer";
3-
import { fromArrayBuffer, fromString } from "@aws-sdk/util-buffer-from";
3+
import {
4+
fromArrayBuffer,
5+
fromString,
6+
StringEncoding
7+
} from "@aws-sdk/util-buffer-from";
48
import { createHash, createHmac, Hash as NodeHash, Hmac } from "crypto";
59

610
export class Hash implements IHash {
@@ -21,7 +25,7 @@ export class Hash implements IHash {
2125
}
2226
}
2327

24-
function castSourceData(toCast: SourceData, encoding?: string): Buffer {
28+
function castSourceData(toCast: SourceData, encoding?: StringEncoding): Buffer {
2529
if (Buffer.isBuffer(toCast)) {
2630
return toCast;
2731
}

packages/util-buffer-from/src/index.ts

+12-16
Original file line numberDiff line numberDiff line change
@@ -27,27 +27,23 @@ export function fromArrayBuffer(
2727
}
2828
return new Buffer(input);
2929
}
30-
31-
export function fromString(
32-
input: string,
33-
encoding?:
34-
| "ascii"
35-
| "utf8"
36-
| "utf16le"
37-
| "ucs2"
38-
| "base64"
39-
| "latin1"
40-
| "binary"
41-
| "hex"
42-
| string
43-
): Buffer {
30+
export type StringEncoding =
31+
| "ascii"
32+
| "utf8"
33+
| "utf16le"
34+
| "ucs2"
35+
| "base64"
36+
| "latin1"
37+
| "binary"
38+
| "hex";
39+
export function fromString(input: string, encoding?: StringEncoding): Buffer {
4440
if (typeof input !== "string") {
4541
throw new Error("argument passed to fromString was not a string");
4642
}
4743

4844
if (typeof Buffer.from === "function" && Buffer.from !== Uint8Array.from) {
49-
return Buffer.from(input, encoding);
45+
return Buffer.from(input, encoding as any);
5046
}
5147

52-
return new Buffer(input, encoding);
48+
return new Buffer(input, encoding as any);
5349
}

0 commit comments

Comments
 (0)