console: Hide values for console.table if display not necessary (#5914)

cli/js/web/console.ts

@@ -842,27 +842,33 @@ export class Console {
       resultData = data!;
     }
 
+    let hasPrimitives = false;
     Object.keys(resultData).forEach((k, idx): void => {
       const value: unknown = resultData[k]!;
-
+      const primitive =
-      if (value !== null && typeof value === "object") {
+        value === null ||
-        Object.entries(value as { [key: string]: unknown }).forEach(
+        (typeof value !== "function" && typeof value !== "object");
-          ([k, v]): void => {
+      if (properties === undefined && primitive) {
-            if (properties && !properties.includes(k)) {
+        hasPrimitives = true;
-              return;
-            }
-
-            if (objectValues[k]) {
-              objectValues[k].push(stringifyValue(v));
-            } else {
-              objectValues[k] = createColumn(v, idx);
-            }
-          }
-        );
-
-        values.push("");
-      } else {
         values.push(stringifyValue(value));
+      } else {
+        const valueObj = (value as { [key: string]: unknown }) || {};
+        const keys = properties || Object.keys(valueObj);
+        for (const k of keys) {
+          if (primitive || !valueObj.hasOwnProperty(k)) {
+            if (objectValues[k]) {
+              // fill with blanks for idx to avoid misplacing from later values
+              objectValues[k].push("");
+            }
+          } else {
+            if (objectValues[k]) {
+              objectValues[k].push(stringifyValue(valueObj[k]));
+            } else {
+              objectValues[k] = createColumn(valueObj[k], idx);
+            }
+          }
+        }
+        values.push("");
       }
 
       indexKeys.push(k);
@@ -872,10 +878,7 @@ export class Console {
     const bodyValues = Object.values(objectValues);
     const header = [
       indexKey,
-      ...(properties || [
+      ...(properties || [...headerKeys, !isMap && hasPrimitives && valuesKey]),
-        ...headerKeys,
-        !isMap && values.length > 0 && valuesKey,
-      ]),
     ].filter(Boolean) as string[];
     const body = [indexKeys, ...bodyValues, values];
 

cli/tests/unit/console_test.ts

@@ -1070,6 +1070,36 @@ unitTest(function consoleTable(): void {
 │   1   │ "你好"  │
 │   2   │ "Amapá" │
 └───────┴─────────┘
+`
+    );
+  });
+  mockConsole((console, out): void => {
+    console.table([
+      [1, 2],
+      [3, 4],
+    ]);
+    assertEquals(
+      stripColor(out.toString()),
+      `┌───────┬───┬───┐
+│ (idx) │ 0 │ 1 │
+├───────┼───┼───┤
+│   0   │ 1 │ 2 │
+│   1   │ 3 │ 4 │
+└───────┴───┴───┘
+`
+    );
+  });
+  mockConsole((console, out): void => {
+    console.table({ 1: { a: 4, b: 5 }, 2: null, 3: { b: 6, c: 7 } }, ["b"]);
+    assertEquals(
+      stripColor(out.toString()),
+      `┌───────┬───┐
+│ (idx) │ b │
+├───────┼───┤
+│   1   │ 5 │
+│   2   │   │
+│   3   │ 6 │
+└───────┴───┘
 `
     );
   });