Skip to content

Commit

Permalink
fix: Fix color resetting for borders (#428)
Browse files Browse the repository at this point in the history
  • Loading branch information
@ayonious
ayonious committed Aug 1, 2022
1 parent c9e8994 commit bcb6e8c
Show file tree
Hide file tree
Showing 33 changed files with 401 additions and 358 deletions.
4 changes: 2 additions & 2 deletions src/internalTable/internal-table-printer.ts
View file
Expand Up @@ -30,7 +30,7 @@ const renderOneLine = (
colorMap: ColorMap
): string => {
const line = new ColoredConsoleLine(colorMap);
line.addCharsWithColor(DEFAULT_ROW_FONT_COLOR, tableStyle.vertical);
line.addCharsWithColor('', tableStyle.vertical); // dont Color the Column borders
columns.forEach((column) => {
const thisLineHasText =
currentLineIndex < widthLimitedColumnsArray[column.name].length;
Expand All @@ -48,7 +48,7 @@ const renderOneLine = (
column.length || DEFAULT_COLUMN_LEN
)
);
line.addCharsWithColor(DEFAULT_ROW_FONT_COLOR, ` ${tableStyle.vertical}`);
line.addCharsWithColor('', ` ${tableStyle.vertical}`); // dont Color the Column borders
});
return line.renderConsole();
};
Expand Down
16 changes: 8 additions & 8 deletions test/__snapshots__/alignment.test.ts.snap
View file
Expand Up @@ -2,14 +2,14 @@

exports[`Testing column alignment all kind of alignments are working 1`] = `
"┌──────────────────────┬──────────────────────────────────────────┬────────────────────┐
[37m│[0m[37m [0m[01mred_left_align_index[0m[37m │[0m[37m [0m[01m right_align_text[0m[37m │[0m[37m [0m[01mgreen_value_center[0m[37m │[0m
│[37m [0m[01mred_left_align_index[0m │[37m [0m[01m right_align_text[0m │[37m [0m[01mgreen_value_center[0m │
├──────────────────────┼──────────────────────────────────────────┼────────────────────┤
[37m│[0m[37m [0m[31m2 [0m[37m │[0m[37m [0m[34m This row is blue[0m[37m │[0m[37m [0m[32m 10.212 [0m[37m │[0m
[37m│[0m[37m [0m[31m3 [0m[37m │[0m[37m [0m[31m I would like some red wine please[0m[37m │[0m[37m [0m[32m 10.212 [0m[37m │[0m
[37m│[0m[37m [0m[31m4 [0m[37m │[0m[37m [0m[36m I would like some cyan wine please[0m[37m │[0m[37m [0m[32m 10.212 [0m[37m │[0m
[37m│[0m[37m [0m[31m5 [0m[37m │[0m[37m [0m[01mI would like some white_bold wine please[0m[37m │[0m[37m [0m[32m 10.212 [0m[37m │[0m
[37m│[0m[37m [0m[31m6 [0m[37m │[0m[37m [0m[38m I would like some crimson sky please[0m[37m │[0m[37m [0m[32m 10.212 [0m[37m │[0m
[37m│[0m[37m [0m[31m7 [0m[37m │[0m[37m [0m[32m I would like some green gemuse please[0m[37m │[0m[37m [0m[32m 20 [0m[37m │[0m
[37m│[0m[37m [0m[31m8 [0m[37m │[0m[37m [0m[33m I would like some gelb bananen bitte[0m[37m │[0m[37m [0m[32m 100 [0m[37m │[0m
│[37m [0m[31m2 [0m │[37m [0m[34m This row is blue[0m │[37m [0m[32m 10.212 [0m │
│[37m [0m[31m3 [0m │[37m [0m[31m I would like some red wine please[0m │[37m [0m[32m 10.212 [0m │
│[37m [0m[31m4 [0m │[37m [0m[36m I would like some cyan wine please[0m │[37m [0m[32m 10.212 [0m │
│[37m [0m[31m5 [0m │[37m [0m[01mI would like some white_bold wine please[0m │[37m [0m[32m 10.212 [0m │
│[37m [0m[31m6 [0m │[37m [0m[38m I would like some crimson sky please[0m │[37m [0m[32m 10.212 [0m │
│[37m [0m[31m7 [0m │[37m [0m[32m I would like some green gemuse please[0m │[37m [0m[32m 20 [0m │
│[37m [0m[31m8 [0m │[37m [0m[33m I would like some gelb bananen bitte[0m │[37m [0m[32m 100 [0m │
└──────────────────────┴──────────────────────────────────────────┴────────────────────┘"
`;
10 changes: 5 additions & 5 deletions test/__snapshots__/cellColor.test.ts.snap
View file
Expand Up @@ -2,11 +2,11 @@

exports[`Example: Print a simple Table with cell colors cell colors are working 1`] = `
"┌───────┬─────────┬────────┐
[37m│[0m[37m [0m[01mindex[0m[37m │[0m[37m [0m[01m text[0m[37m │[0m[37m [0m[01m value[0m[37m │[0m
│[37m [0m[01mindex[0m │[37m [0m[01m text[0m │[37m [0m[01m value[0m │
├───────┼─────────┼────────┤
[37m│[0m[37m [0m[37m 1[0m[37m │[0m[37m [0m[37m [31mred[39m[0m[37m │[0m[37m [0m[37m10.212[0m[37m │[0m
[37m│[0m[37m [0m[37m 2[0m[37m │[0m[37m [0m[37m [32mgreen[39m[0m[37m │[0m[37m [0m[37m 20[0m[37m │[0m
[37m│[0m[37m [0m[37m 3[0m[37m │[0m[37m [0m[37m [33myellow[39m[0m[37m │[0m[37m [0m[37m 100[0m[37m │[0m
[37m│[0m[37m [0m[37m 4[0m[37m │[0m[37m [0m[37m[45mmagenta[49m[0m[37m │[0m[37m [0m[37m 300[0m[37m │[0m
│[37m [0m[37m 1[0m │[37m [0m[37m [31mred[39m[0m │[37m [0m[37m10.212[0m │
│[37m [0m[37m 2[0m │[37m [0m[37m [32mgreen[39m[0m │[37m [0m[37m 20[0m │
│[37m [0m[37m 3[0m │[37m [0m[37m [33myellow[39m[0m │[37m [0m[37m 100[0m │
│[37m [0m[37m 4[0m │[37m [0m[37m[45mmagenta[49m[0m │[37m [0m[37m 300[0m │
└───────┴─────────┴────────┘"
`;
16 changes: 8 additions & 8 deletions test/__snapshots__/columnColor.test.ts.snap
View file
Expand Up @@ -2,14 +2,14 @@

exports[`Example: Print a simple Table with column colors column colors are working 1`] = `
"┌──────────────────────┬──────────────────────────────────────────┬─────────────┐
[37m│[0m[37m [0m[01mred_left_align_index[0m[37m │[0m[37m [0m[01m right_align_text[0m[37m │[0m[37m [0m[01mgreen_value[0m[37m │[0m
│[37m [0m[01mred_left_align_index[0m │[37m [0m[01m right_align_text[0m │[37m [0m[01mgreen_value[0m │
├──────────────────────┼──────────────────────────────────────────┼─────────────┤
[37m│[0m[37m [0m[31m2 [0m[37m │[0m[37m [0m[34m This row is blue[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
[37m│[0m[37m [0m[31m3 [0m[37m │[0m[37m [0m[31m I would like some red wine please[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
[37m│[0m[37m [0m[31m4 [0m[37m │[0m[37m [0m[36m I would like some cyan wine please[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
[37m│[0m[37m [0m[31m5 [0m[37m │[0m[37m [0m[01mI would like some white_bold wine please[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
[37m│[0m[37m [0m[31m6 [0m[37m │[0m[37m [0m[38m I would like some crimson sky please[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
[37m│[0m[37m [0m[31m7 [0m[37m │[0m[37m [0m[32m I would like some green gemuse please[0m[37m │[0m[37m [0m[32m 20[0m[37m │[0m
[37m│[0m[37m [0m[31m8 [0m[37m │[0m[37m [0m[33m I would like some gelb bananen bitte[0m[37m │[0m[37m [0m[32m 100[0m[37m │[0m
│[37m [0m[31m2 [0m │[37m [0m[34m This row is blue[0m │[37m [0m[32m 10.212[0m │
│[37m [0m[31m3 [0m │[37m [0m[31m I would like some red wine please[0m │[37m [0m[32m 10.212[0m │
│[37m [0m[31m4 [0m │[37m [0m[36m I would like some cyan wine please[0m │[37m [0m[32m 10.212[0m │
│[37m [0m[31m5 [0m │[37m [0m[01mI would like some white_bold wine please[0m │[37m [0m[32m 10.212[0m │
│[37m [0m[31m6 [0m │[37m [0m[38m I would like some crimson sky please[0m │[37m [0m[32m 10.212[0m │
│[37m [0m[31m7 [0m │[37m [0m[32m I would like some green gemuse please[0m │[37m [0m[32m 20[0m │
│[37m [0m[31m8 [0m │[37m [0m[33m I would like some gelb bananen bitte[0m │[37m [0m[32m 100[0m │
└──────────────────────┴──────────────────────────────────────────┴─────────────┘"
`;
16 changes: 8 additions & 8 deletions test/__snapshots__/computedColumns.test.ts.snap
View file
Expand Up @@ -2,20 +2,20 @@

exports[`Example: Print a simple Table with Computed Columns Computed Columns are working 1`] = `
"┌────────────┬─────────────┬─────┬─────────────┬──────────────┬─────┬─────────────┬──────────────┐
[37m│[0m[37m [0m[01mred_amount[0m[37m │[0m[37m [0m[01mblue_amount[0m[37m │[0m[37m [0m[01msum[0m[37m │[0m[37m [0m[01mred_percent[0m[37m │[0m[37m [0m[01mblue_percent[0m[37m │[0m[37m [0m[01msum[0m[37m │[0m[37m [0m[01mred_percent[0m[37m │[0m[37m [0m[01mblue_percent[0m[37m │[0m
│[37m [0m[01mred_amount[0m │[37m [0m[01mblue_amount[0m │[37m [0m[01msum[0m │[37m [0m[01mred_percent[0m │[37m [0m[01mblue_percent[0m │[37m [0m[01msum[0m │[37m [0m[01mred_percent[0m │[37m [0m[01mblue_percent[0m │
├────────────┼─────────────┼─────┼─────────────┼──────────────┼─────┼─────────────┼──────────────┤
[37m│[0m[37m [0m[31m 2[0m[37m │[0m[37m [0m[37m 3[0m[37m │[0m[37m [0m[37m 5[0m[37m │[0m[37m [0m[37m 40.00[0m[37m │[0m[37m [0m[37m 60.00[0m[37m │[0m[37m [0m[37m 5[0m[37m │[0m[37m [0m[37m 40.00[0m[37m │[0m[37m [0m[37m 60.00[0m[37m │[0m
[37m│[0m[37m [0m[31m 1[0m[37m │[0m[37m [0m[37m 1[0m[37m │[0m[37m [0m[37m 2[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m[37m [0m[37m 2[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m
[37m│[0m[37m [0m[31m 5[0m[37m │[0m[37m [0m[37m 6[0m[37m │[0m[37m [0m[37m 11[0m[37m │[0m[37m [0m[37m 45.45[0m[37m │[0m[37m [0m[37m 54.55[0m[37m │[0m[37m [0m[37m 11[0m[37m │[0m[37m [0m[37m 45.45[0m[37m │[0m[37m [0m[37m 54.55[0m[37m │[0m
│[37m [0m[31m 2[0m │[37m [0m[37m 3[0m │[37m [0m[37m 5[0m │[37m [0m[37m 40.00[0m │[37m [0m[37m 60.00[0m │[37m [0m[37m 5[0m │[37m [0m[37m 40.00[0m │[37m [0m[37m 60.00[0m │
│[37m [0m[31m 1[0m │[37m [0m[37m 1[0m │[37m [0m[37m 2[0m │[37m [0m[37m 50.00[0m │[37m [0m[37m 50.00[0m │[37m [0m[37m 2[0m │[37m [0m[37m 50.00[0m │[37m [0m[37m 50.00[0m │
│[37m [0m[31m 5[0m │[37m [0m[37m 6[0m │[37m [0m[37m 11[0m │[37m [0m[37m 45.45[0m │[37m [0m[37m 54.55[0m │[37m [0m[37m 11[0m │[37m [0m[37m 45.45[0m │[37m [0m[37m 54.55[0m │
└────────────┴─────────────┴─────┴─────────────┴──────────────┴─────┴─────────────┴──────────────┘"
`;

exports[`Example: Print a simple Table with Computed Columns Computed Columns are working with Title 1`] = `
"┌────────────┬─────────────┬─────┬─────────────┬──────────────┬─────┬─────────────┬──────────────┐
[37m│[0m[37m [0m[01mred_amount[0m[37m │[0m[37m [0m[01mblue_amount[0m[37m │[0m[37m [0m[01msum[0m[37m │[0m[37m [0m[01mRed Percent[0m[37m │[0m[37m [0m[01mBlue Percent[0m[37m │[0m[37m [0m[01msum[0m[37m │[0m[37m [0m[01mRed Percent[0m[37m │[0m[37m [0m[01mBlue Percent[0m[37m │[0m
│[37m [0m[01mred_amount[0m │[37m [0m[01mblue_amount[0m │[37m [0m[01msum[0m │[37m [0m[01mRed Percent[0m │[37m [0m[01mBlue Percent[0m │[37m [0m[01msum[0m │[37m [0m[01mRed Percent[0m │[37m [0m[01mBlue Percent[0m │
├────────────┼─────────────┼─────┼─────────────┼──────────────┼─────┼─────────────┼──────────────┤
[37m│[0m[37m [0m[31m 2[0m[37m │[0m[37m [0m[37m 3[0m[37m │[0m[37m [0m[37m 5[0m[37m │[0m[37m [0m[37m 40.00[0m[37m │[0m[37m [0m[37m 60.00[0m[37m │[0m[37m [0m[37m 5[0m[37m │[0m[37m [0m[37m 40.00[0m[37m │[0m[37m [0m[37m 60.00[0m[37m │[0m
[37m│[0m[37m [0m[31m 1[0m[37m │[0m[37m [0m[37m 1[0m[37m │[0m[37m [0m[37m 2[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m[37m [0m[37m 2[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m[37m [0m[37m 50.00[0m[37m │[0m
[37m│[0m[37m [0m[31m 5[0m[37m │[0m[37m [0m[37m 6[0m[37m │[0m[37m [0m[37m 11[0m[37m │[0m[37m [0m[37m 45.45[0m[37m │[0m[37m [0m[37m 54.55[0m[37m │[0m[37m [0m[37m 11[0m[37m │[0m[37m [0m[37m 45.45[0m[37m │[0m[37m [0m[37m 54.55[0m[37m │[0m
│[37m [0m[31m 2[0m │[37m [0m[37m 3[0m │[37m [0m[37m 5[0m │[37m [0m[37m 40.00[0m │[37m [0m[37m 60.00[0m │[37m [0m[37m 5[0m │[37m [0m[37m 40.00[0m │[37m [0m[37m 60.00[0m │
│[37m [0m[31m 1[0m │[37m [0m[37m 1[0m │[37m [0m[37m 2[0m │[37m [0m[37m 50.00[0m │[37m [0m[37m 50.00[0m │[37m [0m[37m 2[0m │[37m [0m[37m 50.00[0m │[37m [0m[37m 50.00[0m │
│[37m [0m[31m 5[0m │[37m [0m[37m 6[0m │[37m [0m[37m 11[0m │[37m [0m[37m 45.45[0m │[37m [0m[37m 54.55[0m │[37m [0m[37m 11[0m │[37m [0m[37m 45.45[0m │[37m [0m[37m 54.55[0m │
└────────────┴─────────────┴─────┴─────────────┴──────────────┴─────┴─────────────┴──────────────┘"
`;
8 changes: 4 additions & 4 deletions test/__snapshots__/customizedColor.test.ts.snap
View file
Expand Up @@ -2,10 +2,10 @@

exports[`Example: Print a simple Table with Custom column colors Custom column colors are working 1`] = `
"┌──────────────────────┬──────────────────────────┬─────────────┐
[37m│[0m[37m [0m[01mred_left_align_index[0m[37m │[0m[37m [0m[01m right_align_text[0m[37m │[0m[37m [0m[01mgreen_value[0m[37m │[0m
│[37m [0m[01mred_left_align_index[0m │[37m [0m[01m right_align_text[0m │[37m [0m[01mgreen_value[0m │
├──────────────────────┼──────────────────────────┼─────────────┤
[37m│[0m[37m [0m[31m2 [0m[37m │[0m[37m [0m[32mThis is my defined Green[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
[37m│[0m[37m [0m[31m3 [0m[37m │[0m[37m [0m[34mThis row is blue as well[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
[37m│[0m[37m [0m[31m4 [0m[37m │[0m[37m [0m[32m This row is green[0m[37m │[0m[37m [0m[32m 10.212[0m[37m │[0m
│[37m [0m[31m2 [0m │[37m [0m[32mThis is my defined Green[0m │[37m [0m[32m 10.212[0m │
│[37m [0m[31m3 [0m │[37m [0m[34mThis row is blue as well[0m │[37m [0m[32m 10.212[0m │
│[37m [0m[31m4 [0m │[37m [0m[32m This row is green[0m │[37m [0m[32m 10.212[0m │
└──────────────────────┴──────────────────────────┴─────────────┘"
`;

0 comments on commit bcb6e8c

Please sign in to comment.