refactor(@angular-devkit/schematics): remove unused VirtualTree classes

Author: clydin

etc/api/angular_devkit/schematics/src/_golden-api.d.ts

@@ -244,35 +244,10 @@ export interface FilePredicate<T> {
     (path: Path, entry?: Readonly<FileEntry> | null): T;
 }
 
-export declare class FileSystemCreateTree extends FileSystemTree {
-    constructor(host: virtualFs.Host);
-}
-
-export declare class FileSystemDirEntry extends VirtualDirEntry {
-    protected _host: virtualFs.SyncDelegateHost<{}>;
-    readonly parent: DirEntry | null;
-    readonly subdirs: PathFragment[];
-    readonly subfiles: PathFragment[];
-    constructor(_host: virtualFs.SyncDelegateHost<{}>, tree: FileSystemTree, path?: Path);
-    protected _createDir(name: PathFragment): DirEntry;
-    file(name: PathFragment): FileEntry | null;
-}
-
 export declare class FileSystemSink extends HostSink {
     constructor(dir: string, force?: boolean);
 }
 
-export declare class FileSystemTree extends VirtualTree {
-    protected _host: virtualFs.SyncDelegateHost<{}>;
-    protected _initialized: boolean;
-    readonly tree: Map<Path, FileEntry>;
-    constructor(host: virtualFs.Host);
-    protected _copyTo<T extends VirtualTree>(tree: T): void;
-    protected _recursiveFileList(): Path[];
-    branch(): Tree;
-    get(path: string): FileEntry | null;
-}
-
 export declare type FileVisitor = FilePredicate<void>;
 
 export declare const FileVisitorCancelToken: symbol;
@@ -634,60 +609,6 @@ export interface UpdateRecorder {
 
 export declare function url(urlString: string): Source;
 
-export declare class VirtualDirEntry implements DirEntry {
-    protected _path: Path;
-    protected _subdirs: Map<PathFragment, DirEntry>;
-    protected _tree: VirtualTree;
-    readonly parent: DirEntry | null;
-    readonly path: Path;
-    readonly subdirs: PathFragment[];
-    readonly subfiles: PathFragment[];
-    constructor(_tree: VirtualTree, _path?: Path);
-    protected _createDir(name: PathFragment): DirEntry;
-    dir(name: PathFragment): DirEntry;
-    file(name: PathFragment): FileEntry | null;
-    visit(visitor: FileVisitor): void;
-}
-
-export declare class VirtualTree implements Tree {
-    protected _actions: ActionList;
-    protected _cacheMap: Map<Path, FileEntry>;
-    protected _root: VirtualDirEntry;
-    protected _tree: Map<Path, FileEntry>;
-    readonly actions: Action[];
-    readonly files: Path[];
-    readonly root: DirEntry;
-    readonly staging: ReadonlyMap<Path, FileEntry>;
-    protected readonly tree: ReadonlyMap<Path, FileEntry>;
-    protected _copyTo<T extends VirtualTree>(tree: T): void;
-    protected _create(path: Path, content: Buffer, action?: Action): void;
-    protected _delete(path: Path, action?: Action): void;
-    protected _normalizePath(path: string): Path;
-    protected _overwrite(path: Path, content: Buffer, action?: Action): void;
-    protected _rename(path: Path, to: Path, action?: Action, force?: boolean): void;
-    apply(action: Action, strategy: MergeStrategy): void;
-    beginUpdate(path: string): UpdateRecorder;
-    branch(): Tree;
-    commitUpdate(record: UpdateRecorder): void;
-    create(path: string, content: Buffer | string): void;
-    delete(path: string): void;
-    exists(path: string): boolean;
-    get(path: string): FileEntry | null;
-    getDir(path: string): DirEntry;
-    has(path: string): boolean;
-    merge(other: Tree, strategy?: MergeStrategy): void;
-    optimize(): void;
-    overwrite(path: string, content: Buffer | string): void;
-    read(path: string): Buffer | null;
-    rename(path: string, to: string): void;
-    set(entry: FileEntry): Map<Path, FileEntry>;
-    visit(visitor: FileVisitor): void;
-    static branch(tree: Tree): Tree;
-    static isVirtualTree(tree: Tree): tree is VirtualTree;
-    static merge(tree: Tree, other: Tree, strategy?: MergeStrategy): Tree;
-    static optimize(tree: Tree): VirtualTree;
-}
-
 export declare function when(predicate: FilePredicate<boolean>, operator: FileOperator): FileOperator;
 
 export interface Workflow {

packages/angular_devkit/schematics/src/index.ts

@@ -25,8 +25,6 @@ export * from './rules/url';
 export * from './tree/delegate';
 export * from './tree/empty';
 export * from './tree/host-tree';
-export * from './tree/filesystem';
-export * from './tree/virtual';
 export {UpdateRecorder} from './tree/interface';
 export * from './engine/schematic';
 export * from './sink/dryrun';

packages/angular_devkit/schematics/src/rules/base.ts

@@ -9,18 +9,15 @@ import { Observable, of as observableOf } from 'rxjs';
 import { concatMap, last, map } from 'rxjs/operators';
 import { FileOperator, Rule, SchematicContext, Source } from '../engine/interface';
 import { SchematicsException } from '../exception/exception';
-import { FilteredTree } from '../tree/filtered';
 import { FilterHostTree, HostTree } from '../tree/host-tree';
 import { FileEntry, FilePredicate, MergeStrategy, Tree } from '../tree/interface';
 import { ScopedTree } from '../tree/scoped';
 import {
   branch,
   empty as staticEmpty,
   merge as staticMerge,
-  optimize as staticOptimize,
   partition as staticPartition,
 } from '../tree/static';
-import { VirtualTree } from '../tree/virtual';
 import { callRule, callSource } from './call';
 
 
@@ -56,24 +53,7 @@ export function chain(rules: Rule[]): Rule {
  * Apply multiple rules to a source, and returns the source transformed.
  */
 export function apply(source: Source, rules: Rule[]): Source {
-  return (context: SchematicContext) => {
-    return callRule(chain([
-      ...rules,
-      // Optimize the tree. Since this is a source tree, there's not much harm here and this might
-      // avoid further issues.
-      tree => {
-        if (tree instanceof VirtualTree) {
-          tree.optimize();
-
-          return tree;
-        } else if (tree.actions.length != 0) {
-          return staticOptimize(tree);
-        } else {
-          return tree;
-        }
-      },
-    ]), callSource(source, context), context);
-  };
+  return context => callRule(chain(rules), callSource(source, context), context);
 }
 
 
@@ -96,10 +76,7 @@ export function noop(): Rule {
 
 export function filter(predicate: FilePredicate<boolean>): Rule {
   return ((tree: Tree) => {
-    // TODO: Remove VirtualTree usage in 7.0
-    if (VirtualTree.isVirtualTree(tree)) {
-      return new FilteredTree(tree, predicate);
-    } else if (HostTree.isHostTree(tree)) {
+    if (HostTree.isHostTree(tree)) {
       return new FilterHostTree(tree, predicate);
     } else {
       throw new SchematicsException('Tree type is not supported.');