From b2653ed36c7fe1ed064d4fef106687cfc2f018e5 Mon Sep 17 00:00:00 2001
From: Jean Lauliac <jeanlauliac@fb.com>
Date: Thu, 10 Nov 2016 09:06:58 -0800
Subject: [PATCH] packager Module.js: make transformCode function required

Reviewed By: davidaurelio

Differential Revision: D4147343

fbshipit-source-id: 4c00a5905e698a9d257a632f3b02b63587b4644a
---
 .../react-packager/src/lib/TransformCache.js    | 12 ++++++------
 .../react-packager/src/node-haste/Module.js     | 17 ++++++-----------
 .../src/node-haste/__tests__/Module-test.js     |  3 +++
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packager/react-packager/src/lib/TransformCache.js b/packager/react-packager/src/lib/TransformCache.js
index e09ed2f0aeb..93d12b86aef 100644
--- a/packager/react-packager/src/lib/TransformCache.js
+++ b/packager/react-packager/src/lib/TransformCache.js
@@ -58,8 +58,8 @@ function getCacheFilePaths(props: {
 
 type CachedResult = {
   code: string,
-  dependencies?: ?Array<string>,
-  dependencyOffsets?: ?Array<number>,
+  dependencies: Array<string>,
+  dependencyOffsets: Array<number>,
   map?: ?{},
 };
 
@@ -205,8 +205,8 @@ function readMetadataFileSync(
 ): ?{
   cachedResultHash: number,
   cachedSourceHash: number,
-  dependencies: ?Array<string>,
-  dependencyOffsets: ?Array<number>,
+  dependencies: Array<string>,
+  dependencyOffsets: Array<number>,
   sourceMap: ?{},
 } {
   const metadataStr = fs.readFileSync(metadataFilePath, 'utf8');
@@ -232,8 +232,8 @@ function readMetadataFileSync(
   if (
     typeof cachedResultHash !== 'number' ||
     typeof cachedSourceHash !== 'number' ||
-    !(dependencies == null || (Array.isArray(dependencies) && dependencies.every(dep => typeof dep === 'string'))) ||
-    !(dependencyOffsets == null || (Array.isArray(dependencyOffsets) && dependencyOffsets.every(offset => typeof offset === 'number'))) ||
+    !(Array.isArray(dependencies) && dependencies.every(dep => typeof dep === 'string')) ||
+    !(Array.isArray(dependencyOffsets) && dependencyOffsets.every(offset => typeof offset === 'number')) ||
     !(sourceMap == null || typeof sourceMap === 'object')
   ) {
     return null;
diff --git a/packager/react-packager/src/node-haste/Module.js b/packager/react-packager/src/node-haste/Module.js
index 5d7d52f8a54..d3364bf9138 100644
--- a/packager/react-packager/src/node-haste/Module.js
+++ b/packager/react-packager/src/node-haste/Module.js
@@ -27,8 +27,8 @@ import type FastFs from './fastfs';
 
 type TransformedCode = {
   code: string,
-  dependencies?: ?Array<string>,
-  dependencyOffsets?: ?Array<number>,
+  dependencies: Array<string>,
+  dependencyOffsets: Array<number>,
   map?: ?{},
 };
 
@@ -225,18 +225,13 @@ class Module {
     transformOptions: mixed,
     callback: (error: ?Error, result: ?TransformedCode) => void,
   ) {
-    const transformCode = this._transformCode;
+    const {_transformCode} = this;
     // AssetModule_DEPRECATED doesn't provide transformCode, but these should
     // never be transformed anyway.
-    invariant(transformCode != null, 'missing code transform funtion');
+    invariant(_transformCode != null, 'missing code transform funtion');
     this._readSourceCode().then(sourceCode => {
-      if (!transformCode) {
-        return callback(null, {code: sourceCode});
-      }
-      const codePromise = transformCode(this, sourceCode, transformOptions);
-      return codePromise.then(freshResult => {
-        callback(undefined, freshResult);
-      });
+      return _transformCode(this, sourceCode, transformOptions)
+        .then(freshResult => callback(undefined, freshResult));
     }, callback);
   }
 
diff --git a/packager/react-packager/src/node-haste/__tests__/Module-test.js b/packager/react-packager/src/node-haste/__tests__/Module-test.js
index ce1051f71c2..f9d382d31fd 100644
--- a/packager/react-packager/src/node-haste/__tests__/Module-test.js
+++ b/packager/react-packager/src/node-haste/__tests__/Module-test.js
@@ -69,6 +69,9 @@ describe('Module', () => {
       options: {
         cacheTransformResults: true,
       },
+      transformCode: (module, sourceCode, transformOptions) => {
+        return Promise.resolve({code: sourceCode});
+      },
       ...options,
       cache,
       fastfs,