fix(deep-linking): Fix issue with deep-linking when attempting to update a template and failing, resulting in a full build but not processing deep links

Author: danbucholtz

src/deep-linking.ts

@@ -3,7 +3,7 @@ import { Logger } from './logger/logger';
 import * as Constants from './util/constants';
 import { BuildError } from './util/errors';
 import { getStringPropertyValue, setParsedDeepLinkConfig } from './util/helpers';
-import { BuildContext, ChangedFile, DeepLinkConfigEntry } from './util/interfaces';
+import { BuildContext, BuildState, ChangedFile, DeepLinkConfigEntry } from './util/interfaces';
 
 import { convertDeepLinkConfigEntriesToString, getDeepLinkData, hasExistingDeepLinkConfig, updateAppNgModuleAndFactoryWithDeepLinkConfig } from './deep-linking/util';
 
@@ -54,6 +54,14 @@ export function deepLinkingWorkerImpl(context: BuildContext, changedFiles: Chang
 }
 
 export function deepLinkingUpdate(changedFiles: ChangedFile[], context: BuildContext) {
+  if (context.deepLinkState === BuildState.RequiresBuild) {
+    return deepLinkingWorkerFullUpdate(context);
+  } else {
+    return deepLinkingUpdateImpl(changedFiles, context);
+  }
+}
+
+export function deepLinkingUpdateImpl(changedFiles: ChangedFile[], context: BuildContext) {
   const tsFiles = changedFiles.filter(changedFile => changedFile.ext === '.ts');
   if (tsFiles.length === 0) {
     return Promise.resolve();
@@ -69,3 +77,15 @@ export function deepLinkingUpdate(changedFiles: ChangedFile[], context: BuildCon
   });
 }
 
+export function deepLinkingWorkerFullUpdate(context: BuildContext) {
+  const logger = new Logger(`deeplinks update`);
+  return deepLinkingWorker(context).then((deepLinkConfigEntries: DeepLinkConfigEntry[]) => {
+      setParsedDeepLinkConfig(deepLinkConfigEntries);
+      logger.finish();
+    })
+    .catch((err: Error) => {
+      Logger.warn(err.message);
+      const error = new BuildError(err.message);
+      throw logger.fail(error);
+    });
+}

src/template.ts

@@ -52,6 +52,7 @@ export function templateUpdate(changedFiles: ChangedFile[], context: BuildContex
   } catch (ex) {
     Logger.debug(`templateUpdate error: ${ex.message}`);
     context.transpileState = BuildState.RequiresBuild;
+    context.deepLinkState = BuildState.RequiresBuild;
     context.bundleState = BuildState.RequiresUpdate;
     return Promise.resolve();
   }

src/util/interfaces.ts

@@ -36,6 +36,7 @@ export interface BuildContext {
   transpileState?: BuildState;
   templateState?: BuildState;
   bundleState?: BuildState;
+  deepLinkState?: BuildState;
 
   // target examples: cordova, browser, electron
   target?: string;

src/watch.spec.ts

@@ -1,7 +1,6 @@
 import * as path from 'path';
 
 import * as build from './build';
-import * as helpers from './util/helpers';
 import { BuildContext, BuildState, ChangedFile } from './util/interfaces';
 import { FileCache } from './util/file-cache';
 import * as watch from './watch';
@@ -19,6 +18,7 @@ describe('watch', () => {
       }];
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresBuild);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresBuild);
     });
 
     it('should require transpile full build for html file change and not already successful bundle', () => {
@@ -29,6 +29,7 @@ describe('watch', () => {
       }];
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresBuild);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresBuild);
     });
 
     it('should require template update for html file change and already successful bundle', () => {
@@ -91,6 +92,7 @@ describe('watch', () => {
       context.bundleState = BuildState.SuccessfulBuild;
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresBuild);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresBuild);
       expect(context.bundleState).toEqual(BuildState.RequiresUpdate);
     });
 
@@ -102,6 +104,7 @@ describe('watch', () => {
       }];
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresBuild);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresBuild);
       expect(context.bundleState).toEqual(BuildState.RequiresBuild);
     });
 
@@ -113,6 +116,7 @@ describe('watch', () => {
       }];
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresBuild);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresBuild);
       expect(context.bundleState).toEqual(BuildState.RequiresBuild);
     });
 
@@ -127,6 +131,7 @@ describe('watch', () => {
       context.fileCache.set(resolvedFilePath, { path: 'file1.ts', content: 'content' });
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresUpdate);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresUpdate);
       expect(context.bundleState).toEqual(BuildState.RequiresUpdate);
     });
 
@@ -140,6 +145,7 @@ describe('watch', () => {
       context.fileCache.set(resolvedFilePath, { path: 'file1.ts', content: 'content' });
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresUpdate);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresUpdate);
       expect(context.bundleState).toEqual(BuildState.RequiresBuild);
     });
 
@@ -155,6 +161,7 @@ describe('watch', () => {
       }];
       watch.runBuildUpdate(context, files);
       expect(context.transpileState).toEqual(BuildState.RequiresBuild);
+      expect(context.deepLinkState).toEqual(BuildState.RequiresBuild);
       expect(context.bundleState).toEqual(BuildState.RequiresBuild);
     });
 

src/watch.ts

@@ -31,6 +31,7 @@ export function watch(context?: BuildContext, configFile?: string) {
   context.sassState = BuildState.RequiresBuild;
   context.transpileState = BuildState.RequiresBuild;
   context.bundleState = BuildState.RequiresBuild;
+  context.deepLinkState = BuildState.RequiresBuild;
 
   const logger = new Logger('watch');
 
@@ -321,9 +322,11 @@ export function runBuildUpdate(context: BuildContext, changedFiles: ChangedFile[
     if (requiresFullBuild) {
       // .ts file was added or deleted, we need a full rebuild
       context.transpileState = BuildState.RequiresBuild;
+      context.deepLinkState = BuildState.RequiresBuild;
     } else {
       // .ts files have changed, so we can get away with doing an update
       context.transpileState = BuildState.RequiresUpdate;
+      context.deepLinkState = BuildState.RequiresUpdate;
     }
   }
 
@@ -352,6 +355,7 @@ export function runBuildUpdate(context: BuildContext, changedFiles: ChangedFile[
       // .html file was added/deleted
       // we should do a full transpile build because of this
       context.transpileState = BuildState.RequiresBuild;
+      context.deepLinkState = BuildState.RequiresBuild;
     }
   }