util: reconstruct constructor in more cases

This makes sure the constructor is reconstructed in cases where we otherwise would not be able to detect the actual constructor anymore. That way some `util.inspect` output is improved. PR-URL: #27668 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Anto Aravinth <[email protected]>
nodejs · May 16, 2019 · 1bef82d · 1bef82d
1 parent 35fc1b4
commit 1bef82d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/lib/internal/util/inspect.js b/lib/internal/util/inspect.js
@@ -727,12 +727,20 @@ function formatRaw(ctx, value, recurseTimes, typedArray) {
         braces = getIteratorBraces('Set', tag);
         formatter = formatIterator;
       // Handle other regular objects again.
-      } else if (keys.length === 0) {
-        if (isExternal(value))
-          return ctx.stylize('[External]', 'special');
-        return `${getPrefix(constructor, tag, 'Object')}{}`;
       } else {
-        braces[0] = `${getPrefix(constructor, tag, 'Object')}{`;
+        let fallback = '';
+        if (constructor === null) {
+          fallback = internalGetConstructorName(value);
+          if (fallback === tag) {
+            fallback = 'Object';
+          }
+        }
+        if (keys.length === 0) {
+          if (isExternal(value))
+            return ctx.stylize('[External]', 'special');
+          return `${getPrefix(constructor, tag, fallback)}{}`;
+        }
+        braces[0] = `${getPrefix(constructor, tag, fallback)}{`;
       }
     }
   }

diff --git a/test/parallel/test-util-inspect.js b/test/parallel/test-util-inspect.js
@@ -1156,6 +1156,10 @@ if (typeof Symbol !== 'undefined') {
     util.inspect({ a: { b: new ArraySubclass([1, [2], 3]) } }, { depth: 1 }),
     '{ a: { b: [ArraySubclass] } }'
   );
+  assert.strictEqual(
+    util.inspect(Object.setPrototypeOf(x, null)),
+    '[ObjectSubclass: null prototype] { foo: 42 }'
+  );
 }
 
 // Empty and circular before depth.