Skip to content

Commit ebad66c

Browse files
authored
feat(fmt): improve CLI log output (#153)
1 parent d7cea9b commit ebad66c

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

packages/rstack/src/fmt/cli.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ const logFmtResult = (result: FmtRunResult, mode: FmtMode, cwd: string): void =>
9191
const displayPath = getDisplayPath(cwd, file.path);
9292

9393
if (file.status === 'written') {
94-
logger.log(displayPath);
94+
logger.success(displayPath);
9595
} else if (file.status === 'different') {
9696
differentCount++;
9797
logger[mode === 'check' ? 'warn' : 'log'](displayPath);
@@ -111,14 +111,14 @@ const logFmtResult = (result: FmtRunResult, mode: FmtMode, cwd: string): void =>
111111
`Code style issues found in ${differentCount} ${files}. Run rs fmt --write to fix.`,
112112
);
113113
} else if (errorCount === 0) {
114-
logger.log('All matched files use Prettier code style!');
114+
logger.success('All matched files are correctly formatted.');
115115
}
116116
};
117117

118118
const runFmtCLI = async (args: string[]): Promise<void> => {
119119
const { help, maxWorkers, mode, patterns } = parseFmtCLIArgs(args);
120120
if (help) {
121-
console.log(fmtHelpMessage);
121+
logger.log(fmtHelpMessage);
122122
return;
123123
}
124124

@@ -134,7 +134,7 @@ const runFmtCLI = async (args: string[]): Promise<void> => {
134134
const files = await discoverFmtFiles({ cwd, patterns, config });
135135

136136
if (mode === 'check') {
137-
logger.log('Checking formatting...');
137+
logger.start('Checking formatting...');
138138
}
139139

140140
const result = await runFmtFiles({

packages/rstack/tests/cli/fmt/index.test.ts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ test('supports format as an alias for fmt', () => {
7676
const result = runCLI(['format', 'index.ts']);
7777

7878
expect(result.status).toBe(0);
79-
expect(result.stdout).toBe('index.ts\n');
79+
expect(result.stdout).toBe('success index.ts\n');
8080
expect(result.stderr).toBe('');
8181
expect(readProjectFile('index.ts')).toBe('const message = "hello";\n');
8282
});
@@ -97,7 +97,7 @@ test('formats the current directory with Prettier defaults', () => {
9797
const result = runFmt();
9898

9999
expect(result.status).toBe(0);
100-
expect(result.stdout).toBe('index.ts\n');
100+
expect(result.stdout).toBe('success index.ts\n');
101101
expect(result.stderr).toBe('');
102102
expect(readProjectFile('index.ts')).toBe('const message = "hello";\n');
103103
});
@@ -139,7 +139,7 @@ test('supports configuring the worker count', () => {
139139
const result = runFmt(['--parallel-workers', '1', 'first.ts', 'second.ts']);
140140

141141
expect(result.status).toBe(0);
142-
expect(result.stdout).toBe('first.ts\nsecond.ts\n');
142+
expect(result.stdout).toBe('success first.ts\nsuccess second.ts\n');
143143
expect(result.stderr).toBe('');
144144
expect(readProjectFile('first.ts')).toBe('const first = "first";\n');
145145
expect(readProjectFile('second.ts')).toBe('const second = "second";\n');
@@ -154,7 +154,7 @@ test('does not load Prettier config or ignore files', () => {
154154
const result = runFmt(['index.ts']);
155155

156156
expect(result.status).toBe(0);
157-
expect(result.stdout).toBe('index.ts\n');
157+
expect(result.stdout).toBe('success index.ts\n');
158158
expect(result.stderr).toBe('');
159159
expect(readProjectFile('index.ts')).toBe('function getMessage() {\n return "hello";\n}\n');
160160
});
@@ -186,7 +186,7 @@ define.fmt({
186186
const result = runFmt(['--write', 'src/**/*.ts']);
187187

188188
expect(result.status).toBe(0);
189-
expect(result.stdout).toBe('src/index.test.ts\nsrc/index.ts\n');
189+
expect(result.stdout).toBe('success src/index.test.ts\nsuccess src/index.ts\n');
190190
expect(result.stderr).toBe('');
191191
expect(readProjectFile('src/index.ts')).toBe("const message = 'hello';\n");
192192
expect(readProjectFile('src/index.test.ts')).toBe("const test = 'test'\n");
@@ -209,7 +209,7 @@ define.fmt({
209209
const result = runFmt(['index.ts', '--config', 'custom.config.ts']);
210210

211211
expect(result.status).toBe(0);
212-
expect(result.stdout).toBe('index.ts\n');
212+
expect(result.stdout).toBe('success index.ts\n');
213213
expect(result.stderr).toBe('');
214214
expect(readProjectFile('index.ts')).toBe("const message = 'hello';\n");
215215
});
@@ -221,7 +221,7 @@ test('checks formatting without writing files', () => {
221221
const result = runFmt(['--check', 'index.ts']);
222222

223223
expect(result.status).toBe(1);
224-
expect(result.stdout).toBe('Checking formatting...\n');
224+
expect(result.stdout).toBe('start Checking formatting...\n');
225225
expect(result.stderr).toContain('warn index.ts');
226226
expect(result.stderr).toContain(
227227
'warn Code style issues found in 1 file. Run rs fmt --write to fix.',
@@ -233,7 +233,7 @@ test('checks formatting without writing files', () => {
233233

234234
expect(formattedResult.status).toBe(0);
235235
expect(formattedResult.stdout).toBe(
236-
'Checking formatting...\nAll matched files use Prettier code style!\n',
236+
'start Checking formatting...\nsuccess All matched files are correctly formatted.\n',
237237
);
238238
expect(formattedResult.stderr).toBe('');
239239
});
@@ -278,7 +278,7 @@ define.fmt({
278278
const result = runFmt(['*.fixture']);
279279

280280
expect(result.status).toBe(0);
281-
expect(result.stdout).toBe('first.fixture\nsecond.fixture\n');
281+
expect(result.stdout).toBe('success first.fixture\nsuccess second.fixture\n');
282282
expect(result.stderr).toBe('');
283283
expect(readProjectFile('first.fixture')).toBe('{ "first": true }\n');
284284
expect(readProjectFile('second.fixture')).toBe('{ "second": true }\n');
@@ -306,7 +306,7 @@ define.fmt({
306306
const result = runFmt(['data.fixture', 'index.ts']);
307307

308308
expect(result.status).toBe(0);
309-
expect(result.stdout).toBe('data.fixture\nindex.ts\n');
309+
expect(result.stdout).toBe('success data.fixture\nsuccess index.ts\n');
310310
expect(result.stderr).toBe('');
311311
expect(readProjectFile('data.fixture')).toBe('{ "value": true }\n');
312312
expect(readProjectFile('index.ts')).toBe('const value = true;\n');

0 commit comments

Comments
 (0)