Skip to content

Commit f111d96

Browse files
committed
fix: dim individual lines
1 parent 470981d commit f111d96

File tree

3 files changed

+42
-53
lines changed

3 files changed

+42
-53
lines changed

packages/prompts/src/__snapshots__/index.test.ts.snap

Lines changed: 28 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1598,8 +1598,8 @@ exports[`prompts (isCI = false) > taskLog > message > can write multiple lines 1
15981598
",
15991599
"│
16001600
",
1601-
"[2m│[22m [2mline 0
1602-
[2m│[22m line 1[22m
1601+
"[2m│[22m [2mline 0[22m
1602+
[2m│[22m [2mline 1[22m
16031603
",
16041604
]
16051605
`;
@@ -1625,7 +1625,7 @@ exports[`prompts (isCI = false) > taskLog > message > enforces limit if set 1`]
16251625
]
16261626
`;
16271627

1628-
exports[`prompts (isCI = false) > taskLog > message > handles empty lines 1`] = `
1628+
exports[`prompts (isCI = false) > taskLog > message > prints empty lines 1`] = `
16291629
[
16301630
"│
16311631
",
@@ -1635,18 +1635,14 @@ exports[`prompts (isCI = false) > taskLog > message > handles empty lines 1`] =
16351635
",
16361636
"│ 
16371637
",
1638-
"",
1639-
"│ 
1640-
│ line 1
1638+
"│ line 1
16411639
",
1642-
"",
1643-
"│ 
1644-
│ line 1
1640+
"",
1641+
"│ line 1
16451642
│ 
16461643
",
1647-
"",
1648-
"│ 
1649-
│ line 1
1644+
"",
1645+
"│ line 1
16501646
│ 
16511647
│ line 3
16521648
",
@@ -1664,11 +1660,11 @@ exports[`prompts (isCI = false) > taskLog > message > raw = true appends message
16641660
"│ line 0
16651661
",
16661662
"",
1667-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m
1663+
"[2m│[22m [2mline 0still line 0[22m
16681664
",
16691665
"",
1670-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m[2m
1671-
[2m│[22m line 1[22m
1666+
"[2m│[22m [2mline 0still line 0[22m
1667+
[2m│[22m [2mline 1[22m
16721668
",
16731669
]
16741670
`;
@@ -1684,10 +1680,10 @@ exports[`prompts (isCI = false) > taskLog > message > raw = true works when mixe
16841680
"│ line 0
16851681
",
16861682
"",
1687-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m
1683+
"[2m│[22m [2mline 0still line 0[22m
16881684
",
16891685
"",
1690-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m
1686+
"[2m│[22m [2mline 0still line 0[22m
16911687
│ line 1
16921688
",
16931689
]
@@ -1709,7 +1705,7 @@ exports[`prompts (isCI = false) > taskLog > message > raw = true works when star
17091705
",
17101706
"",
17111707
"│ line 0
1712-
[2m│[22m [2mline 1[22m[2mstill line 1[22m
1708+
[2m│[22m [2mline 1still line 1[22m
17131709
",
17141710
]
17151711
`;
@@ -3935,8 +3931,8 @@ exports[`prompts (isCI = true) > taskLog > message > can write multiple lines 1`
39353931
",
39363932
"│
39373933
",
3938-
"[2m│[22m [2mline 0
3939-
[2m│[22m line 1[22m
3934+
"[2m│[22m [2mline 0[22m
3935+
[2m│[22m [2mline 1[22m
39403936
",
39413937
]
39423938
`;
@@ -3962,7 +3958,7 @@ exports[`prompts (isCI = true) > taskLog > message > enforces limit if set 1`] =
39623958
]
39633959
`;
39643960

3965-
exports[`prompts (isCI = true) > taskLog > message > handles empty lines 1`] = `
3961+
exports[`prompts (isCI = true) > taskLog > message > prints empty lines 1`] = `
39663962
[
39673963
"│
39683964
",
@@ -3972,18 +3968,14 @@ exports[`prompts (isCI = true) > taskLog > message > handles empty lines 1`] = `
39723968
",
39733969
"│ 
39743970
",
3975-
"",
3976-
"│ 
3977-
│ line 1
3971+
"│ line 1
39783972
",
3979-
"",
3980-
"│ 
3981-
│ line 1
3973+
"",
3974+
"│ line 1
39823975
│ 
39833976
",
3984-
"",
3985-
"│ 
3986-
│ line 1
3977+
"",
3978+
"│ line 1
39873979
│ 
39883980
│ line 3
39893981
",
@@ -4001,11 +3993,11 @@ exports[`prompts (isCI = true) > taskLog > message > raw = true appends message
40013993
"│ line 0
40023994
",
40033995
"",
4004-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m
3996+
"[2m│[22m [2mline 0still line 0[22m
40053997
",
40063998
"",
4007-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m[2m
4008-
[2m│[22m line 1[22m
3999+
"[2m│[22m [2mline 0still line 0[22m
4000+
[2m│[22m [2mline 1[22m
40094001
",
40104002
]
40114003
`;
@@ -4021,10 +4013,10 @@ exports[`prompts (isCI = true) > taskLog > message > raw = true works when mixed
40214013
"│ line 0
40224014
",
40234015
"",
4024-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m
4016+
"[2m│[22m [2mline 0still line 0[22m
40254017
",
40264018
"",
4027-
"[2m│[22m [2mline 0[22m[2mstill line 0[22m
4019+
"[2m│[22m [2mline 0still line 0[22m
40284020
│ line 1
40294021
",
40304022
]
@@ -4046,7 +4038,7 @@ exports[`prompts (isCI = true) > taskLog > message > raw = true works when start
40464038
",
40474039
"",
40484040
"│ line 0
4049-
[2m│[22m [2mline 1[22m[2mstill line 1[22m
4041+
[2m│[22m [2mline 1still line 1[22m
40504042
",
40514043
]
40524044
`;

packages/prompts/src/index.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,7 @@ describe.each(['true', 'false'])('prompts (isCI = %s)', (isCI) => {
12761276
expect(output.buffer).toMatchSnapshot();
12771277
});
12781278

1279-
test('handles empty lines', async () => {
1279+
test('prints empty lines', async () => {
12801280
const log = prompts.taskLog({
12811281
input,
12821282
output,

packages/prompts/src/index.ts

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ export const log = {
704704
parts.push(`${secondarySymbol}`);
705705
}
706706
const messageParts = Array.isArray(message) ? message : message.split('\n');
707-
if (message && messageParts.length > 0) {
707+
if (messageParts.length > 0) {
708708
const [firstLine, ...lines] = messageParts;
709709
if (firstLine.length > 0) {
710710
parts.push(`${symbol} ${firstLine}`);
@@ -1074,27 +1074,29 @@ export const taskLog = (opts: TaskLogOptions) => {
10741074
const lines = bufferHeight + 1 + (clearTitle ? spacing + 2 : 0);
10751075
output.write(erase.lines(lines));
10761076
};
1077+
const printBuffer = (buf: string, messageSpacing?: number): void => {
1078+
log.message(buf.split('\n').map(color.dim), {
1079+
output,
1080+
secondarySymbol,
1081+
symbol: secondarySymbol,
1082+
spacing: messageSpacing ?? spacing,
1083+
});
1084+
};
10771085
const renderBuffer = (): void => {
10781086
if (retainLog === true && fullBuffer.length > 0) {
1079-
log.message(`${fullBuffer}\n${buffer}`, {
1080-
output,
1081-
secondarySymbol,
1082-
symbol: secondarySymbol,
1083-
spacing,
1084-
});
1087+
printBuffer(`${fullBuffer}\n${buffer}`);
10851088
} else {
1086-
log.message(buffer, { output, secondarySymbol, symbol: secondarySymbol, spacing });
1089+
printBuffer(buffer);
10871090
}
10881091
};
10891092

10901093
return {
10911094
message(msg: string, mopts?: TaskLogMessageOptions) {
10921095
clear(false);
1093-
const dimMessage = color.dim(msg);
10941096
if ((mopts?.raw !== true || !lastMessageWasRaw) && buffer !== '') {
10951097
buffer += '\n';
10961098
}
1097-
buffer += dimMessage;
1099+
buffer += msg;
10981100
lastMessageWasRaw = mopts?.raw === true;
10991101
if (opts.limit !== undefined) {
11001102
const lines = buffer.split('\n');
@@ -1107,12 +1109,7 @@ export const taskLog = (opts: TaskLogOptions) => {
11071109
}
11081110
buffer = lines.join('\n');
11091111
}
1110-
log.message(buffer, {
1111-
output,
1112-
secondarySymbol,
1113-
symbol: secondarySymbol,
1114-
spacing: 0,
1115-
});
1112+
printBuffer(buffer, 0);
11161113
},
11171114
error(message: string, opts?: TaskLogCompletionOptions): void {
11181115
clear(true);

0 commit comments

Comments
 (0)