Graham/angular-cli
1
0
Fork 0
mirror of https://github.com/angular/angular-cli.git synced 2025-05-17 02:54:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(@angular-devkit/schematics): fully support async rules

Browse Source
This commit is contained in:
Charles Lyding 2019-04-10 13:26:21 -04:00 committed by Alex Eagle
parent 790a9622c4
commit 13abfd01ec
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/api/angular_devkit/schematics/src/_golden-api.d.ts vendored
View File

@ -426,7 +426,7 @@ export interface RequiredWorkflowExecutionContext {
schematic: string; schematic: string;
} }
export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | Promise<void> | void; export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | Promise<void> | Promise<Rule> | void;
export declare type RuleFactory<T extends object> = (options: T) => Rule; export declare type RuleFactory<T extends object> = (options: T) => Rule;

2
packages/angular_devkit/schematics/src/engine/interface.ts
View File

@ -231,4 +231,4 @@ export type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null
*/ */
export type Source = (context: SchematicContext) => Tree | Observable<Tree>; export type Source = (context: SchematicContext) => Tree | Observable<Tree>;
export type Rule = (tree: Tree, context: SchematicContext) => export type Rule = (tree: Tree, context: SchematicContext) =>
Tree | Observable<Tree> | Rule | Promise<void> | void; Tree | Observable<Tree> | Rule | Promise<void> | Promise<Rule> | void;

11
packages/angular_devkit/schematics/src/rules/call.ts
View File

@ -97,7 +97,16 @@ export function callRule(
}), }),
); );
} else if (isPromise(result)) { } else if (isPromise(result)) {
return from(result).pipe(map(() => inputTree)); return from(result).pipe(
mergeMap(inner => {
if (typeof inner === 'function') {
// This is considered a Rule, chain the rule and return its output.
return callRule(inner, observableOf(inputTree), context);
} else {
return observableOf(inputTree);
}
}),
);
} else if (TreeSymbol in result) { } else if (TreeSymbol in result) {
return observableOf(result); return observableOf(result);
} else { } else {