Skip to content

Commit e6526b3

Browse files
committed
Avoid usage of own deprecated APIs
1 parent 058f37a commit e6526b3

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

src/FormDataEncoder.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import isPlainObject from "./util/isPlainObject.js"
33
import normalize from "./util/normalizeValue.js"
44
import escape from "./util/escapeName.js"
55

6-
import {isFileLike} from "./util/isFileLike.js"
6+
import {isFile} from "./util/isFile.js"
77
import {isFormData} from "./util/isFormData.js"
88
import {FormDataLike} from "./FormDataLike.js"
99
import {FileLike} from "./FileLike.js"
@@ -185,14 +185,14 @@ export class FormDataEncoder {
185185
header += `${this.#DASHES}${this.boundary}${this.#CRLF}`
186186
header += `Content-Disposition: form-data; name="${escape(name)}"`
187187

188-
if (isFileLike(value)) {
188+
if (isFile(value)) {
189189
header += `; filename="${escape(value.name)}"${this.#CRLF}`
190190
header += `Content-Type: ${value.type || "application/octet-stream"}`
191191
}
192192

193193
if (this.#options.enableAdditionalHeaders === true) {
194194
header += `${this.#CRLF}Content-Length: ${
195-
isFileLike(value) ? value.size : value.byteLength
195+
isFile(value) ? value.size : value.byteLength
196196
}`
197197
}
198198

@@ -206,11 +206,11 @@ export class FormDataEncoder {
206206
let length = 0
207207

208208
for (const [name, raw] of this.#form) {
209-
const value = isFileLike(raw) ? raw : this.#encoder.encode(normalize(raw))
209+
const value = isFile(raw) ? raw : this.#encoder.encode(normalize(raw))
210210

211211
length += this.#getFieldHeader(name, value).byteLength
212212

213-
length += isFileLike(value) ? value.size : value.byteLength
213+
length += isFile(value) ? value.size : value.byteLength
214214

215215
length += this.#CRLF_BYTES_LENGTH
216216
}
@@ -256,7 +256,7 @@ export class FormDataEncoder {
256256
*/
257257
* values(): Generator<Uint8Array | FileLike, void, undefined> {
258258
for (const [name, raw] of this.#form.entries()) {
259-
const value = isFileLike(raw) ? raw : this.#encoder.encode(normalize(raw))
259+
const value = isFile(raw) ? raw : this.#encoder.encode(normalize(raw))
260260

261261
yield this.#getFieldHeader(name, value)
262262

@@ -301,7 +301,7 @@ export class FormDataEncoder {
301301
*/
302302
async* encode(): AsyncGenerator<Uint8Array, void, undefined> {
303303
for (const part of this.values()) {
304-
if (isFileLike(part)) {
304+
if (isFile(part)) {
305305
yield* part.stream()
306306
} else {
307307
yield part

src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ export * from "./FormDataEncoder.js"
33
// Utilities
44
export * from "./FileLike.js"
55
export * from "./FormDataLike.js"
6-
export * from "./util/isFileLike.js"
6+
export * from "./util/isFile.js"
77
export * from "./util/isFormData.js"

src/util/isFileLike.test.ts renamed to src/util/isFile.test.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ import {File, Blob} from "formdata-node"
44

55
import {FileLike} from "../FileLike.js"
66

7-
import {isFileLike} from "./isFileLike.js"
7+
import {isFile} from "./isFile.js"
88

99
test("Returns true for a File", t => {
1010
const file = new File(["Content"], "name.txt")
1111

12-
t.true(isFileLike(file))
12+
t.true(isFile(file))
1313
})
1414

1515
test("Returns true for a class that implements File", t => {
@@ -31,7 +31,7 @@ test("Returns true for a class that implements File", t => {
3131
}
3232
}
3333

34-
t.true(isFileLike(new MyFile()))
34+
t.true(isFile(new MyFile()))
3535
})
3636

3737
test("Returns true for a file-shaped object", t => {
@@ -53,23 +53,23 @@ test("Returns true for a file-shaped object", t => {
5353
}
5454
}
5555

56-
t.true(isFileLike(object))
56+
t.true(isFile(object))
5757
})
5858

5959
test("Returns false for null", t => {
60-
t.false(isFileLike(null))
60+
t.false(isFile(null))
6161
})
6262

6363
test("Returns false for undefined", t => {
64-
t.false(isFileLike(undefined))
64+
t.false(isFile(undefined))
6565
})
6666

6767
test("Returns false for non-File object", t => {
68-
t.false(isFileLike(new Map()))
68+
t.false(isFile(new Map()))
6969
})
7070

7171
test("Returns false for Blob", t => {
7272
const blob = new Blob(["Content"], {type: "text/plain"})
7373

74-
t.false(isFileLike(blob))
74+
t.false(isFile(blob))
7575
})
File renamed without changes.

0 commit comments

Comments
 (0)