1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-23 07:44:48 -05:00

fix(console): formatting misalignment on console.table (#5046)

This commit is contained in:
木杉 2020-05-04 19:36:26 +08:00 committed by GitHub
parent 36ad4e3b77
commit 58d0c4f9d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 9 deletions

View file

@ -1045,6 +1045,20 @@ unitTest(function consoleTable(): void {
console.table("test"); console.table("test");
assertEquals(out.toString(), "test\n"); assertEquals(out.toString(), "test\n");
}); });
mockConsole((console, out): void => {
console.table(["Hello", "你好", "Amapá"]);
assertEquals(
out.toString(),
`┌─────────┬─────────┐
(index) Values
0 "Hello"
1 "你好"
2 "Amapá"
`
);
});
}); });
// console.log(Error) test // console.log(Error) test

View file

@ -1,11 +1,8 @@
// Copyright Joyent, Inc. and other Node contributors. MIT license. // Copyright Joyent, Inc. and other Node contributors. MIT license.
// Forked from Node's lib/internal/cli_table.js // Forked from Node's lib/internal/cli_table.js
import { TextEncoder } from "./text_encoding.ts";
import { hasOwnProperty } from "./util.ts"; import { hasOwnProperty } from "./util.ts";
const encoder = new TextEncoder();
const tableChars = { const tableChars = {
middleMiddle: "─", middleMiddle: "─",
rowMiddle: "┼", rowMiddle: "┼",
@ -28,17 +25,61 @@ function removeColors(str: string): string {
return str.replace(colorRegExp, ""); return str.replace(colorRegExp, "");
} }
function countBytes(str: string): number { function isFullWidthCodePoint(code: number): boolean {
const normalized = removeColors(String(str)).normalize("NFC"); // Code points are partially derived from:
// http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt
return (
code >= 0x1100 &&
(code <= 0x115f || // Hangul Jamo
code === 0x2329 || // LEFT-POINTING ANGLE BRACKET
code === 0x232a || // RIGHT-POINTING ANGLE BRACKET
// CJK Radicals Supplement .. Enclosed CJK Letters and Months
(code >= 0x2e80 && code <= 0x3247 && code !== 0x303f) ||
// Enclosed CJK Letters and Months .. CJK Unified Ideographs Extension A
(code >= 0x3250 && code <= 0x4dbf) ||
// CJK Unified Ideographs .. Yi Radicals
(code >= 0x4e00 && code <= 0xa4c6) ||
// Hangul Jamo Extended-A
(code >= 0xa960 && code <= 0xa97c) ||
// Hangul Syllables
(code >= 0xac00 && code <= 0xd7a3) ||
// CJK Compatibility Ideographs
(code >= 0xf900 && code <= 0xfaff) ||
// Vertical Forms
(code >= 0xfe10 && code <= 0xfe19) ||
// CJK Compatibility Forms .. Small Form Variants
(code >= 0xfe30 && code <= 0xfe6b) ||
// Halfwidth and Fullwidth Forms
(code >= 0xff01 && code <= 0xff60) ||
(code >= 0xffe0 && code <= 0xffe6) ||
// Kana Supplement
(code >= 0x1b000 && code <= 0x1b001) ||
// Enclosed Ideographic Supplement
(code >= 0x1f200 && code <= 0x1f251) ||
// Miscellaneous Symbols and Pictographs 0x1f300 - 0x1f5ff
// Emoticons 0x1f600 - 0x1f64f
(code >= 0x1f300 && code <= 0x1f64f) ||
// CJK Unified Ideographs Extension B .. Tertiary Ideographic Plane
(code >= 0x20000 && code <= 0x3fffd))
);
}
return encoder.encode(normalized).byteLength; function getStringWidth(str: string): number {
str = removeColors(str).normalize("NFC");
let width = 0;
for (const ch of str) {
width += isFullWidthCodePoint(ch.codePointAt(0)!) ? 2 : 1;
}
return width;
} }
function renderRow(row: string[], columnWidths: number[]): string { function renderRow(row: string[], columnWidths: number[]): string {
let out = tableChars.left; let out = tableChars.left;
for (let i = 0; i < row.length; i++) { for (let i = 0; i < row.length; i++) {
const cell = row[i]; const cell = row[i];
const len = countBytes(cell); const len = getStringWidth(cell);
const needed = (columnWidths[i] - len) / 2; const needed = (columnWidths[i] - len) / 2;
// round(needed) + ceil(needed) will always add up to the amount // round(needed) + ceil(needed) will always add up to the amount
// of spaces we need while also left justifying the output. // of spaces we need while also left justifying the output.
@ -53,7 +94,7 @@ function renderRow(row: string[], columnWidths: number[]): string {
export function cliTable(head: string[], columns: string[][]): string { export function cliTable(head: string[], columns: string[][]): string {
const rows: string[][] = []; const rows: string[][] = [];
const columnWidths = head.map((h: string): number => countBytes(h)); const columnWidths = head.map((h: string): number => getStringWidth(h));
const longestColumn = columns.reduce( const longestColumn = columns.reduce(
(n: number, a: string[]): number => Math.max(n, a.length), (n: number, a: string[]): number => Math.max(n, a.length),
0 0
@ -67,7 +108,7 @@ export function cliTable(head: string[], columns: string[][]): string {
} }
const value = (rows[j][i] = hasOwnProperty(column, j) ? column[j] : ""); const value = (rows[j][i] = hasOwnProperty(column, j) ? column[j] : "");
const width = columnWidths[i] || 0; const width = columnWidths[i] || 0;
const counted = countBytes(value); const counted = getStringWidth(value);
columnWidths[i] = Math.max(width, counted); columnWidths[i] = Math.max(width, counted);
} }
} }