Skip to content

refactor(@angular-devkit/schematics): improve performance of move() #12857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vikerman merged 1 commit into from
Nov 7, 2018
Merged

refactor(@angular-devkit/schematics): improve performance of move() #12857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions packages/angular_devkit/schematics/src/rules/move.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,17 @@ export function move(from: string, to?: string): Rule {
return noop;
}

return tree => tree.visit(path => {
if (path.startsWith(fromPath)) {
tree.rename(path, toPath + '/' + path.substr(fromPath.length));
return tree => {
if (tree.exists(fromPath)) {
// fromPath is a file
tree.rename(fromPath, toPath);
} else {
// fromPath is a directory
tree.getDir(fromPath).visit(path => {
tree.rename(path, toPath + '/' + path.substr(fromPath.length));
});
}
});

return tree;
};
}
34 changes: 34 additions & 0 deletions packages/angular_devkit/schematics/src/rules/move_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,40 @@ describe('move', () => {
.then(done, done.fail);
});

it('works on moving a directory into a subdirectory of itself', done => {
const tree = new HostTree();
tree.create('a/b/file1', 'hello world');
tree.create('a/b/file2', 'hello world');
tree.create('a/c/file3', 'hello world');

callRule(move('a/b', 'a/b/c'), observableOf(tree), context)
.toPromise()
.then(result => {
expect(result.exists('a/b/c/file1')).toBe(true);
expect(result.exists('a/b/c/file2')).toBe(true);
expect(result.exists('a/c/file3')).toBe(true);
})
.then(done, done.fail);
});

it('works on moving a directory into a parent of itself', done => {
const tree = new HostTree();
tree.create('a/b/file1', 'hello world');
tree.create('a/b/file2', 'hello world');
tree.create('a/c/file3', 'hello world');

callRule(move('a/b', 'a'), observableOf(tree), context)
.toPromise()
.then(result => {
expect(result.exists('file1')).toBe(false);
expect(result.exists('file2')).toBe(false);
expect(result.exists('a/file1')).toBe(true);
expect(result.exists('a/file2')).toBe(true);
expect(result.exists('a/c/file3')).toBe(true);
})
.then(done, done.fail);
});

it('becomes a noop with identical from and to', done => {
const tree = new HostTree();
tree.create('a/b/file1', 'hello world');
Expand Down
27 changes: 13 additions & 14 deletions packages/angular_devkit/schematics/src/tree/host-tree.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,23 +76,25 @@ export class HostDirEntry implements DirEntry {
}

visit(visitor: FileVisitor): void {
function _recurse(entry: DirEntry) {
entry.subfiles.forEach(path => {
visitor(join(entry.path, path), entry.file(path));
});
entry.subdirs.forEach(path => {
_recurse(entry.dir(path));
});
}

try {
_recurse(this);
this.getSubfilesRecursively().forEach(file => visitor(file.path, file));
} catch (e) {
if (e !== FileVisitorCancelToken) {
throw e;
}
}
}

private getSubfilesRecursively() {
function _recurse(entry: DirEntry): FileEntry[] {
return entry.subdirs.reduce((files, subdir) => [
...files,
..._recurse(entry.dir(subdir)),
], entry.subfiles.map(subfile => entry.file(subfile) as FileEntry));
}

return _recurse(this);
}
}


Expand Down Expand Up @@ -315,12 +317,9 @@ export class HostTree implements Tree {
return maybeCache;
}
visit(visitor: FileVisitor): void {
const allFiles: [Path, FileEntry | null | undefined][] = [];
this.root.visit((path, entry) => {
allFiles.push([path, entry]);
visitor(path, entry);
});

allFiles.forEach(([path, entry]) => visitor(path, entry));
}

// Change content of host files.
Expand Down
24 changes: 13 additions & 11 deletions packages/angular_devkit/schematics/src/tree/virtual.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,24 +84,26 @@ export class VirtualDirEntry implements DirEntry {
return this._tree.get(join(this._path, name));
}

visit(visitor: FileVisitor) {
function _recurse(entry: VirtualDirEntry) {
entry.subfiles.forEach(path => {
visitor(join(entry._path, path), entry.file(path));
});
entry.subdirs.forEach(path => {
_recurse(entry.dir(path) as VirtualDirEntry);
});
}

visit(visitor: FileVisitor): void {
try {
_recurse(this);
this.getSubfilesRecursively().forEach(file => visitor(file.path, file));
} catch (e) {
if (e !== FileVisitorCancelToken) {
throw e;
}
}
}

private getSubfilesRecursively() {
function _recurse(entry: DirEntry): FileEntry[] {
return entry.subdirs.reduce((files, subdir) => [
...files,
..._recurse(entry.dir(subdir)),
], entry.subfiles.map(subfile => entry.file(subfile) as FileEntry));
}

return _recurse(this);
}
}

/**
Expand Down