fix(@angular-devkit/architect): allow registered builder teardowns to execute

Previously, the base job handler was completing the entire job before any teardowns could attempt to execute.

Author: clydin

goldens/public-api/angular_devkit/architect/index.md

@@ -451,6 +451,8 @@ export function scheduleTargetAndForget(context: BuilderContext, target: Target,
 
 // @public
 interfaceSimpleJobHandlerContext<AextendsJsonValue, IextendsJsonValue, OextendsJsonValue> extendsJobHandlerContext<A, I, O>{
+// (undocumented)
+ addTeardown(teardown: () =>Promise<void> |void):void;
 // (undocumented)
  createChannel: (name:string) =>Observer<JsonValue>
 // (undocumented)

packages/angular_devkit/architect/src/create-builder.ts

@@ -47,9 +47,8 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
 constscheduler=context.scheduler;
 constprogressChannel=context.createChannel('progress');
 constlogChannel=context.createChannel('log');
+constaddTeardown=context.addTeardown.bind(context);
 letcurrentState: BuilderProgressState=BuilderProgressState.Stopped;
-constteardownLogics: Array<()=>PromiseLike<void>|void>=[];
-lettearingDown=false;
 letcurrent=0;
 letstatus='';
 lettotal=1;
@@ -83,18 +82,8 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
 
 constinputSubscription=context.inboundBus.subscribe((i)=>{
 switch(i.kind){
-caseJobInboundMessageKind.Stop:
-// Run teardown logic then complete.
-tearingDown=true;
-Promise.all(teardownLogics.map((fn)=>fn()||Promise.resolve())).then(
-()=>observer.complete(),
-(err)=>observer.error(err),
-);
-break;
 caseJobInboundMessageKind.Input:
-if(!tearingDown){
-onInput(i.value);
-}
+onInput(i.value);
 break;
 }
 });
@@ -209,9 +198,7 @@ export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput
 progress({state: currentState, current, total, status },context);
 }
 },
-addTeardown(teardown: ()=>Promise<void>|void): void{
-teardownLogics.push(teardown);
-},
+ addTeardown,
 };
 
 context.reportRunning();

packages/angular_devkit/architect/src/jobs/create-job-handler.ts

@@ -44,6 +44,7 @@ export interface SimpleJobHandlerContext<
 >extendsJobHandlerContext<A,I,O>{
 createChannel: (name: string)=>Observer<JsonValue>;
 input: Observable<I>;
+addTeardown(teardown: ()=>Promise<void>|void): void;
 }
 
 /**
@@ -72,6 +73,8 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
 constinboundBus=context.inboundBus;
 constinputChannel=newSubject<I>();
 letsubscription: Subscription;
+constteardownLogics: Array<()=>PromiseLike<void>|void>=[];
+lettearingDown=false;
 
 returnnewObservable<JobOutboundMessage<O>>((subject)=>{
 functioncomplete(){
@@ -91,13 +94,22 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
 break;
 
 caseJobInboundMessageKind.Stop:
-// There's no way to cancel a promise or a synchronous function, but we do cancel
-// observables where possible.
-complete();
+// Run teardown logic then complete.
+tearingDown=true;
+if(teardownLogics.length){
+Promise.all(teardownLogics.map((fn)=>fn())).then(
+()=>complete(),
+()=>complete(),
+);
+}else{
+complete();
+}
 break;
 
 caseJobInboundMessageKind.Input:
-inputChannel.next(message.value);
+if(!tearingDown){
+inputChannel.next(message.value);
+}
 break;
 }
 });
@@ -108,6 +120,9 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
 constnewContext: SimpleJobHandlerContext<A,I,O>={
  ...context,
 input: inputChannel.asObservable(),
+addTeardown(teardown: ()=>Promise<void>|void): void{
+teardownLogics.push(teardown);
+},
 createChannel(name: string){
 if(channels.has(name)){
 thrownewChannelAlreadyExistException(name);