Use named exports for consistency across the project.

Author: octet-stream

src/FormDataEncoder.ts

@@ -1,14 +1,13 @@
-import createBoundary from "./util/createBoundary.js"
-import isPlainObject from "./util/isPlainObject.js"
-import normalize from "./util/normalizeValue.js"
-import escape from "./util/escapeName.js"
-
-import {isFile} from "./util/isFile.js"
-import {isFormData} from "./util/isFormData.js"
-import {proxyHeaders} from "./util/proxyHeaders.js"
 import type {LowercaseObjectKeys} from "./util/LowercaseObjectKeys.js"
-import {FormDataLike} from "./FormDataLike.js"
-import {FileLike} from "./FileLike.js"
+import {createBoundary} from "./util/createBoundary.js"
+import {normalizeValue} from "./util/normalizeValue.js"
+import {isPlainObject} from "./util/isPlainObject.js"
+import {proxyHeaders} from "./util/proxyHeaders.js"
+import type {FormDataLike} from "./FormDataLike.js"
+import {isFormData} from "./util/isFormData.js"
+import {escapeName} from "./util/escapeName.js"
+import type {FileLike} from "./FileLike.js"
+import {isFile} from "./util/isFile.js"
 
 type FormDataEntryValue = string | FileLike
 
@@ -195,10 +194,10 @@ export class FormDataEncoder {
     let header = ""
 
     header += `${this.#DASHES}${this.boundary}${this.#CRLF}`
-    header += `Content-Disposition: form-data; name="${escape(name)}"`
+    header += `Content-Disposition: form-data; name="${escapeName(name)}"`
 
     if (isFile(value)) {
-      header += `; filename="${escape(value.name)}"${this.#CRLF}`
+      header += `; filename="${escapeName(value.name)}"${this.#CRLF}`
       header += `Content-Type: ${value.type || "application/octet-stream"}`
     }
 
@@ -218,7 +217,9 @@ export class FormDataEncoder {
     let length = 0
 
     for (const [name, raw] of this.#form) {
-      const value = isFile(raw) ? raw : this.#encoder.encode(normalize(raw))
+      const value = isFile(raw) ? raw : this.#encoder.encode(
+        normalizeValue(raw)
+      )
 
       length += this.#getFieldHeader(name, value).byteLength
 
@@ -277,7 +278,9 @@ export class FormDataEncoder {
    */
   * values(): Generator<Uint8Array | FileLike, void, undefined> {
     for (const [name, raw] of this.#form) {
-      const value = isFile(raw) ? raw : this.#encoder.encode(normalize(raw))
+      const value = isFile(raw) ? raw : this.#encoder.encode(
+        normalizeValue(raw)
+      )
 
       yield this.#getFieldHeader(name, value)
 

src/util/createBoundary.test.ts

@@ -1,6 +1,6 @@
 import test from "ava"
 
-import createBoundary from "./createBoundary.js"
+import {createBoundary} from "./createBoundary.js"
 
 test("Returns a string", t => {
   const actual = createBoundary()

src/util/createBoundary.ts

@@ -15,7 +15,7 @@ const alphabet = "abcdefghijklmnopqrstuvwxyz0123456789"
  * createBoundary() // -> n2vw38xdagaq6lrv
  * ```
  */
-function createBoundary(): string {
+export function createBoundary(): string {
   let size = 16
   let res = ""
 
@@ -32,5 +32,3 @@ function createBoundary(): string {
 
   return res
 }
-
-export default createBoundary

src/util/escapeName.test.ts

@@ -1,6 +1,6 @@
 import test from "ava"
 
-import escapeName from "./escapeName.js"
+import {escapeName} from "./escapeName.js"
 
 const CR = "%0D"
 const LF = "%0A"

src/util/escapeName.ts

@@ -7,9 +7,7 @@
  *
  * @api private
  */
-const escapeName = (name: unknown) => String(name)
+export const escapeName = (name: unknown) => String(name)
   .replace(/\r/g, "%0D") // CR
   .replace(/\n/g, "%0A") // LF
   .replace(/"/g, "%22")
-
-export default escapeName

src/util/isFile.test.ts

@@ -2,8 +2,7 @@ import test from "ava"
 
 import {File, Blob} from "formdata-node"
 
-import {FileLike} from "../FileLike.js"
-
+import type {FileLike} from "../FileLike.js"
 import {isFile} from "./isFile.js"
 
 test("Returns true for a File", t => {

src/util/isFile.ts

@@ -1,6 +1,5 @@
-import isFunction from "./isFunction.js"
-
-import {FileLike} from "../FileLike.js"
+import type {FileLike} from "../FileLike.js"
+import {isFunction} from "./isFunction.js"
 
 /**
  * Check if given object is `File`.

src/util/isFormData.test.ts

@@ -3,8 +3,7 @@ import test from "ava"
 import {FormData} from "formdata-node"
 
 import {isFormData} from "./isFormData.js"
-
-import {FormDataLike, FormDataEntryValue} from "../FormDataLike.js"
+import type {FormDataLike, FormDataEntryValue} from "../FormDataLike.js"
 
 test("Returns true for spec-compatible FormData instance", t => {
   t.true(isFormData(new FormData()))

src/util/isFormData.ts

@@ -1,6 +1,5 @@
-import isFunction from "./isFunction.js"
-
-import {FormDataLike} from "../FormDataLike.js"
+import type {FormDataLike} from "../FormDataLike.js"
+import {isFunction} from "./isFunction.js"
 
 /**
  * Check if given object is FormData

src/util/isFunction.ts

@@ -3,8 +3,6 @@
  *
  * @api private
  */
-const isFunction = (value: unknown): value is Function => (
+export const isFunction = (value: unknown): value is Function => (
   typeof value === "function"
 )
-
-export default isFunction