foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 15:24:46 -05:00
Code Issues Packages 1 Wiki Activity

fix(op_crates/console): console.table value misalignment with varying keys (#10127)

Browse source
This commit is contained in:
Liam Murphy 2021-04-11 22:19:50 +10:00 committed by GitHub
parent 6519f232bd
commit 3c645457a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
cli/tests/unit/console_test.ts
View file

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

35
op_crates/console/02_console.js
View file

@ -1614,20 +1614,12 @@
return this.log(data);
}
const objectValues = {};
const indexKeys = [];
const values = [];
const stringifyValue = (value) =>
inspectValueWithQuotes(value, new Set(), 0, {
...DEFAULT_INSPECT_OPTIONS,
depth: 1,
});
const toTable = (header, body) => this.log(cliTable(header, body));
const createColumn = (value, shift) => [
...(shift ? [...new Array(shift)].map(() => "") : []),
stringifyValue(value),
];
let resultData;
const isSet = data instanceof Set;
@ -1649,8 +1641,19 @@
resultData = data;
}
const keys = Object.keys(resultData);
const numRows = keys.length;
const objectValues = properties
? Object.fromEntries(
properties.map((name) => [name, new Array(numRows).fill("")]),
)
: {};
const indexKeys = [];
const values = [];
let hasPrimitives = false;
Object.keys(resultData).forEach((k, idx) => {
keys.forEach((k, idx) => {
const value = resultData[k];
const primitive = value === null ||
(typeof value !== "function" && typeof value !== "object");
@ -1661,17 +1664,11 @@
const valueObj = value || {};
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);
if (!primitive && k in valueObj) {
if (!(k in objectValues)) {
objectValues[k] = new Array(numRows).fill("");
}
objectValues[k][idx] = stringifyValue(valueObj[k]);
}
}
values.push("");