Skip to content

Commit 9d06dc4

Browse files
alan-agius4mgechev
authored andcommitted
refactor: strip leading slash to prevent confusion
1 parent 15214b6 commit 9d06dc4

File tree

4 files changed

+20
-15
lines changed

4 files changed

+20
-15
lines changed

packages/angular/cli/commands/update-impl.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,8 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
9797
files.add(eventPath);
9898
break;
9999
case 'rename':
100-
logs.push(`${colors.blue('RENAME')} ${eventPath} => ${event.to}`);
100+
const eventToPath = event.to.startsWith('/') ? event.to.substr(1) : event.to;
101+
logs.push(`${colors.blue('RENAME')} ${eventPath} => ${eventToPath}`);
101102
files.add(eventPath);
102103
break;
103104
}

packages/angular/cli/models/schematic-command.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,8 @@ export abstract class SchematicCommand<
513513
loggingQueue.push(`${colors.yellow('DELETE')} ${eventPath}`);
514514
break;
515515
case 'rename':
516-
loggingQueue.push(`${colors.blue('RENAME')} ${eventPath} => ${event.to}`);
516+
const eventToPath = event.to.startsWith('/') ? event.to.substr(1) : event.to;
517+
loggingQueue.push(`${colors.blue('RENAME')} ${eventPath} => ${eventToPath}`);
517518
break;
518519
}
519520
});

packages/angular_devkit/schematics_cli/bin/schematics.ts

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -189,29 +189,32 @@ export async function main({
189189
*/
190190
workflow.reporter.subscribe((event: DryRunEvent) => {
191191
nothingDone = false;
192+
// Strip leading slash to prevent confusion.
193+
const eventPath = event.path.startsWith('/') ? event.path.substr(1) : event.path;
192194

193195
switch (event.kind) {
194196
case 'error':
195197
error = true;
196198

197199
const desc = event.description == 'alreadyExist' ? 'already exists' : 'does not exist';
198-
logger.error(`ERROR! ${event.path} ${desc}.`);
200+
logger.error(`ERROR! ${eventPath} ${desc}.`);
199201
break;
200202
case 'update':
201203
loggingQueue.push(tags.oneLine`
202-
${terminal.white('UPDATE')} ${event.path} (${event.content.length} bytes)
204+
${terminal.white('UPDATE')} ${eventPath} (${event.content.length} bytes)
203205
`);
204206
break;
205207
case 'create':
206208
loggingQueue.push(tags.oneLine`
207-
${terminal.green('CREATE')} ${event.path} (${event.content.length} bytes)
209+
${terminal.green('CREATE')} ${eventPath} (${event.content.length} bytes)
208210
`);
209211
break;
210212
case 'delete':
211-
loggingQueue.push(`${terminal.yellow('DELETE')} ${event.path}`);
213+
loggingQueue.push(`${terminal.yellow('DELETE')} ${eventPath}`);
212214
break;
213215
case 'rename':
214-
loggingQueue.push(`${terminal.blue('RENAME')} ${event.path} => ${event.to}`);
216+
const eventToPath = event.to.startsWith('/') ? event.to.substr(1) : event.to;
217+
loggingQueue.push(`${terminal.blue('RENAME')} ${eventPath} => ${eventToPath}`);
215218
break;
216219
}
217220
});

packages/angular_devkit/schematics_cli/bin/schematics_spec.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ describe('schematics-cli binary', () => {
4646
it('dry-run works', async () => {
4747
const args = ['blank', 'foo', '--dry-run'];
4848
const res = await main({ args, stdout, stderr });
49-
expect(stdout.lines).toMatch(/CREATE \/foo\/README.md/);
50-
expect(stdout.lines).toMatch(/CREATE \/foo\/.gitignore/);
51-
expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index.ts/);
52-
expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index_spec.ts/);
49+
expect(stdout.lines).toMatch(/CREATE foo\/README.md/);
50+
expect(stdout.lines).toMatch(/CREATE foo\/.gitignore/);
51+
expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index.ts/);
52+
expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index_spec.ts/);
5353
expect(res).toEqual(0);
5454
});
5555

5656
it('dry-run is default when debug mode', async () => {
5757
const args = ['blank', 'foo', '--debug'];
5858
const res = await main({ args, stdout, stderr });
59-
expect(stdout.lines).toMatch(/CREATE \/foo\/README.md/);
60-
expect(stdout.lines).toMatch(/CREATE \/foo\/.gitignore/);
61-
expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index.ts/);
62-
expect(stdout.lines).toMatch(/CREATE \/foo\/src\/foo\/index_spec.ts/);
59+
expect(stdout.lines).toMatch(/CREATE foo\/README.md/);
60+
expect(stdout.lines).toMatch(/CREATE foo\/.gitignore/);
61+
expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index.ts/);
62+
expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index_spec.ts/);
6363
expect(res).toEqual(0);
6464
});
6565

0 commit comments

Comments
 (0)