cleanup custom format

nodejs · Mar 14, 2024 · 774a0a4 · 774a0a4
1 parent 633e5c8
commit 774a0a4
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 18 deletions.
diff --git a/lib/web/fetch/formdata.js b/lib/web/fetch/formdata.js
@@ -157,12 +157,24 @@ class FormData {
   }
 
   [nodeUtil.inspect.custom] (depth, options) {
-    let output = 'FormData:\n'
-    this[kState].forEach(entry => {
-      output += `${entry.name}: ${entry.value}\n`
-    })
+    const state = this[kState].reduce((a, b) => {
+      if (a[b.name]) {
+        if (Array.isArray(a[b.name])) {
+          a[b.name].push(b.value)
+        } else {
+          a[b.name] = [a[b.name], b.value]
+        }
+      } else {
+        a[b.name] = b.value
+      }
+
+      return a
+    }, { __proto__: null })
+
+    options.depth ??= depth
+    options.colors ??= true
 
-    return output
+    return `FormData ${nodeUtil.formatWithOptions(options, state)}`
   }
 }
 

diff --git a/lib/web/fetch/headers.js b/lib/web/fetch/headers.js
@@ -572,16 +572,10 @@ class Headers {
     return (this[kHeadersList][kHeadersSortedMap] = headers)
   }
 
-  [Symbol.for('nodejs.util.inspect.custom')] () {
-    webidl.brandCheck(this, Headers)
-
-    return this[kHeadersList]
-  }
-
   [util.inspect.custom] (depth, options) {
-    const inspected = util.inspect(this[kHeadersList].entries)
+    options.depth ??= depth
 
-    return `Headers ${inspected}`
+    return `Headers ${util.formatWithOptions(options, this[kHeadersList].entries)}`
   }
 }
 

diff --git a/lib/web/fetch/request.js b/lib/web/fetch/request.js
@@ -778,6 +778,8 @@ class Request {
       options.depth = 2
     }
 
+    options.colors ??= true
+
     const properties = {
       method: this.method,
       url: this.url,
@@ -796,7 +798,7 @@ class Request {
       signal: this.signal
     }
 
-    return nodeUtil.formatWithOptions(options, { ...properties })
+    return `Request ${nodeUtil.formatWithOptions(options, properties)}`
   }
 }
 

diff --git a/lib/web/fetch/response.js b/lib/web/fetch/response.js
@@ -259,6 +259,8 @@ class Response {
       options.depth = 2
     }
 
+    options.colors ??= true
+
     const properties = {
       status: this.status,
       statusText: this.statusText,
@@ -271,7 +273,7 @@ class Response {
       url: this.url
     }
 
-    return nodeUtil.formatWithOptions(options, `Response ${nodeUtil.inspect(properties)}`)
+    return `Response ${nodeUtil.formatWithOptions(options, properties)}`
   }
 }
 

diff --git a/test/fetch/content-length.js b/test/fetch/content-length.js
@@ -6,6 +6,7 @@ const { createServer } = require('node:http')
 const { once } = require('node:events')
 const { Blob } = require('node:buffer')
 const { fetch, FormData } = require('../..')
+const { closeServerAsPromise } = require('../utils/node-http')
 
 // https://github.com/nodejs/undici/issues/1783
 test('Content-Length is set when using a FormData body with fetch', async (t) => {
@@ -17,6 +18,7 @@ test('Content-Length is set when using a FormData body with fetch', async (t) =>
   }).listen(0)
 
   await once(server, 'listening')
+  t.after(closeServerAsPromise(server))
 
   const fd = new FormData()
   fd.set('file', new Blob(['hello world 👋'], { type: 'text/plain' }), 'readme.md')
@@ -25,5 +27,5 @@ test('Content-Length is set when using a FormData body with fetch', async (t) =>
   await fetch(`http://localhost:${server.address().port}`, {
     method: 'POST',
     body: fd
-  }).finally(() => server.close())
+  })
 })
diff --git a/test/fetch/formdata-inspect-custom.js b/test/fetch/formdata-inspect-custom.js
@@ -10,7 +10,7 @@ test('FormData class custom inspection', () => {
   formData.append('username', 'john_doe')
   formData.append('email', '[email protected]')
 
-  const expectedOutput = 'FormData:\nusername: john_doe\nemail: [email protected]\n'
+  const expectedOutput = "FormData { username: 'john_doe', email: '[email protected]' }"
 
   assert.deepStrictEqual(inspect(formData), expectedOutput)
 })
diff --git a/test/fetch/request-inspect-custom.js b/test/fetch/request-inspect-custom.js
@@ -16,7 +16,7 @@ describe('Request custom inspection', () => {
 
     const inspectedOutput = util.inspect(request)
 
-    const expectedOutput = '{\n  method: \'POST\',\n  url: \'https://example.com/api\',\n  headers: Headers { \'Content-Type\': \'application/json\' },\n  destination: \'\',\n  referrer: \'about:client\',\n  referrerPolicy: \'\',\n  mode: \'cors\',\n  credentials: \'same-origin\',\n  cache: \'default\',\n  redirect: \'follow\',\n  integrity: \'\',\n  keepalive: false,\n  isReloadNavigation: false,\n  isHistoryNavigation: false,\n  signal: AbortSignal { aborted: false }\n}'
+    const expectedOutput = "Request {\n  method: 'POST',\n  url: 'https://example.com/api',\n  headers: Headers { 'Content-Type': 'application/json' },\n  destination: '',\n  referrer: 'about:client',\n  referrerPolicy: '',\n  mode: 'cors',\n  credentials: 'same-origin',\n  cache: 'default',\n  redirect: 'follow',\n  integrity: '',\n  keepalive: false,\n  isReloadNavigation: false,\n  isHistoryNavigation: false,\n  signal: AbortSignal { aborted: false }\n}"
     assert.strictEqual(inspectedOutput, expectedOutput)
   })
 })