From 6557272f8c4f3dead155125eade0f6885de1502b Mon Sep 17 00:00:00 2001
From: Rafael Oleza <rafeca@fb.com>
Date: Thu, 23 Nov 2017 08:05:35 -0800
Subject: [PATCH] Avoid losing deltas when unexpected errors happen on the
 DeltaTransformer

Reviewed By: jeanlauliac

Differential Revision: D6402261

fbshipit-source-id: 6a1a18c1bd7d4f7cecd5a5e9114f6eb493d40b4d
---
 .../src/DeltaBundler/DeltaCalculator.js       |  4 ++
 .../src/DeltaBundler/DeltaTransformer.js      | 69 +++++++++++--------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/packages/metro-bundler/src/DeltaBundler/DeltaCalculator.js b/packages/metro-bundler/src/DeltaBundler/DeltaCalculator.js
index 08e03ab0..deed6d66 100644
--- a/packages/metro-bundler/src/DeltaBundler/DeltaCalculator.js
+++ b/packages/metro-bundler/src/DeltaBundler/DeltaCalculator.js
@@ -74,6 +74,10 @@ class DeltaCalculator extends EventEmitter {
       .getWatcher()
       .removeListener('change', this._handleMultipleFileChanges);
 
+    this.reset();
+  }
+
+  reset() {
     // Clean up all the cache data structures to deallocate memory.
     this._modifiedFiles = new Set();
     this._deletedFiles = new Set();
diff --git a/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js b/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js
index 074cd1a0..c34d5b7d 100644
--- a/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js
+++ b/packages/metro-bundler/src/DeltaBundler/DeltaTransformer.js
@@ -230,40 +230,51 @@ class DeltaTransformer extends EventEmitter {
     const transformerOptions = await this._deltaCalculator.getTransformerOptions();
     const dependencyEdges = this._deltaCalculator.getDependencyEdges();
 
-    // Return the source code that gets prepended to all the modules. This
-    // contains polyfills and startup code (like the require() implementation).
-    const prependSources = reset
-      ? await this._getPrepend(transformerOptions, dependencyEdges)
-      : new Map();
+    try {
+      // Return the source code that gets prepended to all the modules. This
+      // contains polyfills and startup code (like the require() implementation).
+      const prependSources = reset
+        ? await this._getPrepend(transformerOptions, dependencyEdges)
+        : new Map();
 
-    // Precalculate all module ids sequentially. We do this to be sure that the
-    // mapping between module -> moduleId is deterministic between runs.
-    const modules = Array.from(modified.values());
-    modules.forEach(module => this._getModuleId(module.path));
+      // Precalculate all module ids sequentially. We do this to be sure that the
+      // mapping between module -> moduleId is deterministic between runs.
+      const modules = Array.from(modified.values());
+      modules.forEach(module => this._getModuleId(module.path));
 
-    // Get the transformed source code of each modified/added module.
-    const modifiedDelta = await this._transformModules(
-      modules,
-      transformerOptions,
-      dependencyEdges,
-    );
+      // Get the transformed source code of each modified/added module.
+      const modifiedDelta = await this._transformModules(
+        modules,
+        transformerOptions,
+        dependencyEdges,
+      );
 
-    deleted.forEach(id => {
-      modifiedDelta.set(this._getModuleId(id), null);
-    });
+      deleted.forEach(id => {
+        modifiedDelta.set(this._getModuleId(id), null);
+      });
 
-    // Return the source code that gets appended to all the modules. This
-    // contains the require() calls to startup the execution of the modules.
-    const appendSources = reset
-      ? await this._getAppend(dependencyEdges)
-      : new Map();
+      // Return the source code that gets appended to all the modules. This
+      // contains the require() calls to startup the execution of the modules.
+      const appendSources = reset
+        ? await this._getAppend(dependencyEdges)
+        : new Map();
 
-    return {
-      pre: prependSources,
-      post: appendSources,
-      delta: modifiedDelta,
-      reset,
-    };
+      return {
+        pre: prependSources,
+        post: appendSources,
+        delta: modifiedDelta,
+        reset,
+      };
+    } catch (e) {
+      // If any unexpected error happens while creating the bundle, the client
+      // is going to lose that specific delta, while the DeltaCalulator has
+      // already processed the changes. This will make that change to be lost,
+      // which can cause the final bundle to be invalid. In order to avoid that,
+      // we just reset the delta calculator when this happens.
+      this._deltaCalculator.reset();
+
+      throw e;
+    }
   }
 
   _getDependencies = (path: string): Set<string> => {