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

FrozenPandaz · FrozenPandaz · commit 0ea3c44afa04 · 2018-11-02T17:16:45.000-04:00
diff --git a/packages/angular_devkit/schematics/src/rules/move.ts b/packages/angular_devkit/schematics/src/rules/move.ts
@@ -23,9 +23,16 @@ 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;
   });
 }

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,16 @@ export function move(from: string, to?: string): Rule {`
`23`	`23`	`return noop;`
`24`	`24`	`}`
`25`	`25`
`26`		`- return tree => tree.visit(path => {`
`27`		`- if (path.startsWith(fromPath)) {`
`28`		`- tree.rename(path, toPath + '/' + path.substr(fromPath.length));`
	`26`	`+ return tree => {`
	`27`	`+ if (tree.exists(fromPath)) {`
	`28`	`+ // fromPath is a file`
	`29`	`+ tree.rename(fromPath, toPath);`
	`30`	`+ } else {`
	`31`	`+ // fromPath is a directory`
	`32`	`+ tree.getDir(fromPath).visit(path => {`
	`33`	`+ tree.rename(path, toPath + '/' + path.substr(fromPath.length));`
	`34`	`+ });`
`29`	`35`	`}`
	`36`	`+ return tree;`
`30`	`37`	`});`
`31`	`38`	`}`