From 4a6039c6359ba70f5cca57ceff26c06f2a0de76b Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Wed, 16 Sep 2020 11:46:47 -0700
Subject: [PATCH 001/241] Fix initial padding value for TextInput

Summary:
Changelog: [internal]

# Problem

Default padding for TextEdit is top: 26, bottom: 29, left: 10, right: 10 however the default values for LayoutMetrics.contentInsets is {0, 0, 0, 0}.

If you try to construct TextEdit with padding 0, Fabric will drop padding update because padding is already 0, 0, 0, 0.

# Fix
To fix this, I added a special case to `Binding::createUpdatePaddingMountItem`, if the mutation is insert, proceed with updating padding.

Reviewed By: JoshuaGross

Differential Revision: D23731498

fbshipit-source-id: 294ab053e562c05aadf6e743fb6bf12285d50307
---
 .../main/java/com/facebook/react/fabric/jni/Binding.cpp    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
index 9fb51e79fd7116..390166bfd7f716 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
@@ -428,11 +428,12 @@ local_ref<JMountItem::javaobject> createUpdatePaddingMountItem(
   auto newChildShadowView = mutation.newChildShadowView;
 
   if (oldChildShadowView.layoutMetrics.contentInsets ==
-      newChildShadowView.layoutMetrics.contentInsets) {
+          newChildShadowView.layoutMetrics.contentInsets &&
+      mutation.type != ShadowViewMutation::Type::Insert) {
     return nullptr;
   }
 
-  static auto updateLayoutInstruction =
+  static auto updatePaddingInstruction =
       jni::findClassStatic(Binding::UIManagerJavaDescriptor)
           ->getMethod<alias_ref<JMountItem>(jint, jint, jint, jint, jint)>(
               "updatePaddingMountItem");
@@ -446,7 +447,7 @@ local_ref<JMountItem::javaobject> createUpdatePaddingMountItem(
   int right = round(contentInsets.right * pointScaleFactor);
   int bottom = round(contentInsets.bottom * pointScaleFactor);
 
-  return updateLayoutInstruction(
+  return updatePaddingInstruction(
       javaUIManager, newChildShadowView.tag, left, top, right, bottom);
 }
 

From 047764482fcc09ae2b851f331f9db6e23b710c54 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Wed, 16 Sep 2020 23:52:42 -0700
Subject: [PATCH 002/241] Fabric: Simplifying ShadowTreeRevision implementation

Summary:
The implementation of this class is too complex for the purpose it serves. Making it simpler will make the code simpler and faster.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D23725688

fbshipit-source-id: 5e1ecddb0dd3c4c4f94786e2ba0af9b67e7426ce
---
 .../renderer/mounting/MountingCoordinator.cpp | 26 +++++++-------
 .../renderer/mounting/MountingCoordinator.h   |  2 +-
 .../renderer/mounting/ShadowTreeRevision.cpp  | 26 --------------
 .../renderer/mounting/ShadowTreeRevision.h    | 36 +++----------------
 4 files changed, 17 insertions(+), 73 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
index 7ad2b08e5e5700..1a925ed91db653 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
@@ -23,13 +23,13 @@ MountingCoordinator::MountingCoordinator(
     ShadowTreeRevision baseRevision,
     std::weak_ptr<MountingOverrideDelegate const> delegate,
     bool enableReparentingDetection)
-    : surfaceId_(baseRevision.getRootShadowNode().getSurfaceId()),
+    : surfaceId_(baseRevision.rootShadowNode->getSurfaceId()),
       baseRevision_(baseRevision),
       mountingOverrideDelegate_(delegate),
       telemetryController_(*this),
       enableReparentingDetection_(enableReparentingDetection) {
 #ifdef RN_SHADOW_TREE_INTROSPECTION
-  stubViewTree_ = stubViewTreeFromShadowNode(baseRevision_.getRootShadowNode());
+  stubViewTree_ = stubViewTreeFromShadowNode(*baseRevision_.rootShadowNode);
 #endif
 }
 
@@ -37,17 +37,15 @@ SurfaceId MountingCoordinator::getSurfaceId() const {
   return surfaceId_;
 }
 
-void MountingCoordinator::push(ShadowTreeRevision &&revision) const {
+void MountingCoordinator::push(ShadowTreeRevision const &revision) const {
   {
     std::lock_guard<std::mutex> lock(mutex_);
 
     assert(
-        !lastRevision_.has_value() ||
-        revision.getNumber() != lastRevision_->getNumber());
+        !lastRevision_.has_value() || revision.number != lastRevision_->number);
 
-    if (!lastRevision_.has_value() ||
-        lastRevision_->getNumber() < revision.getNumber()) {
-      lastRevision_ = std::move(revision);
+    if (!lastRevision_.has_value() || lastRevision_->number < revision.number) {
+      lastRevision_ = revision;
     }
   }
 
@@ -60,7 +58,7 @@ void MountingCoordinator::revoke() const {
   // 1. We need to stop retaining `ShadowNode`s to not prolong their lifetime
   // to prevent them from overliving `ComponentDescriptor`s.
   // 2. A possible call to `pullTransaction()` should return empty optional.
-  baseRevision_.rootShadowNode_.reset();
+  baseRevision_.rootShadowNode.reset();
   lastRevision_.reset();
 }
 
@@ -90,12 +88,12 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
   if (lastRevision_.has_value()) {
     number_++;
 
-    auto telemetry = lastRevision_->getTelemetry();
+    auto telemetry = lastRevision_->telemetry;
 
     telemetry.willDiff();
 
     auto mutations = calculateShadowViewMutations(
-        baseRevision_.getRootShadowNode(), lastRevision_->getRootShadowNode());
+        *baseRevision_.rootShadowNode, *lastRevision_->rootShadowNode);
 
     telemetry.didDiff();
 
@@ -145,11 +143,11 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
       auto line = std::string{};
 
       auto stubViewTree =
-          stubViewTreeFromShadowNode(baseRevision_.getRootShadowNode());
+          stubViewTreeFromShadowNode(*baseRevision_.rootShadowNode);
 
       if (stubViewTree_ != stubViewTree) {
         std::stringstream ssOldTree(
-            baseRevision_.getRootShadowNode().getDebugDescription());
+            baseRevision_.rootShadowNode->getDebugDescription());
         while (std::getline(ssOldTree, line, '\n')) {
           LOG(ERROR) << "Old tree:" << line;
         }
@@ -160,7 +158,7 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
         }
 
         std::stringstream ssNewTree(
-            lastRevision_->getRootShadowNode().getDebugDescription());
+            lastRevision_->rootShadowNode->getDebugDescription());
         while (std::getline(ssNewTree, line, '\n')) {
           LOG(ERROR) << "New tree:" << line;
         }
diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.h b/ReactCommon/react/renderer/mounting/MountingCoordinator.h
index 54bb0a3a63d4a7..4563dc7bd0aa5c 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.h
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.h
@@ -91,7 +91,7 @@ class MountingCoordinator final {
  private:
   friend class ShadowTree;
 
-  void push(ShadowTreeRevision &&revision) const;
+  void push(ShadowTreeRevision const &revision) const;
 
   /*
    * Revokes the last pushed `ShadowTreeRevision`.
diff --git a/ReactCommon/react/renderer/mounting/ShadowTreeRevision.cpp b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.cpp
index 998464886ae021..f56d03ec2023e0 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTreeRevision.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.cpp
@@ -6,29 +6,3 @@
  */
 
 #include "ShadowTreeRevision.h"
-
-namespace facebook {
-namespace react {
-
-using Number = ShadowTreeRevision::Number;
-
-ShadowTreeRevision::ShadowTreeRevision(
-    RootShadowNode::Shared const &rootShadowNode,
-    Number number,
-    TransactionTelemetry telemetry)
-    : rootShadowNode_(rootShadowNode), number_(number), telemetry_(telemetry) {}
-
-TransactionTelemetry const &ShadowTreeRevision::getTelemetry() const {
-  return telemetry_;
-}
-
-RootShadowNode const &ShadowTreeRevision::getRootShadowNode() {
-  return *rootShadowNode_;
-}
-
-Number ShadowTreeRevision::getNumber() const {
-  return number_;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h
index d2a63a00aa487e..d58dbd643288d7 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTreeRevision.h
@@ -30,40 +30,12 @@ class ShadowTreeRevision final {
    */
   using Number = int64_t;
 
-  /*
-   * Creates the object with given root shadow node, revision number and
-   * telemetry.
-   */
-  ShadowTreeRevision(
-      RootShadowNode::Shared const &rootShadowNode,
-      Number number,
-      TransactionTelemetry telemetry);
-
-  /*
-   * Returns telemetry associated with this revision.
-   */
-  TransactionTelemetry const &getTelemetry() const;
-
-  /*
-   * Methods from this section are meant to be used by
-   * `MountingOverrideDelegate` only.
-   */
- public:
-  RootShadowNode const &getRootShadowNode();
-
-  /*
-   * Methods from this section are meant to be used by `MountingCoordinator`
-   * only.
-   */
- private:
+  friend class ShadowTree;
   friend class MountingCoordinator;
 
-  Number getNumber() const;
-
- private:
-  RootShadowNode::Shared rootShadowNode_;
-  Number number_;
-  TransactionTelemetry telemetry_;
+  RootShadowNode::Shared rootShadowNode;
+  Number number;
+  TransactionTelemetry telemetry;
 };
 
 } // namespace react

From bc5a15d2c8586bea94193d67779a875f5b779578 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Wed, 16 Sep 2020 23:52:42 -0700
Subject: [PATCH 003/241] Fabric: Using ShadowTreeRevision inside ShadowTree to
 store current commited tree

Summary:
Instead of storing tree separate instance variables, we now store a single object that contains them. We will need it to be able to postpone the mounting stage (we save all info we need for mounting inside the new instance variable).

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D23725690

fbshipit-source-id: 09dd4a0912c6f5b34d805636b62f73ca12287329
---
 .../react/renderer/mounting/ShadowTree.cpp    | 49 ++++++++++---------
 .../react/renderer/mounting/ShadowTree.h      |  5 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
index 59896ad7b1e257..87e95659607e5f 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
@@ -237,17 +237,19 @@ ShadowTree::ShadowTree(
   auto family = rootComponentDescriptor.createFamily(
       ShadowNodeFamilyFragment{surfaceId, surfaceId, noopEventEmitter},
       nullptr);
-  rootShadowNode_ = std::static_pointer_cast<const RootShadowNode>(
+
+  auto rootShadowNode = std::static_pointer_cast<const RootShadowNode>(
       rootComponentDescriptor.createShadowNode(
           ShadowNodeFragment{
               /* .props = */ props,
           },
           family));
 
+  currentRevision_ = ShadowTreeRevision{
+      rootShadowNode, ShadowTreeRevision::Number{0}, TransactionTelemetry{}};
+
   mountingCoordinator_ = std::make_shared<MountingCoordinator const>(
-      ShadowTreeRevision{rootShadowNode_, 0, {}},
-      mountingOverrideDelegate,
-      enableReparentingDetection);
+      currentRevision_, mountingOverrideDelegate, enableReparentingDetection);
 }
 
 ShadowTree::~ShadowTree() {
@@ -291,15 +293,16 @@ CommitStatus ShadowTree::tryCommit(
   auto telemetry = TransactionTelemetry{};
   telemetry.willCommit();
 
-  RootShadowNode::Shared oldRootShadowNode;
+  auto oldRevision = ShadowTreeRevision{};
+  auto newRevision = ShadowTreeRevision{};
 
   {
-    // Reading `rootShadowNode_` in shared manner.
+    // Reading `currentRevision_` in shared manner.
     std::shared_lock<better::shared_mutex> lock(commitMutex_);
-    oldRootShadowNode = rootShadowNode_;
+    oldRevision = currentRevision_;
   }
 
-  RootShadowNode::Unshared newRootShadowNode = transaction(oldRootShadowNode);
+  auto newRootShadowNode = transaction(oldRevision.rootShadowNode);
 
   if (!newRootShadowNode) {
     return CommitStatus::Cancelled;
@@ -307,14 +310,14 @@ CommitStatus ShadowTree::tryCommit(
 
   if (enableStateReconciliation) {
     auto updatedNewRootShadowNode =
-        progressState(*newRootShadowNode, *oldRootShadowNode);
+        progressState(*newRootShadowNode, *oldRevision.rootShadowNode);
     if (updatedNewRootShadowNode) {
       newRootShadowNode =
           std::static_pointer_cast<RootShadowNode>(updatedNewRootShadowNode);
     }
   }
 
-  // Layout nodes
+  // Layout nodes.
   std::vector<LayoutableShadowNode const *> affectedLayoutableNodes{};
   affectedLayoutableNodes.reserve(1024);
 
@@ -327,36 +330,36 @@ CommitStatus ShadowTree::tryCommit(
   // Seal the shadow node so it can no longer be mutated
   newRootShadowNode->sealRecursive();
 
-  auto revisionNumber = ShadowTreeRevision::Number{};
-
   {
-    // Updating `rootShadowNode_` in unique manner if it hasn't changed.
+    // Updating `currentRevision_` in unique manner if it hasn't changed.
     std::unique_lock<better::shared_mutex> lock(commitMutex_);
 
-    if (rootShadowNode_ != oldRootShadowNode) {
+    if (currentRevision_.number != oldRevision.number) {
       return CommitStatus::Failed;
     }
 
-    rootShadowNode_ = newRootShadowNode;
+    auto newRevisionNumber = oldRevision.number + 1;
 
     {
       std::lock_guard<std::mutex> dispatchLock(EventEmitter::DispatchMutex());
 
       updateMountedFlag(
-          oldRootShadowNode->getChildren(), newRootShadowNode->getChildren());
+          currentRevision_.rootShadowNode->getChildren(),
+          newRootShadowNode->getChildren());
     }
 
-    revisionNumber_++;
-    revisionNumber = revisionNumber_;
+    telemetry.didCommit();
+    telemetry.setRevisionNumber(newRevisionNumber);
+
+    newRevision =
+        ShadowTreeRevision{newRootShadowNode, newRevisionNumber, telemetry};
+
+    currentRevision_ = newRevision;
   }
 
   emitLayoutEvents(affectedLayoutableNodes);
 
-  telemetry.didCommit();
-  telemetry.setRevisionNumber(revisionNumber);
-
-  mountingCoordinator_->push(
-      ShadowTreeRevision{newRootShadowNode, revisionNumber, telemetry});
+  mountingCoordinator_->push(newRevision);
 
   notifyDelegatesOfUpdates();
 
diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.h b/ReactCommon/react/renderer/mounting/ShadowTree.h
index ac984fa8fb5b18..7a02cf9d370a9b 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.h
@@ -101,10 +101,7 @@ class ShadowTree final {
   SurfaceId const surfaceId_;
   ShadowTreeDelegate const &delegate_;
   mutable better::shared_mutex commitMutex_;
-  mutable RootShadowNode::Shared
-      rootShadowNode_; // Protected by `commitMutex_`.
-  mutable ShadowTreeRevision::Number revisionNumber_{
-      0}; // Protected by `commitMutex_`.
+  mutable ShadowTreeRevision currentRevision_; // Protected by `commitMutex_`.
   MountingCoordinator::Shared mountingCoordinator_;
   bool enableReparentingDetection_{false};
 };

From 0118cbf1d1d27995e2f1b1107217b0aad8fa070f Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Wed, 16 Sep 2020 23:52:42 -0700
Subject: [PATCH 004/241] Fabric: Introducing
 `ShadowTree::getCurrentRevision()`

Summary:
Previously, to get a current root shadow node for a shadow tree, we called `tryCommit` method and stole a pointer from this. That was not a very straightforward method to get things done, and most importantly we need to do this to change the shape of the ShadowTreeCommitTransaction signature (remove a shared pointer from the callback) to make it simpler, faster and allow future improvements (see the next diff).

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross, sammy-SC

Differential Revision: D23725689

fbshipit-source-id: 51950b843a0e401828b6c6a38e5e2aaaf21ec166
---
 .../react/renderer/mounting/ShadowTree.cpp      |  5 +++++
 .../react/renderer/mounting/ShadowTree.h        |  6 ++++++
 .../mounting/tests/StateReconciliationTest.cpp  | 12 ++----------
 .../react/renderer/scheduler/Scheduler.cpp      | 17 +++++++----------
 .../react/renderer/uimanager/UIManager.cpp      | 17 ++++-------------
 5 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
index 87e95659607e5f..a8870b68a8010b 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
@@ -366,6 +366,11 @@ CommitStatus ShadowTree::tryCommit(
   return CommitStatus::Succeeded;
 }
 
+ShadowTreeRevision ShadowTree::getCurrentRevision() const {
+  std::shared_lock<better::shared_mutex> lock(commitMutex_);
+  return currentRevision_;
+}
+
 void ShadowTree::commitEmptyTree() const {
   commit(
       [](RootShadowNode::Shared const &oldRootShadowNode)
diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.h b/ReactCommon/react/renderer/mounting/ShadowTree.h
index 7a02cf9d370a9b..09e0b060a43abe 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.h
@@ -72,6 +72,12 @@ class ShadowTree final {
       ShadowTreeCommitTransaction transaction,
       bool enableStateReconciliation = false) const;
 
+  /*
+   * Returns a `ShadowTreeRevision` representing the momentary state of
+   * the `ShadowTree`.
+   */
+  ShadowTreeRevision getCurrentRevision() const;
+
   /*
    * Commit an empty tree (a new `RootShadowNode` with no children).
    */
diff --git a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
index c122047fa4f92e..04c29983e0e692 100644
--- a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
@@ -43,16 +43,8 @@ inline ShadowNode const *findDescendantNode(
 inline ShadowNode const *findDescendantNode(
     ShadowTree const &shadowTree,
     ShadowNodeFamily const &family) {
-  ShadowNode const *result = nullptr;
-
-  shadowTree.tryCommit(
-      [&](RootShadowNode::Shared const &oldRootShadowNode) {
-        result = findDescendantNode(*oldRootShadowNode, family);
-        return nullptr;
-      },
-      false);
-
-  return result;
+  return findDescendantNode(
+      *shadowTree.getCurrentRevision().rootShadowNode, family);
 }
 
 TEST(StateReconciliationTest, testStateReconciliation) {
diff --git a/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
index 37b724d0814753..516d36183f1583 100644
--- a/ReactCommon/react/renderer/scheduler/Scheduler.cpp
+++ b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -272,19 +272,16 @@ Size Scheduler::measureSurface(
     const LayoutContext &layoutContext) const {
   SystraceSection s("Scheduler::measureSurface");
 
-  Size size;
+  auto currentRootShadowNode = RootShadowNode::Shared{};
   uiManager_->getShadowTreeRegistry().visit(
       surfaceId, [&](const ShadowTree &shadowTree) {
-        shadowTree.tryCommit(
-            [&](RootShadowNode::Shared const &oldRootShadowNode) {
-              auto rootShadowNode =
-                  oldRootShadowNode->clone(layoutConstraints, layoutContext);
-              rootShadowNode->layoutIfNeeded();
-              size = rootShadowNode->getLayoutMetrics().frame.size;
-              return nullptr;
-            });
+        currentRootShadowNode = shadowTree.getCurrentRevision().rootShadowNode;
       });
-  return size;
+
+  auto rootShadowNode =
+      currentRootShadowNode->clone(layoutConstraints, layoutContext);
+  rootShadowNode->layoutIfNeeded();
+  return rootShadowNode->getLayoutMetrics().frame.size;
 }
 
 MountingCoordinator::Shared Scheduler::findMountingCoordinator(
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp
index 6c2e6253950b8f..8061c5e2f010d8 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -139,12 +139,7 @@ ShadowNode::Shared UIManager::getNewestCloneOfShadowNode(
   auto ancestorShadowNode = ShadowNode::Shared{};
   shadowTreeRegistry_.visit(
       shadowNode.getSurfaceId(), [&](ShadowTree const &shadowTree) {
-        shadowTree.tryCommit(
-            [&](RootShadowNode::Shared const &oldRootShadowNode) {
-              ancestorShadowNode = oldRootShadowNode;
-              return nullptr;
-            },
-            true);
+        ancestorShadowNode = shadowTree.getCurrentRevision().rootShadowNode;
       });
 
   if (!ancestorShadowNode) {
@@ -205,13 +200,9 @@ LayoutMetrics UIManager::getRelativeLayoutMetrics(
   if (!ancestorShadowNode) {
     shadowTreeRegistry_.visit(
         shadowNode.getSurfaceId(), [&](ShadowTree const &shadowTree) {
-          shadowTree.tryCommit(
-              [&](RootShadowNode::Shared const &oldRootShadowNode) {
-                owningAncestorShadowNode = oldRootShadowNode;
-                ancestorShadowNode = oldRootShadowNode.get();
-                return nullptr;
-              },
-              true);
+          owningAncestorShadowNode =
+              shadowTree.getCurrentRevision().rootShadowNode;
+          ancestorShadowNode = owningAncestorShadowNode.get();
         });
   } else {
     // It is possible for JavaScript (or other callers) to have a reference

From 13bc3c87efdc17d7f5a57231b23c4fbd82cfb553 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Wed, 16 Sep 2020 23:52:42 -0700
Subject: [PATCH 005/241] Fabric: Removing shared_ptr from
 ShadowTreeCommitTransaction's argument

Summary:
We don't need a shared_ptr here and without it the code will be faster and simpler.
This change is aligned with any clone-line callbacks we have in the Core which accepts a `const &` and return `shared_ptr<>`.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross, sammy-SC

Differential Revision: D23725687

fbshipit-source-id: 1cd959f4273913175d342302e2f12752f0114768
---
 .../react/renderer/mounting/ShadowTree.cpp       |  7 +++----
 ReactCommon/react/renderer/mounting/ShadowTree.h |  2 +-
 .../mounting/tests/StateReconciliationTest.cpp   |  8 ++++----
 .../react/renderer/scheduler/Scheduler.cpp       |  8 ++++----
 .../react/renderer/uimanager/UIManager.cpp       | 16 ++++++++--------
 5 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.cpp b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
index a8870b68a8010b..d7d3a8461542bd 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.cpp
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.cpp
@@ -302,7 +302,7 @@ CommitStatus ShadowTree::tryCommit(
     oldRevision = currentRevision_;
   }
 
-  auto newRootShadowNode = transaction(oldRevision.rootShadowNode);
+  auto newRootShadowNode = transaction(*oldRevision.rootShadowNode);
 
   if (!newRootShadowNode) {
     return CommitStatus::Cancelled;
@@ -373,10 +373,9 @@ ShadowTreeRevision ShadowTree::getCurrentRevision() const {
 
 void ShadowTree::commitEmptyTree() const {
   commit(
-      [](RootShadowNode::Shared const &oldRootShadowNode)
-          -> RootShadowNode::Unshared {
+      [](RootShadowNode const &oldRootShadowNode) -> RootShadowNode::Unshared {
         return std::make_shared<RootShadowNode>(
-            *oldRootShadowNode,
+            oldRootShadowNode,
             ShadowNodeFragment{
                 /* .props = */ ShadowNodeFragment::propsPlaceholder(),
                 /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
diff --git a/ReactCommon/react/renderer/mounting/ShadowTree.h b/ReactCommon/react/renderer/mounting/ShadowTree.h
index 09e0b060a43abe..1a2851d57345f4 100644
--- a/ReactCommon/react/renderer/mounting/ShadowTree.h
+++ b/ReactCommon/react/renderer/mounting/ShadowTree.h
@@ -24,7 +24,7 @@ namespace facebook {
 namespace react {
 
 using ShadowTreeCommitTransaction = std::function<RootShadowNode::Unshared(
-    RootShadowNode::Shared const &oldRootShadowNode)>;
+    RootShadowNode const &oldRootShadowNode)>;
 
 /*
  * Represents the shadow tree and its lifecycle.
diff --git a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
index 04c29983e0e692..99b86ca357b1b7 100644
--- a/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/StateReconciliationTest.cpp
@@ -99,7 +99,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
                         {}};
 
   shadowTree.commit(
-      [&](RootShadowNode::Shared const &oldRootShadowNode) {
+      [&](RootShadowNode const &oldRootShadowNode) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState1);
       },
       true);
@@ -123,7 +123,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
       findDescendantNode(*rootShadowNodeState2, family)->getState(), state2);
 
   shadowTree.commit(
-      [&](RootShadowNode::Shared const &oldRootShadowNode) {
+      [&](RootShadowNode const &oldRootShadowNode) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState2);
       },
       true);
@@ -145,7 +145,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
       findDescendantNode(*rootShadowNodeState3, family)->getState(), state3);
 
   shadowTree.commit(
-      [&](RootShadowNode::Shared const &oldRootShadowNode) {
+      [&](RootShadowNode const &oldRootShadowNode) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState3);
       },
       true);
@@ -160,7 +160,7 @@ TEST(StateReconciliationTest, testStateReconciliation) {
   // Here we commit the old tree but we expect that the state associated with
   // the node will stay the same (newer that the old tree has).
   shadowTree.commit(
-      [&](RootShadowNode::Shared const &oldRootShadowNode) {
+      [&](RootShadowNode const &oldRootShadowNode) {
         return std::static_pointer_cast<RootShadowNode>(rootShadowNodeState2);
       },
       true);
diff --git a/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
index 516d36183f1583..a2384dfb8ecce0 100644
--- a/ReactCommon/react/renderer/scheduler/Scheduler.cpp
+++ b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -220,9 +220,9 @@ void Scheduler::renderTemplateToSurface(
     uiManager_->getShadowTreeRegistry().visit(
         surfaceId, [=](const ShadowTree &shadowTree) {
           return shadowTree.tryCommit(
-              [&](RootShadowNode::Shared const &oldRootShadowNode) {
+              [&](RootShadowNode const &oldRootShadowNode) {
                 return std::make_shared<RootShadowNode>(
-                    *oldRootShadowNode,
+                    oldRootShadowNode,
                     ShadowNodeFragment{
                         /* .props = */ ShadowNodeFragment::propsPlaceholder(),
                         /* .children = */
@@ -302,8 +302,8 @@ void Scheduler::constraintSurfaceLayout(
 
   uiManager_->getShadowTreeRegistry().visit(
       surfaceId, [&](ShadowTree const &shadowTree) {
-        shadowTree.commit([&](RootShadowNode::Shared const &oldRootShadowNode) {
-          return oldRootShadowNode->clone(layoutConstraints, layoutContext);
+        shadowTree.commit([&](RootShadowNode const &oldRootShadowNode) {
+          return oldRootShadowNode.clone(layoutConstraints, layoutContext);
         });
       });
 }
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp
index 8061c5e2f010d8..8f6c4bb0aa7ca4 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -97,9 +97,9 @@ void UIManager::completeSurface(
 
   shadowTreeRegistry_.visit(surfaceId, [&](ShadowTree const &shadowTree) {
     shadowTree.commit(
-        [&](RootShadowNode::Shared const &oldRootShadowNode) {
+        [&](RootShadowNode const &oldRootShadowNode) {
           return std::make_shared<RootShadowNode>(
-              *oldRootShadowNode,
+              oldRootShadowNode,
               ShadowNodeFragment{
                   /* .props = */ ShadowNodeFragment::propsPlaceholder(),
                   /* .children = */ rootChildren,
@@ -173,9 +173,9 @@ void UIManager::setNativeProps(
   shadowTreeRegistry_.visit(
       shadowNode.getSurfaceId(), [&](ShadowTree const &shadowTree) {
         shadowTree.tryCommit(
-            [&](RootShadowNode::Shared const &oldRootShadowNode) {
+            [&](RootShadowNode const &oldRootShadowNode) {
               return std::static_pointer_cast<RootShadowNode>(
-                  oldRootShadowNode->cloneTree(
+                  oldRootShadowNode.cloneTree(
                       shadowNode.getFamily(),
                       [&](ShadowNode const &oldShadowNode) {
                         return oldShadowNode.clone({
@@ -231,10 +231,10 @@ void UIManager::updateStateWithAutorepeat(
 
   shadowTreeRegistry_.visit(
       family->getSurfaceId(), [&](ShadowTree const &shadowTree) {
-        shadowTree.commit([&](RootShadowNode::Shared const &oldRootShadowNode) {
+        shadowTree.commit([&](RootShadowNode const &oldRootShadowNode) {
           auto isValid = true;
 
-          auto rootNode = oldRootShadowNode->cloneTree(
+          auto rootNode = oldRootShadowNode.cloneTree(
               *family, [&](ShadowNode const &oldShadowNode) {
                 auto newData =
                     callback(oldShadowNode.getState()->getDataPointer());
@@ -274,10 +274,10 @@ void UIManager::updateState(StateUpdate const &stateUpdate) const {
 
   shadowTreeRegistry_.visit(
       family->getSurfaceId(), [&](ShadowTree const &shadowTree) {
-        auto status = shadowTree.tryCommit([&](RootShadowNode::Shared const
+        auto status = shadowTree.tryCommit([&](RootShadowNode const
                                                    &oldRootShadowNode) {
           return std::static_pointer_cast<RootShadowNode>(
-              oldRootShadowNode->cloneTree(
+              oldRootShadowNode.cloneTree(
                   *family, [&](ShadowNode const &oldShadowNode) {
                     auto newData =
                         callback(oldShadowNode.getState()->getDataPointer());

From 04c874bd9c6b15274fd87acf10cb3533b2eabc0d Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 17 Sep 2020 08:55:20 -0700
Subject: [PATCH 006/241] Fabric: Using `thread_local` keyword instead on own
 implementation in TransactionTelemetry

Summary:
Apparently, there is C++ keyword for this.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D23754284

fbshipit-source-id: 5f9bbcc72d9c586173624869d614f12d2319fb7b
---
 .../react/renderer/mounting/TransactionTelemetry.cpp      | 8 ++++----
 .../react/renderer/mounting/TransactionTelemetry.h        | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp b/ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp
index f1ac3f659feaa7..d81ed7c6bf44b1 100644
--- a/ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp
+++ b/ReactCommon/react/renderer/mounting/TransactionTelemetry.cpp
@@ -12,18 +12,18 @@
 namespace facebook {
 namespace react {
 
-using ThreadLocalTransactionTelemetry = ThreadStorage<TransactionTelemetry *>;
+thread_local TransactionTelemetry *threadLocalTransactionTelemetry = nullptr;
 
 TransactionTelemetry *TransactionTelemetry::threadLocalTelemetry() {
-  return ThreadLocalTransactionTelemetry::getInstance().get().value_or(nullptr);
+  return threadLocalTransactionTelemetry;
 }
 
 void TransactionTelemetry::setAsThreadLocal() {
-  ThreadLocalTransactionTelemetry::getInstance().set(this);
+  threadLocalTransactionTelemetry = this;
 }
 
 void TransactionTelemetry::unsetAsThreadLocal() {
-  ThreadLocalTransactionTelemetry::getInstance().set(nullptr);
+  threadLocalTransactionTelemetry = nullptr;
 }
 
 void TransactionTelemetry::willCommit() {
diff --git a/ReactCommon/react/renderer/mounting/TransactionTelemetry.h b/ReactCommon/react/renderer/mounting/TransactionTelemetry.h
index b71e10bae33e78..88ef2a23b0e3c4 100644
--- a/ReactCommon/react/renderer/mounting/TransactionTelemetry.h
+++ b/ReactCommon/react/renderer/mounting/TransactionTelemetry.h
@@ -11,7 +11,6 @@
 #include <cstdint>
 
 #include <react/utils/Telemetry.h>
-#include <react/utils/ThreadStorage.h>
 
 namespace facebook {
 namespace react {

From 18ffe12203d03b4e960d61d7bb50cd02bba94663 Mon Sep 17 00:00:00 2001
From: Jason Safaiyeh <safaiyeh@protonmail.com>
Date: Thu, 17 Sep 2020 09:25:56 -0700
Subject: [PATCH 007/241] Add an explicit NDK version to Android template
 (#29403)

Summary:
Added an explicit NDK version to the Android template. This allows tooling to detect which NDK version to install automatically.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Android] [Added] - Add an explicit NDK version to Android template

Pull Request resolved: https://github.com/facebook/react-native/pull/29403

Test Plan: Template builds as it should. NDK version gets installed with initial Android set up.

Reviewed By: passy

Differential Revision: D23752007

Pulled By: fkgozali

fbshipit-source-id: 31c33f275f94a4a62338a61e79b31c4b996969bf
---
 template/android/app/build.gradle | 2 ++
 template/android/build.gradle     | 1 +
 2 files changed, 3 insertions(+)

diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
index 1215ed78d324f2..a5a0ea4e8bc90c 100644
--- a/template/android/app/build.gradle
+++ b/template/android/app/build.gradle
@@ -121,6 +121,8 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 def enableHermes = project.ext.react.get("enableHermes", false);
 
 android {
+    ndkVersion rootProject.ext.ndkVersion
+
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
diff --git a/template/android/build.gradle b/template/android/build.gradle
index 86351cce876abf..2bafa1f491c53c 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -6,6 +6,7 @@ buildscript {
         minSdkVersion = 19
         compileSdkVersion = 29
         targetSdkVersion = 29
+        ndkVersion = "20.1.5948944"
     }
     repositories {
         google()

From f2ca6f568e1caa2050032089c8378b4f3e2bc074 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 17 Sep 2020 11:09:42 -0700
Subject: [PATCH 008/241] Fabric: Removing
 `RCTCGColorRefUnretainedFromSharedColor()`

Summary:
This diff removes `RCTCGColorRefUnretainedFromSharedColor` function because it's not compatible with future changes we plan to make.
Converting SharedColor to unretained CGColorRef is actually quite dangerous because... it's an unowned pointer.

Reviewed By: JoshuaGross

Differential Revision: D23753509

fbshipit-source-id: df030ade69b63cbb872d6bdbde51575eedc6a4a6
---
 .../View/RCTViewComponentView.mm              | 32 +++++++++++++------
 React/Fabric/RCTConversions.h                 |  9 ++----
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 35b7858f01e177..5e3b33d9a00ba5 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -7,10 +7,12 @@
 
 #import "RCTViewComponentView.h"
 
+#import <CoreGraphics/CoreGraphics.h>
+#import <objc/runtime.h>
+
 #import <React/RCTAssert.h>
 #import <React/RCTBorderDrawing.h>
 #import <React/RCTConversions.h>
-#import <objc/runtime.h>
 #import <react/renderer/components/view/ViewComponentDescriptor.h>
 #import <react/renderer/components/view/ViewEventEmitter.h>
 #import <react/renderer/components/view/ViewProps.h>
@@ -118,7 +120,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
   // `shadowColor`
   if (oldViewProps.shadowColor != newViewProps.shadowColor) {
-    CGColorRef shadowColor = RCTCGColorRefFromSharedColor(newViewProps.shadowColor);
+    CGColorRef shadowColor = RCTCreateCGColorRefFromSharedColor(newViewProps.shadowColor);
     self.layer.shadowColor = shadowColor;
     CGColorRelease(shadowColor);
     needsInvalidateLayer = YES;
@@ -344,12 +346,20 @@ static RCTCornerRadii RCTCornerRadiiFromBorderRadii(BorderRadii borderRadii)
                         .bottomRight = (CGFloat)borderRadii.bottomRight};
 }
 
-static RCTBorderColors RCTBorderColorsFromBorderColors(BorderColors borderColors)
+static RCTBorderColors RCTCreateRCTBorderColorsFromBorderColors(BorderColors borderColors)
+{
+  return RCTBorderColors{.top = RCTCreateCGColorRefFromSharedColor(borderColors.top),
+                         .left = RCTCreateCGColorRefFromSharedColor(borderColors.left),
+                         .bottom = RCTCreateCGColorRefFromSharedColor(borderColors.bottom),
+                         .right = RCTCreateCGColorRefFromSharedColor(borderColors.right)};
+}
+
+static void RCTReleaseRCTBorderColors(RCTBorderColors borderColors)
 {
-  return RCTBorderColors{.top = RCTCGColorRefUnretainedFromSharedColor(borderColors.top),
-                         .left = RCTCGColorRefUnretainedFromSharedColor(borderColors.left),
-                         .bottom = RCTCGColorRefUnretainedFromSharedColor(borderColors.bottom),
-                         .right = RCTCGColorRefUnretainedFromSharedColor(borderColors.right)};
+  CGColorRelease(borderColors.top);
+  CGColorRelease(borderColors.left);
+  CGColorRelease(borderColors.bottom);
+  CGColorRelease(borderColors.right);
 }
 
 static RCTBorderStyle RCTBorderStyleFromBorderStyle(BorderStyle borderStyle)
@@ -412,7 +422,7 @@ - (void)invalidateLayer
     }
 
     layer.borderWidth = (CGFloat)borderMetrics.borderWidths.left;
-    CGColorRef borderColor = RCTCGColorRefFromSharedColor(borderMetrics.borderColors.left);
+    CGColorRef borderColor = RCTCreateCGColorRefFromSharedColor(borderMetrics.borderColors.left);
     layer.borderColor = borderColor;
     CGColorRelease(borderColor);
     layer.cornerRadius = (CGFloat)borderMetrics.borderRadii.topLeft;
@@ -431,15 +441,19 @@ - (void)invalidateLayer
     layer.borderColor = nil;
     layer.cornerRadius = 0;
 
+    RCTBorderColors borderColors = RCTCreateRCTBorderColorsFromBorderColors(borderMetrics.borderColors);
+
     UIImage *image = RCTGetBorderImage(
         RCTBorderStyleFromBorderStyle(borderMetrics.borderStyles.left),
         layer.bounds.size,
         RCTCornerRadiiFromBorderRadii(borderMetrics.borderRadii),
         RCTUIEdgeInsetsFromEdgeInsets(borderMetrics.borderWidths),
-        RCTBorderColorsFromBorderColors(borderMetrics.borderColors),
+        borderColors,
         _backgroundColor.CGColor,
         self.clipsToBounds);
 
+    RCTReleaseRCTBorderColors(borderColors);
+
     if (image == nil) {
       _borderLayer.contents = nil;
     } else {
diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
index f1dc7ee2910f17..5caafef9567210 100644
--- a/React/Fabric/RCTConversions.h
+++ b/React/Fabric/RCTConversions.h
@@ -40,13 +40,8 @@ inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::Share
   return sharedColor ? [UIColor colorWithCGColor:sharedColor.get()] : nil;
 }
 
-inline CF_RETURNS_NOT_RETAINED CGColorRef
-RCTCGColorRefUnretainedFromSharedColor(const facebook::react::SharedColor &sharedColor)
-{
-  return sharedColor ? sharedColor.get() : nil;
-}
-
-inline CF_RETURNS_RETAINED CGColorRef RCTCGColorRefFromSharedColor(const facebook::react::SharedColor &sharedColor)
+inline CF_RETURNS_RETAINED CGColorRef
+RCTCreateCGColorRefFromSharedColor(const facebook::react::SharedColor &sharedColor)
 {
   return sharedColor ? CGColorCreateCopy(sharedColor.get()) : nil;
 }

From d3bb76b8b6ab93755822d0d5c4235a2f0048478e Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 17 Sep 2020 11:09:42 -0700
Subject: [PATCH 009/241] Fabric: Using RCTUIColorFromSharedColor everywhere

Summary:
Even though we have wonderful helper functions converting SharedColor to UIColor and CGColorRef, in many places we still use some hardcoded things. This diff fixes that; it will be important for the next diff.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross

Differential Revision: D23753508

fbshipit-source-id: 09d280b132266252753526c2735ab3e41b96c8d5
---
 .../RCTActivityIndicatorViewComponentView.mm              | 8 +++++---
 .../ComponentViews/Image/RCTImageComponentView.mm         | 2 +-
 .../ComponentViews/Slider/RCTSliderComponentView.mm       | 8 +++++---
 .../ComponentViews/Switch/RCTSwitchComponentView.mm       | 8 +++++---
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
index dd79102526d9e5..7b5a56999ed8be 100644
--- a/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ActivityIndicator/RCTActivityIndicatorViewComponentView.mm
@@ -7,6 +7,8 @@
 
 #import "RCTActivityIndicatorViewComponentView.h"
 
+#import <React/RCTConversions.h>
+
 #import <react/renderer/components/rncore/ComponentDescriptors.h>
 #import <react/renderer/components/rncore/EventEmitters.h>
 #import <react/renderer/components/rncore/Props.h>
@@ -50,7 +52,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     } else {
       [_activityIndicatorView stopAnimating];
     }
-    _activityIndicatorView.color = [UIColor colorWithCGColor:defaultProps->color.get()];
+    _activityIndicatorView.color = RCTUIColorFromSharedColor(defaultProps->color);
     _activityIndicatorView.hidesWhenStopped = defaultProps->hidesWhenStopped;
     _activityIndicatorView.activityIndicatorViewStyle = convertActivityIndicatorViewStyle(defaultProps->size);
 
@@ -73,8 +75,8 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     }
   }
 
-  if (oldViewProps.color.get() != newViewProps.color.get()) {
-    _activityIndicatorView.color = [UIColor colorWithCGColor:newViewProps.color.get()];
+  if (oldViewProps.color != newViewProps.color) {
+    _activityIndicatorView.color = RCTUIColorFromSharedColor(newViewProps.color);
   }
 
   // TODO: This prop should be deprecated.
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index a80c9914ea75ad..ce8e55c0229fb6 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -74,7 +74,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
   // `tintColor`
   if (oldImageProps.tintColor != newImageProps.tintColor) {
-    _imageView.tintColor = [UIColor colorWithCGColor:newImageProps.tintColor.get()];
+    _imageView.tintColor = RCTUIColorFromSharedColor(newImageProps.tintColor);
   }
 
   [super updateProps:props oldProps:oldProps];
diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
index e28a7eb5da9f3b..abc29605cf4582 100644
--- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
@@ -7,8 +7,10 @@
 
 #import "RCTSliderComponentView.h"
 
+#import <React/RCTConversions.h>
 #import <React/RCTImageResponseDelegate.h>
 #import <React/RCTImageResponseObserverProxy.h>
+
 #import <react/renderer/components/rncore/EventEmitters.h>
 #import <react/renderer/components/rncore/Props.h>
 #import <react/renderer/components/slider/SliderComponentDescriptor.h>
@@ -131,17 +133,17 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
   // `thumbTintColor`
   if (oldSliderProps.thumbTintColor != newSliderProps.thumbTintColor) {
-    _sliderView.thumbTintColor = [UIColor colorWithCGColor:newSliderProps.thumbTintColor.get()];
+    _sliderView.thumbTintColor = RCTUIColorFromSharedColor(newSliderProps.thumbTintColor);
   }
 
   // `minimumTrackTintColor`
   if (oldSliderProps.minimumTrackTintColor != newSliderProps.minimumTrackTintColor) {
-    _sliderView.minimumTrackTintColor = [UIColor colorWithCGColor:newSliderProps.minimumTrackTintColor.get()];
+    _sliderView.minimumTrackTintColor = RCTUIColorFromSharedColor(newSliderProps.minimumTrackTintColor);
   }
 
   // `maximumTrackTintColor`
   if (oldSliderProps.maximumTrackTintColor != newSliderProps.maximumTrackTintColor) {
-    _sliderView.maximumTrackTintColor = [UIColor colorWithCGColor:newSliderProps.maximumTrackTintColor.get()];
+    _sliderView.maximumTrackTintColor = RCTUIColorFromSharedColor(newSliderProps.maximumTrackTintColor);
   }
 
   [super updateProps:props oldProps:oldProps];
diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
index 2538f040476c78..5c89f7cbc0bab0 100644
--- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
@@ -7,6 +7,8 @@
 
 #import "RCTSwitchComponentView.h"
 
+#import <React/RCTConversions.h>
+
 #import <react/renderer/components/rncore/ComponentDescriptors.h>
 #import <react/renderer/components/rncore/EventEmitters.h>
 #import <react/renderer/components/rncore/Props.h>
@@ -75,17 +77,17 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
   // `tintColor`
   if (oldSwitchProps.tintColor != newSwitchProps.tintColor) {
-    _switchView.tintColor = [UIColor colorWithCGColor:newSwitchProps.tintColor.get()];
+    _switchView.tintColor = RCTUIColorFromSharedColor(newSwitchProps.tintColor);
   }
 
   // `onTintColor
   if (oldSwitchProps.onTintColor != newSwitchProps.onTintColor) {
-    _switchView.onTintColor = [UIColor colorWithCGColor:newSwitchProps.onTintColor.get()];
+    _switchView.onTintColor = RCTUIColorFromSharedColor(newSwitchProps.onTintColor);
   }
 
   // `thumbTintColor`
   if (oldSwitchProps.thumbTintColor != newSwitchProps.thumbTintColor) {
-    _switchView.thumbTintColor = [UIColor colorWithCGColor:newSwitchProps.thumbTintColor.get()];
+    _switchView.thumbTintColor = RCTUIColorFromSharedColor(newSwitchProps.thumbTintColor);
   }
 
   [super updateProps:props oldProps:oldProps];

From 241795cbc4741d2de41d31f1281f38ce4b00f811 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 17 Sep 2020 11:09:42 -0700
Subject: [PATCH 010/241] Fabric: Color conversion functions now do not depend
 on internal implementations of SharedColor

Summary:
This diff changes the implementation of `RCTCreateCGColorRefFromSharedColor` and `RCTUIColorFromSharedColor` in such a way that they don't rely on the fact that SharedColor is actually a `shared_ptr<CGColorRef>`. Instead, the methods just extract color components from SharedColor and create UIColor and CGColorRef objects on demand.
This allows us to change the implementation of SharedColor without worrying much about the rest of the system, which will do in the next diff.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross

Differential Revision: D23753510

fbshipit-source-id: 340127527888776ebd5d241ed60c7e5220564013
---
 React/Fabric/RCTConversions.h                            | 9 +++++++--
 .../platform/ios/RCTTextPrimitivesConversions.h          | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
index 5caafef9567210..73e6127bae6774 100644
--- a/React/Fabric/RCTConversions.h
+++ b/React/Fabric/RCTConversions.h
@@ -37,13 +37,18 @@ inline std::string RCTStringFromNSString(NSString *string)
 
 inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor)
 {
-  return sharedColor ? [UIColor colorWithCGColor:sharedColor.get()] : nil;
+  if (!sharedColor) {
+    return nil;
+  }
+
+  auto components = facebook::react::colorComponentsFromColor(sharedColor);
+  return [UIColor colorWithRed:components.red green:components.green blue:components.blue alpha:components.alpha];
 }
 
 inline CF_RETURNS_RETAINED CGColorRef
 RCTCreateCGColorRefFromSharedColor(const facebook::react::SharedColor &sharedColor)
 {
-  return sharedColor ? CGColorCreateCopy(sharedColor.get()) : nil;
+  return CGColorRetain(RCTUIColorFromSharedColor(sharedColor).CGColor);
 }
 
 inline CGPoint RCTCGPointFromPoint(const facebook::react::Point &point)
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
index fdfb6e2ce61c68..b5bbbdb1572d96 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
@@ -96,7 +96,12 @@ inline static NSUnderlineStyle RCTNSUnderlineStyleFromStyleAndPattern(
   return style;
 }
 
-inline static UIColor *RCTUIColorFromSharedColor(const SharedColor &color)
+inline static UIColor *RCTUIColorFromSharedColor(const SharedColor &sharedColor)
 {
-  return color ? [UIColor colorWithCGColor:color.get()] : nil;
+  if (!sharedColor) {
+    return nil;
+  }
+
+  auto components = colorComponentsFromColor(sharedColor);
+  return [UIColor colorWithRed:components.red green:components.green blue:components.blue alpha:components.alpha];
 }

From e4877ed9859f6d556d8ec1ce288a3ebaaab12ff2 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 17 Sep 2020 11:09:42 -0700
Subject: [PATCH 011/241] Fabric: Using `optional<int>` instead of `CGColorRef`
 on iOS

Summary:
Finally, this diff changes the internal implementation of SharedColor to be `optional<int>`.

Initially, when we started working on the new renderer, it seemed like a good idea to allocated CGColor objects ahead of time and store them with Props. Now, this idea does not look so good, especially because:
* Having `SharedColor` as a `shared_ptr` is a quite big perf overhead for copying this thing. And the size of the object is not small.
* Having `SharedColor` as a `shared_ptr` creates huge interconnectedness among pieces of the core and rendering. E.g. improper releasing a pointer in some component view can cause a crash somewhere in the core (because both places might use the same shared `blackColor`.

On Android, we already use simple `int` as a representation of a color, and this works great. And this diff implements something very similar to Android, but a bit differently: here we use `optional<int>` instead of custom class with a single `int` field and some magic value that represents "empty value".

This approach should fix T75836417 because now we don't have allocation and deallocation when we simply assign color values.

If this solution works fine on iOS, I will do unify all implementations among all platforms.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross

Differential Revision: D23753507

fbshipit-source-id: 42fd6cee6bf7b39c92c88536da06ba9e8cf4d4db
---
 ReactCommon/react/renderer/graphics/BUCK      |  2 ++
 .../renderer/graphics/platform/ios/Color.cpp  | 33 ++++++++-----------
 .../renderer/graphics/platform/ios/Color.h    |  8 ++---
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/ReactCommon/react/renderer/graphics/BUCK b/ReactCommon/react/renderer/graphics/BUCK
index 9b7fd05c2d0b46..87064ce89c0436 100644
--- a/ReactCommon/react/renderer/graphics/BUCK
+++ b/ReactCommon/react/renderer/graphics/BUCK
@@ -7,6 +7,7 @@ load(
     "fb_xplat_cxx_test",
     "get_apple_compiler_flags",
     "get_apple_inspector_flags",
+    "react_native_xplat_target",
     "rn_xplat_cxx_library",
     "subdir_glob",
 )
@@ -95,6 +96,7 @@ rn_xplat_cxx_library(
     tests = [":tests"],
     visibility = ["PUBLIC"],
     deps = [
+        react_native_xplat_target("better:better"),
         "//third-party/glog:glog",
         "//xplat/fbsystrace:fbsystrace",
         "//xplat/folly:headers_only",
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp b/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
index 8cbdeee7fdc60b..0b114759cb1aa0 100644
--- a/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
+++ b/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
@@ -12,28 +12,21 @@ namespace facebook {
 namespace react {
 
 SharedColor colorFromComponents(ColorComponents components) {
-  const CGFloat componentsArray[] = {
-      components.red, components.green, components.blue, components.alpha};
-
-  auto color = CGColorCreate(CGColorSpaceCreateDeviceRGB(), componentsArray);
-
-  return SharedColor(color, CGColorRelease);
+  float ratio = 255.9999;
+  return SharedColor(
+      ((int)(components.alpha * ratio) & 0xff) << 24 |
+      ((int)(components.red * ratio) & 0xff) << 16 |
+      ((int)(components.green * ratio) & 0xff) << 8 |
+      ((int)(components.blue * ratio) & 0xff));
 }
 
-ColorComponents colorComponentsFromColor(SharedColor color) {
-  if (!color) {
-    // Empty color object can be considered as `clear` (black, fully
-    // transparent) color.
-    return ColorComponents{0, 0, 0, 0};
-  }
-
-  auto numberOfComponents __unused = CGColorGetNumberOfComponents(color.get());
-  assert(numberOfComponents == 4);
-  const CGFloat *components = CGColorGetComponents(color.get());
-  return ColorComponents{(float)components[0],
-                         (float)components[1],
-                         (float)components[2],
-                         (float)components[3]};
+ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
+  float ratio = 256;
+  Color color = *sharedColor;
+  return ColorComponents{(float)((color >> 16) & 0xff) / ratio,
+                         (float)((color >> 8) & 0xff) / ratio,
+                         (float)((color >> 0) & 0xff) / ratio,
+                         (float)((color >> 24) & 0xff) / ratio};
 }
 
 SharedColor clearColor() {
diff --git a/ReactCommon/react/renderer/graphics/platform/ios/Color.h b/ReactCommon/react/renderer/graphics/platform/ios/Color.h
index abaf98f4245e56..0b8ab406b40f50 100644
--- a/ReactCommon/react/renderer/graphics/platform/ios/Color.h
+++ b/ReactCommon/react/renderer/graphics/platform/ios/Color.h
@@ -7,17 +7,17 @@
 
 #pragma once
 
-#include <memory>
+#include <better/optional.h>
 
-#include <CoreGraphics/CoreGraphics.h>
 #include <react/renderer/graphics/ColorComponents.h>
 #include <react/renderer/graphics/Float.h>
 
 namespace facebook {
 namespace react {
 
-using Color = CGColor;
-using SharedColor = std::shared_ptr<Color>;
+using Color = int32_t;
+
+using SharedColor = better::optional<Color>;
 
 SharedColor colorFromComponents(ColorComponents components);
 ColorComponents colorComponentsFromColor(SharedColor color);

From 5b93c49e76498cfe1ecaf8a95abcb044946ce197 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 17 Sep 2020 11:09:42 -0700
Subject: [PATCH 012/241] Fabric: Using pre-cached UIColor objects for black,
 white, and clear colors

Summary:
This change maps the three most used colors (black, white, clear) to corresponding predefined values in UIColor. This should meaningfully reduce the overall amount of allocated UIColor/CGColor objects. In my non-scientific measures, it reduces the number of CGColor objects from ~1500 to ~1000. And... it no much at least in terms of kilobytes. However, I still think it's a good idea to implement this because I hope that can remove some work from memory allocation infra and maybe enable some optimizations that UIKit hopefully does for black and white colors. (I tend to believe that this optimization exists because UIKit even has a classes called UIDeviceWhiteColor and UICachedDeviceWhiteColor.)

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross

Differential Revision: D23753506

fbshipit-source-id: 46e58dc7e6b0dcab3c83d29c7257c90ffbd95246
---
 React/Fabric/RCTConversions.h                      | 14 +++++++++++++-
 .../platform/ios/RCTTextPrimitivesConversions.h    | 14 +++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/React/Fabric/RCTConversions.h b/React/Fabric/RCTConversions.h
index 73e6127bae6774..222e9ba85005b2 100644
--- a/React/Fabric/RCTConversions.h
+++ b/React/Fabric/RCTConversions.h
@@ -35,12 +35,24 @@ inline std::string RCTStringFromNSString(NSString *string)
   return std::string{string.UTF8String ?: ""};
 }
 
-inline UIColor *_Nullable RCTUIColorFromSharedColor(const facebook::react::SharedColor &sharedColor)
+inline UIColor *_Nullable RCTUIColorFromSharedColor(facebook::react::SharedColor const &sharedColor)
 {
   if (!sharedColor) {
     return nil;
   }
 
+  if (*facebook::react::clearColor() == *sharedColor) {
+    return [UIColor clearColor];
+  }
+
+  if (*facebook::react::blackColor() == *sharedColor) {
+    return [UIColor blackColor];
+  }
+
+  if (*facebook::react::whiteColor() == *sharedColor) {
+    return [UIColor whiteColor];
+  }
+
   auto components = facebook::react::colorComponentsFromColor(sharedColor);
   return [UIColor colorWithRed:components.red green:components.green blue:components.blue alpha:components.alpha];
 }
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
index b5bbbdb1572d96..c78daec7b7a3d5 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/ios/RCTTextPrimitivesConversions.h
@@ -102,6 +102,18 @@ inline static UIColor *RCTUIColorFromSharedColor(const SharedColor &sharedColor)
     return nil;
   }
 
-  auto components = colorComponentsFromColor(sharedColor);
+  if (*facebook::react::clearColor() == *sharedColor) {
+    return [UIColor clearColor];
+  }
+
+  if (*facebook::react::blackColor() == *sharedColor) {
+    return [UIColor blackColor];
+  }
+
+  if (*facebook::react::whiteColor() == *sharedColor) {
+    return [UIColor whiteColor];
+  }
+
+  auto components = facebook::react::colorComponentsFromColor(sharedColor);
   return [UIColor colorWithRed:components.red green:components.green blue:components.blue alpha:components.alpha];
 }

From e7dbd845e6682a2e46114039ef6e1886482d9ecd Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 17 Sep 2020 11:20:38 -0700
Subject: [PATCH 013/241] Coalesce touchMove events

Summary:
Changelog: [Internal]

To align more closely with Paper, Fabric should coalesce touchMove events.

on iOS it happens:
https://www.internalfb.com/intern/diffusion/FBS/browsefile/master/xplat/js/react-native-github/React/Base/RCTTouchEvent.m?lines=43

Reviewed By: JoshuaGross

Differential Revision: D23734212

fbshipit-source-id: a9d324a6481884905d7be6637fcafe4e71f2bd9f
---
 .../react/renderer/components/view/TouchEventEmitter.cpp      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp b/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
index 4b582c6ba47bb3..738dec8d6467c7 100644
--- a/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/view/TouchEventEmitter.cpp
@@ -68,7 +68,9 @@ void TouchEventEmitter::onTouchStart(TouchEvent const &event) const {
 }
 
 void TouchEventEmitter::onTouchMove(TouchEvent const &event) const {
-  dispatchTouchEvent("touchMove", event, EventPriority::AsynchronousBatched);
+  dispatchUniqueEvent("touchMove", [event](jsi::Runtime &runtime) {
+    return touchEventPayload(runtime, event);
+  });
 }
 
 void TouchEventEmitter::onTouchEnd(TouchEvent const &event) const {

From 012ac09fa17e5b437c68a46200333e203895b9b1 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 17 Sep 2020 12:25:46 -0700
Subject: [PATCH 014/241] Fix LayoutAnimations assertion on
 `adjustDelayedMutationIndicesForMutation`

Summary:
`adjustDelayedMutationIndicesForMutation` asserts that the mutation is either Remove or Insert. At one callsite, we weren't checking the mutation type before calling `adjustDelayedMutationIndicesForMutation`.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23746617

fbshipit-source-id: 6046fec2eb4821094937b1b16f40347bbc55c20e
---
 .../renderer/animations/LayoutAnimationKeyFrameManager.cpp   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
index 66bcab91d50292..a6f552186fefbc 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -1253,7 +1253,10 @@ LayoutAnimationKeyFrameManager::pullTransaction(
           << "Adjust delayed mutations based on finalConflictingMutations";
 #endif
       for (auto &mutation : finalConflictingMutations) {
-        adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
+        if (mutation.type == ShadowViewMutation::Remove ||
+            mutation.type == ShadowViewMutation::Insert) {
+          adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
+        }
       }
 
       // Adjust keyframes based on already-delayed, existing animations, before

From ad400f3cf6ea59010dbbd6fd864364b2a9fb3e68 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 17 Sep 2020 12:25:46 -0700
Subject: [PATCH 015/241] Fix MountingCoordinator override mode

Summary:
In MountingCoordinator override mode (used in LayoutAnimations) we must set the start and end `diff` time when no real diff happens, otherwise we will hit an assert in telemetry later.

I also ensure that the TransactionNumber is incremented in that case.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23746684

fbshipit-source-id: b1fe3864e453fdba89d43cc827bd37434abf7a4d
---
 ReactCommon/react/renderer/mounting/MountingCoordinator.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
index 1a925ed91db653..e457f011514552 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
@@ -117,10 +117,13 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
       mutations = transaction->getMutations();
       telemetry = transaction->getTelemetry();
     } else {
+      number_++;
       telemetry.willLayout();
       telemetry.didLayout();
       telemetry.willCommit();
       telemetry.didCommit();
+      telemetry.willDiff();
+      telemetry.didDiff();
     }
 
     transaction = mountingOverrideDelegate->pullTransaction(

From b64a6618d679c3a2922d3d68983352b387c87fff Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 17 Sep 2020 12:25:46 -0700
Subject: [PATCH 016/241] Fix MountingCoordinator RN_SHADOW_TREE_INTROSPECTION
 + LayoutAnimations

Summary:
Currently, MountingCoordinator's RN_SHADOW_TREE_INTROSPECTION code will crash often because it assumes there is always a "new" tree to compare the old tree to. In the LayoutAnimations context this is not always the case - in fact, the majority of the time, LayoutAnimations is producing mutations for animation without a "new" tree.

Just check that the tree exists before trying to print it.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23747289

fbshipit-source-id: a1ba22aeae32ed8915a53bc33cdc199e8ce5128a
---
 .../renderer/mounting/MountingCoordinator.cpp | 23 ++++++++++---------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
index e457f011514552..d98ed0a4a740d9 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
@@ -97,9 +97,6 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
 
     telemetry.didDiff();
 
-    baseRevision_ = std::move(*lastRevision_);
-    lastRevision_.reset();
-
     transaction = MountingTransaction{
         surfaceId_, number_, std::move(mutations), telemetry};
   }
@@ -142,13 +139,15 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
     // If the transaction was overridden, we don't have a model of the shadow
     // tree therefore we cannot validate the validity of the mutation
     // instructions.
-    if (!shouldOverridePullTransaction) {
-      auto line = std::string{};
-
+    if (!shouldOverridePullTransaction && lastRevision_.has_value()) {
       auto stubViewTree =
-          stubViewTreeFromShadowNode(*baseRevision_.rootShadowNode);
+          stubViewTreeFromShadowNode(*lastRevision_->rootShadowNode);
+
+      bool treesEqual = stubViewTree_ == stubViewTree;
 
-      if (stubViewTree_ != stubViewTree) {
+      if (!treesEqual) {
+        // Display debug info
+        auto line = std::string{};
         std::stringstream ssOldTree(
             baseRevision_.rootShadowNode->getDebugDescription());
         while (std::getline(ssOldTree, line, '\n')) {
@@ -167,13 +166,15 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
         }
       }
 
-      assert(
-          (stubViewTree_ == stubViewTree) &&
-          "Incorrect set of mutations detected.");
+      assert((treesEqual) && "Incorrect set of mutations detected.");
     }
   }
 #endif
 
+  if (lastRevision_.has_value()) {
+    baseRevision_ = std::move(*lastRevision_);
+    lastRevision_.reset();
+  }
   return transaction;
 }
 

From 3585bb422f97390e59e728f2d0a5cd936e4beb16 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 17 Sep 2020 12:25:46 -0700
Subject: [PATCH 017/241] Fix compilation for LayoutAnimations debug mode

Summary:
iOS needs this function to be marked as static.

Changelog: [internal]

Reviewed By: shergin

Differential Revision: D23749613

fbshipit-source-id: a8c160646853450fc7d849448bdbb45e02beb964
---
 .../renderer/animations/LayoutAnimationKeyFrameManager.cpp     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
index a6f552186fefbc..7599e85de2d62e 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -30,7 +30,8 @@ namespace facebook {
 namespace react {
 
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-std::string GetMutationInstructionString(ShadowViewMutation const &mutation) {
+static std::string GetMutationInstructionString(
+    ShadowViewMutation const &mutation) {
   bool mutationIsRemove = mutation.type == ShadowViewMutation::Type::Remove;
   bool mutationIsInsert = mutation.type == ShadowViewMutation::Type::Insert;
   bool mutationIsDelete = mutation.type == ShadowViewMutation::Type::Delete;

From 0599742db83bce1ae14e7e924af1b345ca3ef62c Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 17 Sep 2020 12:25:46 -0700
Subject: [PATCH 018/241] LayoutAnimations: at the end of every animation,
 issue an update mutation

Summary:
LayoutAnimations: at the end of every animation, issue an update mutation - this is so that the props data on the Mounting layer/StubViewTree layer is pointer-identical to the props data on the ShadowTree.

This unblocks iOS debug mode crashes.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23753606

fbshipit-source-id: 407e0c2746a65e6d3ee29c1cce891cd7c1013593
---
 .../animations/LayoutAnimationDriver.cpp        | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
index 583176fefac4dd..c9f5b13ab0c200 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
@@ -191,8 +191,10 @@ void LayoutAnimationDriver::animationMutationsForFrame(
 
       // Queue up "final" mutations for all keyframes in the completed animation
       for (auto const &keyframe : animation.keyFrames) {
-        if (!keyframe.invalidated &&
-            keyframe.finalMutationForKeyFrame.hasValue()) {
+        if (keyframe.invalidated) {
+          continue;
+        }
+        if (keyframe.finalMutationForKeyFrame.hasValue()) {
           auto const &finalMutationForKeyFrame =
               *keyframe.finalMutationForKeyFrame;
           PrintMutationInstruction(
@@ -207,6 +209,17 @@ void LayoutAnimationDriver::animationMutationsForFrame(
                                  finalMutationForKeyFrame.oldChildShadowView,
                                  finalMutationForKeyFrame.newChildShadowView,
                                  finalMutationForKeyFrame.index});
+        } else {
+          // Issue a final UPDATE so that the final props object sent to the
+          // mounting layer is the same as the one on the ShadowTree. This is
+          // mostly to make the MountingCoordinator StubViewTree assertions
+          // pass.
+          mutationsList.push_back(
+              ShadowViewMutation{ShadowViewMutation::Type::Update,
+                                 keyframe.parentView,
+                                 keyframe.viewStart,
+                                 keyframe.viewEnd,
+                                 -1});
         }
       }
 

From ee38751975babd8db5d21d1c0940966adccce5fe Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 17 Sep 2020 13:17:48 -0700
Subject: [PATCH 019/241] Layout Events: throttle layout events sent to same
 node repeatedly

Summary:
Under Fabric only, we can enter an infinite layout loop where the emitted layout event oscillates between two height values that are off by a very small amount.

The cause is, in part, components that use layoutEvents to determine their dimensions: for example, using onLayout event "height" parameters to determine the height of a child. If the onLayout height changes rapidly, the child's height will change, causing another layout, ad infinitum.

This might seem like an extreme case but there are product use-cases where this is done in non-Fabric and layout stabilizes quickly. In Fabric, currently it may never stabilize.

Part of this is due to a longstanding issue that exists in Fabric and non-Fabric, that we cannot immediately fix: If in a single frame, C++ emits 100 layout events to ReactJS, ReactJS may only process 50 before committing the root. That will trigger more layout events, even though product code has only partially processed the layout events. At the next frame, the next 50 events will be processed which may again change the layout, emitting more events... etc. In most cases the tree will converge and layout values will stabilize, but in extreme cases in Fabric, it might not.

Part of this is because Fabric does not drop *stale* layout events. If 10 layout events are dispatched to the same node, it will process all 10 events in older. Non-Fabric does not have this behavior, so we're changing Fabric to drop stale events when they queue up.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23719494

fbshipit-source-id: e44a3b3e40585b59680299db3a4efdc63cdf0de8
---
 .../components/view/ViewEventEmitter.cpp      | 35 +++++++++++++------
 .../components/view/ViewEventEmitter.h        |  1 +
 .../renderer/uimanager/UIManagerBinding.cpp   |  5 +++
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp b/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
index fe2a83f5f43d8d..e26f7c143a6dfc 100644
--- a/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/view/ViewEventEmitter.cpp
@@ -46,16 +46,31 @@ void ViewEventEmitter::onLayout(const LayoutMetrics &layoutMetrics) const {
     lastLayoutMetrics_ = layoutMetrics;
   }
 
-  dispatchEvent("layout", [frame = layoutMetrics.frame](jsi::Runtime &runtime) {
-    auto layout = jsi::Object(runtime);
-    layout.setProperty(runtime, "x", frame.origin.x);
-    layout.setProperty(runtime, "y", frame.origin.y);
-    layout.setProperty(runtime, "width", frame.size.width);
-    layout.setProperty(runtime, "height", frame.size.height);
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "layout", std::move(layout));
-    return payload;
-  });
+  std::atomic_uint_fast8_t *eventCounter = &eventCounter_;
+  uint_fast8_t expectedEventCount = ++*eventCounter;
+
+  // dispatchUniqueEvent only drops consecutive onLayout events to the same
+  // node. We want to drop *any* unprocessed onLayout events when there's a
+  // newer one.
+  dispatchEvent(
+      "layout",
+      [frame = layoutMetrics.frame, expectedEventCount, eventCounter](
+          jsi::Runtime &runtime) {
+        uint_fast8_t actualEventCount = eventCounter->load();
+        if (expectedEventCount != actualEventCount) {
+          // Drop stale events
+          return jsi::Value::null();
+        }
+
+        auto layout = jsi::Object(runtime);
+        layout.setProperty(runtime, "x", frame.origin.x);
+        layout.setProperty(runtime, "y", frame.origin.y);
+        layout.setProperty(runtime, "width", frame.size.width);
+        layout.setProperty(runtime, "height", frame.size.height);
+        auto payload = jsi::Object(runtime);
+        payload.setProperty(runtime, "layout", std::move(layout));
+        return jsi::Value(std::move(payload));
+      });
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/view/ViewEventEmitter.h b/ReactCommon/react/renderer/components/view/ViewEventEmitter.h
index 0aa1f5e588eba2..237c9a53b1038b 100644
--- a/ReactCommon/react/renderer/components/view/ViewEventEmitter.h
+++ b/ReactCommon/react/renderer/components/view/ViewEventEmitter.h
@@ -40,6 +40,7 @@ class ViewEventEmitter : public TouchEventEmitter {
  private:
   mutable std::mutex layoutMetricsMutex_;
   mutable LayoutMetrics lastLayoutMetrics_;
+  mutable std::atomic_uint_fast8_t eventCounter_{0};
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
index 10a9dce3cdaa86..5c2765ca3996f9 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
@@ -135,6 +135,11 @@ void UIManagerBinding::dispatchEvent(
 
   auto payload = payloadFactory(runtime);
 
+  // If a payload is null, the factory has decided to cancel the event
+  if (payload.isNull()) {
+    return;
+  }
+
   auto instanceHandle = eventTarget
     ? [&]() {
       auto instanceHandle = eventTarget->getInstanceHandle(runtime);

From 9b76e217bb16935069f0ea5b60f4c4d9b73f86d6 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 17 Sep 2020 13:52:44 -0700
Subject: [PATCH 020/241] Copy all blocks generated by TurboModules
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
The Apple documentation states: https://developer.apple.com/library/archive/documentation/Cocoa/Conceptual/Blocks/Articles/bxUsing.html#//apple_ref/doc/uid/TP40007502-CH5-SW1

> Typically, you shouldn’t need to copy (or retain) a block. You only need to make a copy when you expect the block to be used after destruction of the scope within which it was declared. Copying moves a block to the heap.

All blocks generated in the TurboModule infra, for callbacks and promise resolve/reject handlers, can be used after the destruction of the scope within which they were declared. Therefore, let's copy them in the hopes that they mitigate T75876134.

**Note:** We copy blocks before pushing them into the `retainedObjects` array in the legacy Infra as well. Context: D2559997 (https://github.com/facebook/react-native/commit/71da2917e577b7ec659083408cff7f9981d6600f), D5589246 (https://github.com/facebook/react-native/commit/2a6965df9063c795b3d3098c4db76e5f595ba44f)

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23764329

fbshipit-source-id: e71360977bdff74dc570bd40f0139792860f811f
---
 .../core/platform/ios/RCTTurboModule.mm       | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm
index 4e5cdc8a4ee3c6..c8950c5718fe6a 100644
--- a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm
+++ b/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm
@@ -171,7 +171,7 @@ static int32_t getUniqueId()
 {
   auto weakWrapper = CallbackWrapper::createWeak(value.getFunction(runtime), runtime, jsInvoker);
   BOOL __block wrapperWasCalled = NO;
-  return ^(NSArray *responses) {
+  RCTResponseSenderBlock callback = ^(NSArray *responses) {
     if (wrapperWasCalled) {
       throw std::runtime_error("callback arg cannot be called more than once");
     }
@@ -194,6 +194,8 @@ static int32_t getUniqueId()
 
     wrapperWasCalled = YES;
   };
+
+  return [callback copy];
 }
 
 namespace facebook {
@@ -331,12 +333,11 @@ static int32_t getUniqueId()
   bool wasMethodSync = isMethodSync(returnType);
 
   void (^block)() = ^{
-    if (!weakModule) {
+    id<RCTTurboModule> strongModule = weakModule;
+    if (!strongModule) {
       return;
     }
 
-    id<RCTTurboModule> strongModule = weakModule;
-
     if (wasMethodSync) {
       TurboModulePerfLogger::syncMethodCallExecutionStart(moduleName, methodNameStr.c_str());
     } else {
@@ -635,10 +636,13 @@ static int32_t getUniqueId()
             runtime,
             jsInvoker_,
             ^(RCTPromiseResolveBlock resolveBlock, RCTPromiseRejectBlock rejectBlock) {
-              [inv setArgument:(void *)&resolveBlock atIndex:count + 2];
-              [inv setArgument:(void *)&rejectBlock atIndex:count + 3];
-              [retainedObjectsForInvocation addObject:resolveBlock];
-              [retainedObjectsForInvocation addObject:rejectBlock];
+              RCTPromiseResolveBlock resolveCopy = [resolveBlock copy];
+              RCTPromiseRejectBlock rejectCopy = [rejectBlock copy];
+
+              [inv setArgument:(void *)&resolveCopy atIndex:count + 2];
+              [inv setArgument:(void *)&rejectCopy atIndex:count + 3];
+              [retainedObjectsForInvocation addObject:resolveCopy];
+              [retainedObjectsForInvocation addObject:rejectCopy];
               // The return type becomes void in the ObjC side.
               performMethodInvocation(runtime, VoidKind, methodName, inv, retainedObjectsForInvocation);
             })

From bb003816a389b8655c53fa34444417c14516459c Mon Sep 17 00:00:00 2001
From: Xuan Huang <jsx@fb.com>
Date: Thu, 17 Sep 2020 14:15:58 -0700
Subject: [PATCH 021/241] Upgrade Hermes dependency to 0.7.0

Summary:
Use the latest published release of hermes-engine.
Changelog: [Android] [Changed] - Upgraded to Hermes 0.7.0
allow-large-files

Reviewed By: cpojer

Differential Revision: D23725129

fbshipit-source-id: 50938433147100e97699b717d77a687fbbfe892b
---
 package.json | 2 +-
 yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 34260b816a895d..dc045489e56b55 100644
--- a/package.json
+++ b/package.json
@@ -96,7 +96,7 @@
     "base64-js": "^1.1.2",
     "event-target-shim": "^5.0.1",
     "fbjs-scripts": "^1.1.0",
-    "hermes-engine": "~0.6.0",
+    "hermes-engine": "~0.7.0",
     "invariant": "^2.2.4",
     "jsc-android": "^245459.0.0",
     "metro-babel-register": "0.63.0",
diff --git a/yarn.lock b/yarn.lock
index 0d013d0483564c..05196e9070286f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3604,10 +3604,10 @@ has@^1.0.1, has@^1.0.3:
   dependencies:
     function-bind "^1.1.1"
 
-hermes-engine@~0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.6.0.tgz#82c0738b89afb3253dcc4b322888a8bf0f52930b"
-  integrity sha512-WrKfVJ8zsaTz31GHuoX2rJl7AV85Y9bFQkWhqalbObwPusanSsvU+viByDXccUU3khs9CjLBTm0O6DAH3Yls8g==
+hermes-engine@~0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.7.0.tgz#c4a13e09811d7bc975a0662bd2ca7120003d6ef8"
+  integrity sha512-lU9OenFWXXOzYldqn15QvbiD0kDc+uw2arhCOkR+9D+PhrLFcbEqnaXFESgchN77JYEf77KkqXncTZA8aoXw2A==
 
 hosted-git-info@^2.1.4:
   version "2.8.8"

From c453dbc4cc9c7e009910a6fbea68e099a244e9b8 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 17 Sep 2020 14:39:38 -0700
Subject: [PATCH 022/241] Fabric: Enabling state auto-repeating for all state
 updates (gated)

Summary:
This enables a new state auto repeating mechanism built-in mechanism for all state updates which we already use for CK interop. This experiment is supposed to help with T74769670 and co.

This change is gated with MC.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross

Differential Revision: D23762508

fbshipit-source-id: f535513c724ace9ede570177281324eb507329c5
---
 ReactCommon/react/renderer/scheduler/Scheduler.cpp | 6 ++++++
 ReactCommon/react/renderer/uimanager/UIManager.cpp | 2 +-
 ReactCommon/react/renderer/uimanager/UIManager.h   | 5 +++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/react/renderer/scheduler/Scheduler.cpp b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
index a2384dfb8ecce0..1f0c617ef8d58a 100644
--- a/ReactCommon/react/renderer/scheduler/Scheduler.cpp
+++ b/ReactCommon/react/renderer/scheduler/Scheduler.cpp
@@ -110,11 +110,17 @@ Scheduler::Scheduler(
       "react_fabric:enable_reparenting_detection_android");
   removeOutstandingSurfacesOnDestruction_ = reactNativeConfig_->getBool(
       "react_fabric:remove_outstanding_surfaces_on_destruction_android");
+  uiManager_->experimentEnableStateUpdateWithAutorepeat =
+      reactNativeConfig_->getBool(
+          "react_fabric:enable_state_update_with_autorepeat_android");
 #else
   enableReparentingDetection_ = reactNativeConfig_->getBool(
       "react_fabric:enable_reparenting_detection_ios");
   removeOutstandingSurfacesOnDestruction_ = reactNativeConfig_->getBool(
       "react_fabric:remove_outstanding_surfaces_on_destruction_ios");
+  uiManager_->experimentEnableStateUpdateWithAutorepeat =
+      reactNativeConfig_->getBool(
+          "react_fabric:enable_state_update_with_autorepeat_ios");
 #endif
 }
 
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp
index 8f6c4bb0aa7ca4..e4c4cdb8f5b461 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -263,7 +263,7 @@ void UIManager::updateStateWithAutorepeat(
 }
 
 void UIManager::updateState(StateUpdate const &stateUpdate) const {
-  if (stateUpdate.autorepeat) {
+  if (stateUpdate.autorepeat || experimentEnableStateUpdateWithAutorepeat) {
     updateStateWithAutorepeat(stateUpdate);
     return;
   }
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.h b/ReactCommon/react/renderer/uimanager/UIManager.h
index e2ba6f41630551..4e53389615d04f 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.h
+++ b/ReactCommon/react/renderer/uimanager/UIManager.h
@@ -73,6 +73,11 @@ class UIManager final : public ShadowTreeDelegate {
       ShadowTree const &shadowTree,
       MountingCoordinator::Shared const &mountingCoordinator) const override;
 
+  /*
+   * Temporary flags.
+   */
+  bool experimentEnableStateUpdateWithAutorepeat{false};
+
  private:
   friend class UIManagerBinding;
   friend class Scheduler;

From 9b094ee77a5f82b1e5ebfe6384afb3f660f03a3d Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 17 Sep 2020 16:04:40 -0700
Subject: [PATCH 023/241] Stop accessing JVM in ~JavaTurboModule

Summary:
Inside JavaTurboModule, the native `CallInvoker` is used to schedule work on the NativeModules thread. So, in ~JavaTurboModule(), I scheduled some work on the NativeModules thread. This work holds a copy of the JNI global reference to the Java NativeModule object, and when it's executed, it resets this global reference to the Java NativeModule object. This should ensure that the we don't access the JVM in ~JavaTurboModule, which could crash the program.

I also removed the redundant `quitSynchronous()` in `~CatalystInstanceImpl()`, to prevent the NativeModules thread from being deleted before we delete the `jsi::Runtime`. This shouldn't cause an issue, because we delete the NativeModules thread when we call [ReactQueueConfigurationImpl.destroy()](https://fburl.com/codesearch/p7aurwn3).

Changelog: [Internal]

Reviewed By: ejanzer

Differential Revision: D23744777

fbshipit-source-id: a5c8d3f2ac4287dfef9a4b4404a04b335aa0963d
---
 .../jni/react/jni/CatalystInstanceImpl.cpp    |  6 ------
 .../main/jni/react/jni/CatalystInstanceImpl.h |  1 -
 .../core/platform/android/JavaTurboModule.cpp | 20 +++++++++++++++++++
 .../core/platform/android/JavaTurboModule.h   |  1 +
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index 7d5b1acf483f88..659c8235a64bbb 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -92,12 +92,6 @@ CatalystInstanceImpl::initHybrid(jni::alias_ref<jclass>) {
 CatalystInstanceImpl::CatalystInstanceImpl()
     : instance_(std::make_unique<Instance>()) {}
 
-CatalystInstanceImpl::~CatalystInstanceImpl() {
-  if (moduleMessageQueue_ != NULL) {
-    moduleMessageQueue_->quitSynchronous();
-  }
-}
-
 void CatalystInstanceImpl::registerNatives() {
   registerHybrid({
       makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid),
diff --git a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
index dd9990ef090a00..c40a691232c6a2 100644
--- a/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
+++ b/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -37,7 +37,6 @@ class CatalystInstanceImpl : public jni::HybridClass<CatalystInstanceImpl> {
       "Lcom/facebook/react/bridge/CatalystInstanceImpl;";
 
   static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jclass>);
-  ~CatalystInstanceImpl() override;
 
   static void registerNatives();
 
diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp
index 4b5d8d6e9538b6..82fbc928fb6c1a 100644
--- a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp
+++ b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp
@@ -31,6 +31,26 @@ JavaTurboModule::JavaTurboModule(const InitParams &params)
       instance_(jni::make_global(params.instance)),
       nativeInvoker_(params.nativeInvoker) {}
 
+JavaTurboModule::~JavaTurboModule() {
+  /**
+   * TODO(T75896241): In E2E tests, instance_ is null. Investigate why. Can we
+   * get rid of this null check?
+   */
+  if (!instance_) {
+    return;
+  }
+
+  nativeInvoker_->invokeAsync([instance = std::move(instance_)]() mutable {
+    /**
+     * Reset the global NativeModule ref on the NativeModules thread. Why:
+     *   - ~JavaTurboModule() can be called on a non-JVM thread. If we reset the
+     *     global ref in ~JavaTurboModule(), we might access the JVM from a
+     *     non-JVM thread, which will crash the app.
+     */
+    instance.reset();
+  });
+}
+
 bool JavaTurboModule::isPromiseAsyncDispatchEnabled_ = false;
 void JavaTurboModule::enablePromiseAsyncDispatch(bool enable) {
   isPromiseAsyncDispatchEnabled_ = enable;
diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h
index 642cacb194a85b..93acda48fcff56 100644
--- a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h
+++ b/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h
@@ -41,6 +41,7 @@ class JSI_EXPORT JavaTurboModule : public TurboModule {
   };
 
   JavaTurboModule(const InitParams &params);
+  virtual ~JavaTurboModule();
   jsi::Value invokeJavaMethod(
       jsi::Runtime &runtime,
       TurboModuleMethodValueKind valueKind,

From 2788ee8ba9b714d5cc6e9f215223ba0586024444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Norte?= <rubennorte@fb.com>
Date: Fri, 18 Sep 2020 07:11:17 -0700
Subject: [PATCH 024/241] Improve performance logger definition and type safety

Summary:
The way the performance logger is defined now is very unsafe regarding type safety, as all accesses to its properties is untyped (`any`) and it uses several `mixed` types in cases that could be more refined.

This migrates the creation of performance loggers to instances of a class to improve its type safety. If there's an impact in performance, it's expected to be positive.

Changelog:
[Internal][Changed] - Replaced object literals with class instances to create performance loggers

Reviewed By: lunaleaps

Differential Revision: D23758609

fbshipit-source-id: 0734742eb97d92a4a53f7b66a8ca45a2ae90946c
---
 .../__tests__/PerformanceLogger-test.js       |   1 +
 .../Utilities/createPerformanceLogger.js      | 378 +++++++++---------
 2 files changed, 189 insertions(+), 190 deletions(-)

diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index 9af931852397ab..d39d30a818e424 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow strict-local
  */
 
 'use strict';
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index c44d649651df85..05829e51021586 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -13,7 +13,7 @@
 const Systrace = require('../Performance/Systrace');
 
 const infoLog = require('./infoLog');
-const performanceNow =
+const performanceNow: () => number =
   global.nativeQPLTimestamp ?? global.performance.now.bind(global.performance);
 
 type Timespan = {
@@ -21,9 +21,11 @@ type Timespan = {
   totalTime?: number,
   startTime?: number,
   endTime?: number,
-  ...
 };
 
+// Extra values should be serializable primitives
+type ExtraValue = number | string | boolean;
+
 export interface IPerformanceLogger {
   addTimeAnnotation(
     key: string,
@@ -43,9 +45,9 @@ export interface IPerformanceLogger {
   currentTimestamp(): number;
   getTimespans(): {[key: string]: Timespan, ...};
   hasTimespan(key: string): boolean;
-  setExtra(key: string, value: mixed): void;
-  getExtras(): {[key: string]: mixed, ...};
-  removeExtra(key: string): ?mixed;
+  setExtra(key: string, value: ExtraValue): void;
+  getExtras(): {[key: string]: ExtraValue, ...};
+  removeExtra(key: string): ExtraValue | void;
   markPoint(key: string, timestamp?: number): void;
   getPoints(): {[key: string]: number, ...};
   logEverything(): void;
@@ -55,211 +57,207 @@ const _cookies: {[key: string]: number, ...} = {};
 
 const PRINT_TO_CONSOLE: false = false; // Type as false to prevent accidentally committing `true`;
 
-/**
- * This function creates performance loggers that can be used to collect and log
- * various performance data such as timespans, points and extras.
- * The loggers need to have minimal overhead since they're used in production.
- */
-function createPerformanceLogger(): IPerformanceLogger {
-  const result: IPerformanceLogger & {
-    _timespans: {[key: string]: Timespan, ...},
-    _extras: {[key: string]: mixed, ...},
-    _points: {[key: string]: number, ...},
-    ...
-  } = {
-    _timespans: {},
-    _extras: {},
-    _points: {},
-
-    addTimeAnnotation(key: string, durationInMs: number, description?: string) {
-      if (this._timespans[key]) {
-        if (PRINT_TO_CONSOLE && __DEV__) {
-          infoLog(
-            'PerformanceLogger: Attempting to add a timespan that already exists ',
-            key,
-          );
-        }
-        return;
-      }
+class PerformanceLogger implements IPerformanceLogger {
+  _timespans: {[key: string]: Timespan} = {};
+  _extras: {[key: string]: ExtraValue} = {};
+  _points: {[key: string]: number} = {};
 
-      this._timespans[key] = {
-        description: description,
-        totalTime: durationInMs,
-      };
-    },
-
-    addTimespan(
-      key: string,
-      startTime: number,
-      endTime: number,
-      description?: string,
-    ) {
-      if (this._timespans[key]) {
-        if (PRINT_TO_CONSOLE && __DEV__) {
-          infoLog(
-            'PerformanceLogger: Attempting to add a timespan that already exists ',
-            key,
-          );
-        }
-        return;
+  addTimeAnnotation(key: string, durationInMs: number, description?: string) {
+    if (this._timespans[key]) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to add a timespan that already exists ',
+          key,
+        );
       }
+      return;
+    }
 
-      this._timespans[key] = {
-        description,
-        startTime,
-        endTime,
-        totalTime: endTime - (startTime || 0),
-      };
-    },
-
-    startTimespan(key: string, description?: string) {
-      if (this._timespans[key]) {
-        if (PRINT_TO_CONSOLE && __DEV__) {
-          infoLog(
-            'PerformanceLogger: Attempting to start a timespan that already exists ',
-            key,
-          );
-        }
-        return;
+    this._timespans[key] = {
+      description: description,
+      totalTime: durationInMs,
+    };
+  }
+
+  addTimespan(
+    key: string,
+    startTime: number,
+    endTime: number,
+    description?: string,
+  ) {
+    if (this._timespans[key]) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to add a timespan that already exists ',
+          key,
+        );
       }
+      return;
+    }
+
+    this._timespans[key] = {
+      description,
+      startTime,
+      endTime,
+      totalTime: endTime - (startTime || 0),
+    };
+  }
 
-      this._timespans[key] = {
-        description: description,
-        startTime: performanceNow(),
-      };
-      _cookies[key] = Systrace.beginAsyncEvent(key);
-      if (PRINT_TO_CONSOLE) {
-        infoLog('PerformanceLogger.js', 'start: ' + key);
+  startTimespan(key: string, description?: string) {
+    if (this._timespans[key]) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to start a timespan that already exists ',
+          key,
+        );
       }
-    },
-
-    stopTimespan(key: string, options?: {update?: boolean}) {
-      const timespan = this._timespans[key];
-      if (!timespan || !timespan.startTime) {
-        if (PRINT_TO_CONSOLE && __DEV__) {
-          infoLog(
-            'PerformanceLogger: Attempting to end a timespan that has not started ',
-            key,
-          );
-        }
-        return;
+      return;
+    }
+
+    this._timespans[key] = {
+      description: description,
+      startTime: performanceNow(),
+    };
+    _cookies[key] = Systrace.beginAsyncEvent(key);
+    if (PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'start: ' + key);
+    }
+  }
+
+  stopTimespan(key: string, options?: {update?: boolean}) {
+    const timespan = this._timespans[key];
+    if (!timespan || timespan.startTime == null) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to end a timespan that has not started ',
+          key,
+        );
       }
-      if (timespan.endTime && !options?.update) {
-        if (PRINT_TO_CONSOLE && __DEV__) {
-          infoLog(
-            'PerformanceLogger: Attempting to end a timespan that has already ended ',
-            key,
-          );
-        }
-        return;
+      return;
+    }
+    if (timespan.endTime != null && !options?.update) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to end a timespan that has already ended ',
+          key,
+        );
       }
+      return;
+    }
+
+    timespan.endTime = performanceNow();
+    timespan.totalTime = timespan.endTime - (timespan.startTime || 0);
+    if (PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'end: ' + key);
+    }
+
+    if (_cookies[key] != null) {
+      Systrace.endAsyncEvent(key, _cookies[key]);
+      delete _cookies[key];
+    }
+  }
 
-      timespan.endTime = performanceNow();
-      timespan.totalTime = timespan.endTime - (timespan.startTime || 0);
-      if (PRINT_TO_CONSOLE) {
-        infoLog('PerformanceLogger.js', 'end: ' + key);
+  clear() {
+    this._timespans = {};
+    this._extras = {};
+    this._points = {};
+    if (PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'clear');
+    }
+  }
+
+  clearCompleted() {
+    for (const key in this._timespans) {
+      if (this._timespans[key].totalTime != null) {
+        delete this._timespans[key];
       }
+    }
+    this._extras = {};
+    this._points = {};
+    if (PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'clearCompleted');
+    }
+  }
+
+  currentTimestamp() {
+    return performanceNow();
+  }
+
+  getTimespans() {
+    return this._timespans;
+  }
 
-      if (_cookies[key] != null) {
-        Systrace.endAsyncEvent(key, _cookies[key]);
-        delete _cookies[key];
+  hasTimespan(key: string) {
+    return !!this._timespans[key];
+  }
+
+  setExtra(key: string, value: ExtraValue) {
+    if (this._extras.hasOwnProperty(key)) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to set an extra that already exists ',
+          {key, currentValue: this._extras[key], attemptedValue: value},
+        );
       }
-    },
-
-    clear() {
-      this._timespans = {};
-      this._extras = {};
-      this._points = {};
-      if (PRINT_TO_CONSOLE) {
-        infoLog('PerformanceLogger.js', 'clear');
+      return;
+    }
+    this._extras[key] = value;
+  }
+
+  getExtras() {
+    return this._extras;
+  }
+
+  removeExtra(key: string): ExtraValue | void {
+    const value = this._extras[key];
+    delete this._extras[key];
+    return value;
+  }
+
+  markPoint(key: string, timestamp?: number) {
+    if (this._points[key]) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to mark a point that has been already logged ',
+          key,
+        );
       }
-    },
+      return;
+    }
+    this._points[key] = timestamp ?? performanceNow();
+  }
+
+  getPoints() {
+    return this._points;
+  }
 
-    clearCompleted() {
+  logEverything() {
+    if (PRINT_TO_CONSOLE) {
+      // log timespans
       for (const key in this._timespans) {
-        if (this._timespans[key].totalTime) {
-          delete this._timespans[key];
-        }
-      }
-      this._extras = {};
-      this._points = {};
-      if (PRINT_TO_CONSOLE) {
-        infoLog('PerformanceLogger.js', 'clearCompleted');
-      }
-    },
-
-    currentTimestamp() {
-      return performanceNow();
-    },
-
-    getTimespans() {
-      return this._timespans;
-    },
-
-    hasTimespan(key: string) {
-      return !!this._timespans[key];
-    },
-
-    setExtra(key: string, value: mixed) {
-      if (this._extras[key]) {
-        if (PRINT_TO_CONSOLE && __DEV__) {
-          infoLog(
-            'PerformanceLogger: Attempting to set an extra that already exists ',
-            {key, currentValue: this._extras[key], attemptedValue: value},
-          );
+        if (this._timespans[key].totalTime != null) {
+          infoLog(key + ': ' + this._timespans[key].totalTime + 'ms');
         }
-        return;
       }
-      this._extras[key] = value;
-    },
-
-    getExtras() {
-      return this._extras;
-    },
-
-    removeExtra(key: string): ?mixed {
-      const value = this._extras[key];
-      delete this._extras[key];
-      return value;
-    },
-
-    markPoint(key: string, timestamp?: number) {
-      if (this._points[key]) {
-        if (PRINT_TO_CONSOLE && __DEV__) {
-          infoLog(
-            'PerformanceLogger: Attempting to mark a point that has been already logged ',
-            key,
-          );
-        }
-        return;
-      }
-      this._points[key] = timestamp ?? performanceNow();
-    },
-
-    getPoints() {
-      return this._points;
-    },
-
-    logEverything() {
-      if (PRINT_TO_CONSOLE) {
-        // log timespans
-        for (const key in this._timespans) {
-          if (this._timespans[key].totalTime) {
-            infoLog(key + ': ' + this._timespans[key].totalTime + 'ms');
-          }
-        }
 
-        // log extras
-        infoLog(this._extras);
+      // log extras
+      infoLog(this._extras);
 
-        // log points
-        for (const key in this._points) {
-          infoLog(key + ': ' + this._points[key] + 'ms');
-        }
+      // log points
+      for (const key in this._points) {
+        infoLog(key + ': ' + this._points[key] + 'ms');
       }
-    },
-  };
-  return result;
+    }
+  }
+}
+
+/**
+ * This function creates performance loggers that can be used to collect and log
+ * various performance data such as timespans, points and extras.
+ * The loggers need to have minimal overhead since they're used in production.
+ */
+function createPerformanceLogger(): IPerformanceLogger {
+  return new PerformanceLogger();
 }
 
 module.exports = createPerformanceLogger;

From 4d842963fa1ec17884355738fd7edca0f8c77997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Norte?= <rubennorte@fb.com>
Date: Fri, 18 Sep 2020 07:11:17 -0700
Subject: [PATCH 025/241] Remove unused timespan descriptions from performance
 loggers

Summary:
The `description` parameter is never used so we can simplify the API.

Changelog:
[Internal][Changed] Removed `description` option from performance logger timespans

Reviewed By: lunaleaps

Differential Revision: D23758829

fbshipit-source-id: 10900f86effc3e1f54a408cf8f9fbc9b3b52f569
---
 .../__tests__/PerformanceLogger-test.js       |  6 ++--
 .../Utilities/createPerformanceLogger.js      | 30 ++++---------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index d39d30a818e424..651c6f0f47ae6b 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -55,10 +55,8 @@ describe('PerformanceLogger', () => {
     let perfLogger = createPerformanceLogger();
     const startTime = 0;
     const endTime = 100;
-    const description = 'description';
-    perfLogger.addTimespan(TIMESPAN_1, startTime, endTime, description);
+    perfLogger.addTimespan(TIMESPAN_1, startTime, endTime);
     expect(perfLogger.getTimespans()[TIMESPAN_1]).toEqual({
-      description,
       startTime,
       endTime,
       totalTime: endTime - startTime,
@@ -70,7 +68,7 @@ describe('PerformanceLogger', () => {
     perfLogger.startTimespan(TIMESPAN_1);
     perfLogger.stopTimespan(TIMESPAN_1);
     const existing = perfLogger.getTimespans()[TIMESPAN_1];
-    perfLogger.addTimespan(TIMESPAN_1, 0, 100, 'overriding');
+    perfLogger.addTimespan(TIMESPAN_1, 0, 100);
     expect(perfLogger.getTimespans()[TIMESPAN_1]).toEqual(existing);
   });
 
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 05829e51021586..643493b936fc67 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -17,7 +17,6 @@ const performanceNow: () => number =
   global.nativeQPLTimestamp ?? global.performance.now.bind(global.performance);
 
 type Timespan = {
-  description?: string,
   totalTime?: number,
   startTime?: number,
   endTime?: number,
@@ -27,18 +26,9 @@ type Timespan = {
 type ExtraValue = number | string | boolean;
 
 export interface IPerformanceLogger {
-  addTimeAnnotation(
-    key: string,
-    durationInMs: number,
-    description?: string,
-  ): void;
-  addTimespan(
-    key: string,
-    startTime: number,
-    endTime: number,
-    description?: string,
-  ): void;
-  startTimespan(key: string, description?: string): void;
+  addTimeAnnotation(key: string, durationInMs: number): void;
+  addTimespan(key: string, startTime: number, endTime: number): void;
+  startTimespan(key: string): void;
   stopTimespan(key: string, options?: {update?: boolean}): void;
   clear(): void;
   clearCompleted(): void;
@@ -62,7 +52,7 @@ class PerformanceLogger implements IPerformanceLogger {
   _extras: {[key: string]: ExtraValue} = {};
   _points: {[key: string]: number} = {};
 
-  addTimeAnnotation(key: string, durationInMs: number, description?: string) {
+  addTimeAnnotation(key: string, durationInMs: number) {
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -74,17 +64,11 @@ class PerformanceLogger implements IPerformanceLogger {
     }
 
     this._timespans[key] = {
-      description: description,
       totalTime: durationInMs,
     };
   }
 
-  addTimespan(
-    key: string,
-    startTime: number,
-    endTime: number,
-    description?: string,
-  ) {
+  addTimespan(key: string, startTime: number, endTime: number) {
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -96,14 +80,13 @@ class PerformanceLogger implements IPerformanceLogger {
     }
 
     this._timespans[key] = {
-      description,
       startTime,
       endTime,
       totalTime: endTime - (startTime || 0),
     };
   }
 
-  startTimespan(key: string, description?: string) {
+  startTimespan(key: string) {
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -115,7 +98,6 @@ class PerformanceLogger implements IPerformanceLogger {
     }
 
     this._timespans[key] = {
-      description: description,
       startTime: performanceNow(),
     };
     _cookies[key] = Systrace.beginAsyncEvent(key);

From fc4f667cdeb024cf5b251964166d0f642dcd1153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Norte?= <rubennorte@fb.com>
Date: Fri, 18 Sep 2020 07:11:17 -0700
Subject: [PATCH 026/241] Remove unnecessary addTimeAnnotation method from
 performance logger

Summary:
Changelog:
[Internal][Removed] Removed `addTimeAnnotation` method from performance loggers

Reviewed By: lunaleaps

Differential Revision: D23758816

fbshipit-source-id: 98e0abae25266f3dcc5953f25f20cde8e3dac190
---
 .../__tests__/PerformanceLogger-test.js       | 16 ++++++--------
 .../Utilities/createPerformanceLogger.js      | 21 ++-----------------
 2 files changed, 8 insertions(+), 29 deletions(-)

diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index 651c6f0f47ae6b..ea940f10947785 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -15,8 +15,6 @@ import createPerformanceLogger from '../createPerformanceLogger';
 import type {IPerformanceLogger} from '../createPerformanceLogger';
 
 const TIMESPAN_1 = '<timespan_1>';
-const TIMESPAN_2 = '<timespan_2>';
-const TIMESPAN_2_DURATION = 123;
 const EXTRA_KEY = '<extra_key>';
 const EXTRA_VALUE = '<extra_value>';
 const EXTRA_VALUE_2 = '<extra_value_2>';
@@ -29,16 +27,16 @@ describe('PerformanceLogger', () => {
     GlobalPerformanceLogger.clear();
   });
 
-  it('starts & stops and adds a timespan', () => {
+  it('starts & stops a timespan', () => {
     let perfLogger = createPerformanceLogger();
     perfLogger.startTimespan(TIMESPAN_1);
     perfLogger.stopTimespan(TIMESPAN_1);
-    perfLogger.addTimeAnnotation(TIMESPAN_2, TIMESPAN_2_DURATION);
     expect(perfLogger.hasTimespan(TIMESPAN_1)).toBe(true);
-    expect(perfLogger.hasTimespan(TIMESPAN_2)).toBe(true);
-    expect(perfLogger.getTimespans()[TIMESPAN_2].totalTime).toBe(
-      TIMESPAN_2_DURATION,
-    );
+    expect(perfLogger.getTimespans()[TIMESPAN_1]).toEqual({
+      startTime: expect.any(Number),
+      endTime: expect.any(Number),
+      totalTime: expect.any(Number),
+    });
   });
 
   it('does not override a timespan', () => {
@@ -47,8 +45,6 @@ describe('PerformanceLogger', () => {
     let old = perfLogger.getTimespans()[TIMESPAN_1];
     perfLogger.startTimespan(TIMESPAN_1);
     expect(perfLogger.getTimespans()[TIMESPAN_1]).toBe(old);
-    perfLogger.addTimeAnnotation(TIMESPAN_1, 1);
-    expect(perfLogger.getTimespans()[TIMESPAN_1]).toBe(old);
   });
 
   it('adds a timespan with start and end timestamps', () => {
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 643493b936fc67..e98b516be35dd6 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -17,16 +17,15 @@ const performanceNow: () => number =
   global.nativeQPLTimestamp ?? global.performance.now.bind(global.performance);
 
 type Timespan = {
-  totalTime?: number,
-  startTime?: number,
+  startTime: number,
   endTime?: number,
+  totalTime?: number,
 };
 
 // Extra values should be serializable primitives
 type ExtraValue = number | string | boolean;
 
 export interface IPerformanceLogger {
-  addTimeAnnotation(key: string, durationInMs: number): void;
   addTimespan(key: string, startTime: number, endTime: number): void;
   startTimespan(key: string): void;
   stopTimespan(key: string, options?: {update?: boolean}): void;
@@ -52,22 +51,6 @@ class PerformanceLogger implements IPerformanceLogger {
   _extras: {[key: string]: ExtraValue} = {};
   _points: {[key: string]: number} = {};
 
-  addTimeAnnotation(key: string, durationInMs: number) {
-    if (this._timespans[key]) {
-      if (PRINT_TO_CONSOLE && __DEV__) {
-        infoLog(
-          'PerformanceLogger: Attempting to add a timespan that already exists ',
-          key,
-        );
-      }
-      return;
-    }
-
-    this._timespans[key] = {
-      totalTime: durationInMs,
-    };
-  }
-
   addTimespan(key: string, startTime: number, endTime: number) {
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {

From f1b84ddf2c21c619b962430eebe2d213bc15da38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rub=C3=A9n=20Norte?= <rubennorte@fb.com>
Date: Fri, 18 Sep 2020 07:11:17 -0700
Subject: [PATCH 027/241] Remove update option from stopTimestamp method in
 performance loggers

Summary:
Changelog:
[Internal][Changed] Removed `update` option from `stopTimestamp` method in performance loggers

Reviewed By: lunaleaps

Differential Revision: D23759138

fbshipit-source-id: bb83b6f5ff2f640733c2e508779b3bc52800e4f6
---
 Libraries/Utilities/createPerformanceLogger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index e98b516be35dd6..c9baf0cd07aa90 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -28,7 +28,7 @@ type ExtraValue = number | string | boolean;
 export interface IPerformanceLogger {
   addTimespan(key: string, startTime: number, endTime: number): void;
   startTimespan(key: string): void;
-  stopTimespan(key: string, options?: {update?: boolean}): void;
+  stopTimespan(key: string): void;
   clear(): void;
   clearCompleted(): void;
   currentTimestamp(): number;
@@ -89,7 +89,7 @@ class PerformanceLogger implements IPerformanceLogger {
     }
   }
 
-  stopTimespan(key: string, options?: {update?: boolean}) {
+  stopTimespan(key: string) {
     const timespan = this._timespans[key];
     if (!timespan || timespan.startTime == null) {
       if (PRINT_TO_CONSOLE && __DEV__) {
@@ -100,7 +100,7 @@ class PerformanceLogger implements IPerformanceLogger {
       }
       return;
     }
-    if (timespan.endTime != null && !options?.update) {
+    if (timespan.endTime != null) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
           'PerformanceLogger: Attempting to end a timespan that has already ended ',

From d1b695d343988b036137b50d4ceef8c0d0f8ba66 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Fri, 18 Sep 2020 07:42:23 -0700
Subject: [PATCH 028/241] Propagate nativeID in createAnimatedComponent

Summary:
Changelog: [internal]

https://our.intern.facebook.com/intern/diffusion/FBS/browse/master/xplat/js/react-native-github/Libraries/Animated/createAnimatedComponent.js?commit=1b6ce6c3a69a&lines=82-112

`_isFabric` in `createAnimatedComponent` returns false for Fabric component, that's why nativeID was not being assigned and view got flattened.

To fix this, props.nativeID is propagated. SnackBar already has nativeID https://our.intern.facebook.com/intern/diffusion/FBS/browse/master/xplat/js/RKJSModules/Libraries/FDS/FDSLightweightFeedback/DEPRECATED_FDSSnackBar.js?commit=1b6ce6c3a69a&lines=277

Reviewed By: PeteTheHeat

Differential Revision: D23757304

fbshipit-source-id: 9e4b4599c95b8af8767793bc8cdce717a347a273
---
 Libraries/Animated/createAnimatedComponent.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Libraries/Animated/createAnimatedComponent.js b/Libraries/Animated/createAnimatedComponent.js
index d5dc89b7f81f8d..ccc789c8037b46 100644
--- a/Libraries/Animated/createAnimatedComponent.js
+++ b/Libraries/Animated/createAnimatedComponent.js
@@ -224,7 +224,8 @@ function createAnimatedComponent<Props: {+[string]: mixed, ...}, Instance>(
           style={mergedStyle}
           ref={this._setComponentRef}
           nativeID={
-            this._isFabric() ? 'animatedComponent' : undefined
+            props.nativeID ??
+            (this._isFabric() ? 'animatedComponent' : undefined)
           } /* TODO: T68258846. */
           // The native driver updates views directly through the UI thread so we
           // have to make sure the view doesn't get optimized away because it cannot

From f72c6f23cf0b23a3fa2c857e6ceafa6226ee741b Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 18 Sep 2020 09:58:49 -0700
Subject: [PATCH 029/241] Reintroduce experiment flag for
 Reparenting/Flattening Differ

Summary:
This flag was deleted in D23374948 (https://github.com/facebook/react-native/commit/6729a3e0bfc01119c8513dfcbb1f5fbe5fe81263), reintroduce it.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23771273

fbshipit-source-id: ae9595194bf14bc740d05b2ca6e7b5e22bdd566f
---
 ReactCommon/react/renderer/mounting/MountingCoordinator.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
index d98ed0a4a740d9..2c9af008a80447 100644
--- a/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
+++ b/ReactCommon/react/renderer/mounting/MountingCoordinator.cpp
@@ -93,7 +93,9 @@ better::optional<MountingTransaction> MountingCoordinator::pullTransaction()
     telemetry.willDiff();
 
     auto mutations = calculateShadowViewMutations(
-        *baseRevision_.rootShadowNode, *lastRevision_->rootShadowNode);
+        *baseRevision_.rootShadowNode,
+        *lastRevision_->rootShadowNode,
+        enableReparentingDetection_);
 
     telemetry.didDiff();
 

From 22804a6144f1d7f921ed15258cb8dd926225d5cd Mon Sep 17 00:00:00 2001
From: Riley Dulin <dulinr@fb.com>
Date: Fri, 18 Sep 2020 10:33:50 -0700
Subject: [PATCH 030/241] Add cause to jsi::instrumentation::collectGarbage

Summary:
Continuing the adding of a "cause" field for logging to GCs.
This allows embedders of Hermes (such as React Native) to specify
the cause of a call to `collectGarbage`.

Notably, this allows Hermes to know when a GC is triggered by a memory warning.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23742099

fbshipit-source-id: 99453e632328c00045b92a72f789d41c898dc518
---
 ReactCommon/jsi/jsi/decorator.h                  | 4 ++--
 ReactCommon/jsi/jsi/instrumentation.h            | 6 ++++--
 ReactCommon/jsi/jsi/jsi.cpp                      | 2 +-
 ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ReactCommon/jsi/jsi/decorator.h b/ReactCommon/jsi/jsi/decorator.h
index 46e7414abbecb1..bef9796dc5b8af 100644
--- a/ReactCommon/jsi/jsi/decorator.h
+++ b/ReactCommon/jsi/jsi/decorator.h
@@ -331,8 +331,8 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     return plain().instrumentation().getHeapInfo(includeExpensive);
   }
 
-  void collectGarbage() override {
-    plain().instrumentation().collectGarbage();
+  void collectGarbage(std::string cause) override {
+    plain().instrumentation().collectGarbage(std::move(cause));
   }
 
   void startTrackingHeapObjectStackTraces() override {
diff --git a/ReactCommon/jsi/jsi/instrumentation.h b/ReactCommon/jsi/jsi/instrumentation.h
index 04c76ce2594d62..b8aa4da02b2366 100644
--- a/ReactCommon/jsi/jsi/instrumentation.h
+++ b/ReactCommon/jsi/jsi/instrumentation.h
@@ -49,8 +49,10 @@ class JSI_EXPORT Instrumentation {
   virtual std::unordered_map<std::string, int64_t> getHeapInfo(
       bool includeExpensive) = 0;
 
-  /// perform a full garbage collection
-  virtual void collectGarbage() = 0;
+  /// Perform a full garbage collection.
+  /// \param cause The cause of this collection, as it should be reported in
+  ///   logs.
+  virtual void collectGarbage(std::string cause) = 0;
 
   /// Start capturing JS stack-traces for all JS heap allocated objects. These
   /// can be accessed via \c ::createSnapshotToFile().
diff --git a/ReactCommon/jsi/jsi/jsi.cpp b/ReactCommon/jsi/jsi/jsi.cpp
index e4a7e431fca00d..eac4c4b6356a8a 100644
--- a/ReactCommon/jsi/jsi/jsi.cpp
+++ b/ReactCommon/jsi/jsi/jsi.cpp
@@ -97,7 +97,7 @@ Instrumentation& Runtime::instrumentation() {
       return std::unordered_map<std::string, int64_t>{};
     }
 
-    void collectGarbage() override {}
+    void collectGarbage(std::string) override {}
 
     void startTrackingHeapObjectStackTraces() override {}
     void stopTrackingHeapObjectStackTraces() override {}
diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
index 0d91ca7778e0b0..c4a3d90625e078 100644
--- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -344,7 +344,7 @@ void JSIExecutor::handleMemoryPressure(int pressureLevel) {
       // collections.
       LOG(INFO) << "Memory warning (pressure level: " << levelName
                 << ") received by JS VM, running a GC";
-      runtime_->instrumentation().collectGarbage();
+      runtime_->instrumentation().collectGarbage("memory warning");
       break;
     default:
       // Use the raw number instead of the name here since the name is

From d8b70b19b39ead4dd41895d666d116a43c56474e Mon Sep 17 00:00:00 2001
From: Michel Weststrate <mweststrate@fb.com>
Date: Fri, 18 Sep 2020 12:21:02 -0700
Subject: [PATCH 031/241] Update Flipper (#29787)

Summary:
The current Flipper version included in new React Native is quite old, causing some bugs to be present which have long been solved, such as freezing the UI after inspecting it.
Fixes

This fixes https://github.com/facebook/react-native/issues/29492 /
https://github.com/facebook/flipper/issues/1399

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[general][changed] - Update Flipper to 0.54

Pull Request resolved: https://github.com/facebook/react-native/pull/29787

Test Plan:
Updated the RN 0.63.2 based test project https://github.com/mweststrate/flipper-issue-1399-repo with `use_flipper!('Flipper' => '0.54.0')` (in `ios/Podspec`) / `FLIPPER_VERSION=0.52.1` in `gradle.properties` in the test project https://github.com/mweststrate/flipper-issue-1399-repo and verified that everything builds and connects correctly, and that the bug is no longer present.

Tried to run RN-tester project in this repo. For iOS this succeeded, on Android I got a build error:

```
make: Leaving directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni'
make: Entering directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni'
fcntl(): Bad file descriptor
[armeabi-v7a] Compile++ thumb: folly_json <= FileUtil.cpp
/Users/mweststrate/Desktop/react-native/ReactAndroid/build/third-party-ndk/folly/folly/FileUtil.cpp:37:14: error: no matching function for call to 'wrapNoInt'
make: Leaving directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni'
  return int(wrapNoInt(open, name, flags, mode));
             ^~~~~~~~~
/Users/mweststrate/Desktop/react-native/ReactAndroid/build/third-party-ndk/folly/folly/detail/FileUtilDetail.h:34:9: note: candidate template ignored: couldn't infer template argument 'F'
ssize_t wrapNoInt(F f, Args... args) {
        ^
1 error generated.
make: *** [/opt/android_sdk/ndk/21.3.6528147/build/core/build-binary.mk:478: /Users/mweststrate/Desktop/react-native/ReactAndroid/build/tmp/buildReactNdkLib/local/armeabi-v7a/objs/folly_json/folly/FileUtil.o] Error 1
make: *** Waiting for unfinished jobs....
fcntl(): Bad file descriptor
make: Entering directory '/Users/mweststrate/Desktop/react-native/ReactAndroid/src/main/jni/react/jni'
[armeabi-v7a] Compile++ thumb: folly_json <= Demangle.cpp
```

No idea if it is related. I guess not since without making the change I got the same error.

Reviewed By: mweststrate

Differential Revision: D23767388

Pulled By: fkgozali

fbshipit-source-id: 35f0d3ddec41942f5bbc96cb391975d84729ef5e
---
 packages/rn-tester/Podfile.lock               | 66 +++++++++----------
 packages/rn-tester/README.md                  |  2 +-
 .../rn-tester/android/app/gradle.properties   |  2 +-
 scripts/react_native_pods.rb                  |  2 +-
 template/android/gradle.properties            |  2 +-
 5 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 51a0dea2c3b33c..8b5b2eda2819e1 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -11,7 +11,7 @@ PODS:
     - React-Core (= 1000.0.0)
     - React-jsi (= 1000.0.0)
     - ReactCommon/turbomodule/core (= 1000.0.0)
-  - Flipper (0.41.5):
+  - Flipper (0.54.0):
     - Flipper-Folly (~> 2.2)
     - Flipper-RSocket (~> 1.1)
   - Flipper-DoubleConversion (1.1.7)
@@ -25,36 +25,36 @@ PODS:
   - Flipper-PeerTalk (0.0.4)
   - Flipper-RSocket (1.1.0):
     - Flipper-Folly (~> 2.2)
-  - FlipperKit (0.41.5):
-    - FlipperKit/Core (= 0.41.5)
-  - FlipperKit/Core (0.41.5):
-    - Flipper (~> 0.41.5)
+  - FlipperKit (0.54.0):
+    - FlipperKit/Core (= 0.54.0)
+  - FlipperKit/Core (0.54.0):
+    - Flipper (~> 0.54.0)
     - FlipperKit/CppBridge
     - FlipperKit/FBCxxFollyDynamicConvert
     - FlipperKit/FBDefines
     - FlipperKit/FKPortForwarding
-  - FlipperKit/CppBridge (0.41.5):
-    - Flipper (~> 0.41.5)
-  - FlipperKit/FBCxxFollyDynamicConvert (0.41.5):
+  - FlipperKit/CppBridge (0.54.0):
+    - Flipper (~> 0.54.0)
+  - FlipperKit/FBCxxFollyDynamicConvert (0.54.0):
     - Flipper-Folly (~> 2.2)
-  - FlipperKit/FBDefines (0.41.5)
-  - FlipperKit/FKPortForwarding (0.41.5):
+  - FlipperKit/FBDefines (0.54.0)
+  - FlipperKit/FKPortForwarding (0.54.0):
     - CocoaAsyncSocket (~> 7.6)
     - Flipper-PeerTalk (~> 0.0.4)
-  - FlipperKit/FlipperKitHighlightOverlay (0.41.5)
-  - FlipperKit/FlipperKitLayoutPlugin (0.41.5):
+  - FlipperKit/FlipperKitHighlightOverlay (0.54.0)
+  - FlipperKit/FlipperKitLayoutPlugin (0.54.0):
     - FlipperKit/Core
     - FlipperKit/FlipperKitHighlightOverlay
     - FlipperKit/FlipperKitLayoutTextSearchable
     - YogaKit (~> 1.18)
-  - FlipperKit/FlipperKitLayoutTextSearchable (0.41.5)
-  - FlipperKit/FlipperKitNetworkPlugin (0.41.5):
+  - FlipperKit/FlipperKitLayoutTextSearchable (0.54.0)
+  - FlipperKit/FlipperKitNetworkPlugin (0.54.0):
     - FlipperKit/Core
-  - FlipperKit/FlipperKitReactPlugin (0.41.5):
+  - FlipperKit/FlipperKitReactPlugin (0.54.0):
     - FlipperKit/Core
-  - FlipperKit/FlipperKitUserDefaultsPlugin (0.41.5):
+  - FlipperKit/FlipperKitUserDefaultsPlugin (0.54.0):
     - FlipperKit/Core
-  - FlipperKit/SKIOSNetworkPlugin (0.41.5):
+  - FlipperKit/SKIOSNetworkPlugin (0.54.0):
     - FlipperKit/Core
     - FlipperKit/FlipperKitNetworkPlugin
   - glog (0.3.5)
@@ -357,25 +357,25 @@ DEPENDENCIES:
   - DoubleConversion (from `../../third-party-podspecs/DoubleConversion.podspec`)
   - FBLazyVector (from `../../Libraries/FBLazyVector`)
   - FBReactNativeSpec (from `../../Libraries/FBReactNativeSpec`)
-  - Flipper (~> 0.41.1)
+  - Flipper (~> 0.54.0)
   - Flipper-DoubleConversion (= 1.1.7)
   - Flipper-Folly (~> 2.2)
   - Flipper-Glog (= 0.3.6)
   - Flipper-PeerTalk (~> 0.0.4)
   - Flipper-RSocket (~> 1.1)
-  - FlipperKit (~> 0.41.1)
-  - FlipperKit/Core (~> 0.41.1)
-  - FlipperKit/CppBridge (~> 0.41.1)
-  - FlipperKit/FBCxxFollyDynamicConvert (~> 0.41.1)
-  - FlipperKit/FBDefines (~> 0.41.1)
-  - FlipperKit/FKPortForwarding (~> 0.41.1)
-  - FlipperKit/FlipperKitHighlightOverlay (~> 0.41.1)
-  - FlipperKit/FlipperKitLayoutPlugin (~> 0.41.1)
-  - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.41.1)
-  - FlipperKit/FlipperKitNetworkPlugin (~> 0.41.1)
-  - FlipperKit/FlipperKitReactPlugin (~> 0.41.1)
-  - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.41.1)
-  - FlipperKit/SKIOSNetworkPlugin (~> 0.41.1)
+  - FlipperKit (~> 0.54.0)
+  - FlipperKit/Core (~> 0.54.0)
+  - FlipperKit/CppBridge (~> 0.54.0)
+  - FlipperKit/FBCxxFollyDynamicConvert (~> 0.54.0)
+  - FlipperKit/FBDefines (~> 0.54.0)
+  - FlipperKit/FKPortForwarding (~> 0.54.0)
+  - FlipperKit/FlipperKitHighlightOverlay (~> 0.54.0)
+  - FlipperKit/FlipperKitLayoutPlugin (~> 0.54.0)
+  - FlipperKit/FlipperKitLayoutTextSearchable (~> 0.54.0)
+  - FlipperKit/FlipperKitNetworkPlugin (~> 0.54.0)
+  - FlipperKit/FlipperKitReactPlugin (~> 0.54.0)
+  - FlipperKit/FlipperKitUserDefaultsPlugin (~> 0.54.0)
+  - FlipperKit/SKIOSNetworkPlugin (~> 0.54.0)
   - glog (from `../../third-party-podspecs/glog.podspec`)
   - RCT-Folly (from `../../third-party-podspecs/RCT-Folly.podspec`)
   - RCTRequired (from `../../Libraries/RCTRequired`)
@@ -491,13 +491,13 @@ SPEC CHECKSUMS:
   DoubleConversion: cde416483dac037923206447da6e1454df403714
   FBLazyVector: 8ea0285646adaf7fa725c20ed737c49ee5ea680a
   FBReactNativeSpec: 29b1b8a11346e71351f3a2ba126439810edee362
-  Flipper: 33585e2d9810fe5528346be33bcf71b37bb7ae13
+  Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
   Flipper-Glog: 1dfd6abf1e922806c52ceb8701a3599a79a200a6
   Flipper-PeerTalk: 116d8f857dc6ef55c7a5a75ea3ceaafe878aadc9
   Flipper-RSocket: 64e7431a55835eb953b0bf984ef3b90ae9fdddd7
-  FlipperKit: bc68102cd4952a258a23c9c1b316c7bec1fecf83
+  FlipperKit: ab353d41aea8aae2ea6daaf813e67496642f3d7d
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
   OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
   RCT-Folly: b39288cedafe50da43317ec7d91bcc8cc0abbf33
diff --git a/packages/rn-tester/README.md b/packages/rn-tester/README.md
index 4c9733acf95377..e1d52db22883a7 100644
--- a/packages/rn-tester/README.md
+++ b/packages/rn-tester/README.md
@@ -13,7 +13,7 @@ Before running the app, make sure you ran:
 ### Running on iOS
 
 Both macOS and Xcode are required.
-
+- `cd packages/rn-tester`
 - Install [Bundler](https://bundler.io/): `gem install bundler`. We use bundler to install the right version of [CocoaPods](https://cocoapods.org/) locally.
 - Install Bundler and CocoaPods dependencies: `bundle install && bundle exec pod install`
 - Open the generated `RNTesterPods.xcworkspace`. This is not checked in, as it is generated by CocoaPods. Do not open `RNTesterPods.xcodeproj` directly.
diff --git a/packages/rn-tester/android/app/gradle.properties b/packages/rn-tester/android/app/gradle.properties
index bba40bc51018e2..5c93b3bca832dc 100644
--- a/packages/rn-tester/android/app/gradle.properties
+++ b/packages/rn-tester/android/app/gradle.properties
@@ -10,4 +10,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0
+FLIPPER_VERSION=0.54.0
diff --git a/scripts/react_native_pods.rb b/scripts/react_native_pods.rb
index ffdbfee75bfe1a..213f8543398c21 100644
--- a/scripts/react_native_pods.rb
+++ b/scripts/react_native_pods.rb
@@ -70,7 +70,7 @@ def use_react_native! (options={})
 end
 
 def use_flipper!(versions = {}, configurations: ['Debug'])
-  versions['Flipper'] ||= '~> 0.41.1'
+  versions['Flipper'] ||= '~> 0.54.0'
   versions['Flipper-DoubleConversion'] ||= '1.1.7'
   versions['Flipper-Folly'] ||= '~> 2.2'
   versions['Flipper-Glog'] ||= '0.3.6'
diff --git a/template/android/gradle.properties b/template/android/gradle.properties
index 04ca0ef29e7d10..3bdbd3d4e90ec3 100644
--- a/template/android/gradle.properties
+++ b/template/android/gradle.properties
@@ -25,4 +25,4 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.37.0
+FLIPPER_VERSION=0.54.0

From fa44c46e37baabc5664e860ac83c90cfdc9f4d68 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 18 Sep 2020 16:35:46 -0700
Subject: [PATCH 032/241] Fix flattening/unflattening case on Android

Summary:
There are cases where we Delete+Create a node in the same frame. Practically, the new differ should prevent this, but we don't want to rely on that necessarily.

See comments for further justification on why deleteView can do less work overall.

In reparenting cases, this causes crashes because dropView removes *and deletes* children that shouldn't necessarily be deleted.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23775453

fbshipit-source-id: c577c5af8c27cfb185d527f0afd8aeb08ee3a5fe
---
 .../react/fabric/mounting/MountingManager.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
index 4629668d4944b4..41cf97c71fb095 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
@@ -577,13 +577,15 @@ public void deleteView(int reactTag) {
       return;
     }
 
-    View view = viewState.mView;
-
-    if (view != null) {
-      dropView(view, false);
-    } else {
-      mTagToViewState.remove(reactTag);
-    }
+    // To delete we simply remove the tag from the registry.
+    // In the past we called dropView here, but we want to rely on either
+    // (1) the correct set of MountInstructions being sent to the platform
+    // and/or (2) dropView being called by stopSurface.
+    // If Views are orphaned at this stage and leaked, it's a problem in
+    // the differ or LayoutAnimations, not MountingManager.
+    // Additionally, as documented in `dropView`, we cannot always trust a
+    // view's children to be up-to-date.
+    mTagToViewState.remove(reactTag);
   }
 
   @UiThread

From 03448715af55a52a67fd218f55cfc218e8d2591b Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 18 Sep 2020 16:35:46 -0700
Subject: [PATCH 033/241] Have BatchMountItem log the exact item that crashes

Summary:
Because BatchMountItem executes many items, sometimes it's unclear which MountItem causes a crash. Catch and log the exact item.

This shouldn't cause perf regressions because we have a try/catch block in FabricUIManager where execute is called.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23775500

fbshipit-source-id: c878e085c23d3d3a7ef02a34e5aca57759376aa6
---
 .../mounting/mountitems/BatchMountItem.java     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java
index d685be1ae02868..fc908e2deedc29 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/mountitems/BatchMountItem.java
@@ -8,6 +8,7 @@
 package com.facebook.react.fabric.mounting.mountitems;
 
 import androidx.annotation.NonNull;
+import com.facebook.common.logging.FLog;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
@@ -70,8 +71,20 @@ private void endMarkers() {
   public void execute(@NonNull MountingManager mountingManager) {
     beginMarkers("mountViews");
 
-    for (int mountItemIndex = 0; mountItemIndex < mSize; mountItemIndex++) {
-      mMountItems[mountItemIndex].execute(mountingManager);
+    int mountItemIndex = 0;
+    try {
+      for (; mountItemIndex < mSize; mountItemIndex++) {
+        mMountItems[mountItemIndex].execute(mountingManager);
+      }
+    } catch (RuntimeException e) {
+      FLog.e(
+          TAG,
+          "Caught exception executing mountItem @"
+              + mountItemIndex
+              + ": "
+              + mMountItems[mountItemIndex].toString(),
+          e);
+      throw e;
     }
 
     endMarkers();

From 752e709b51eaaf16db9c3704654d98580948d181 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 18 Sep 2020 16:35:46 -0700
Subject: [PATCH 034/241] Additional differ test: flattening differ should not
 produce DELETE and CREATE mutation for the same tag in the same frame

Summary:
See additional assertion. Tests still pass, so no other change was necessary.

Changelog: [Internal]

Differential Revision: D23775553

fbshipit-source-id: 57d3191f25dd55ab4da189207f6d201a31b175e0
---
 .../tests/ShadowTreeLifeCycleTest.cpp         | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
index 851231da950841..46d2fc4c6cdd25 100644
--- a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
@@ -5,11 +5,14 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#include <vector>
+
 #include <glog/logging.h>
 #include <gtest/gtest.h>
 
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/stubs.h>
 
@@ -102,6 +105,25 @@ static void testShadowNodeTreeLifeCycle(
       auto mutations = calculateShadowViewMutations(
           *currentRootNode, *nextRootNode, useFlattener);
 
+      // If using flattener: make sure that in a single frame, a DELETE for a view is not
+      // followed by a CREATE for the same view.
+      if (useFlattener) {
+        std::vector<int> deletedTags{};
+        for (auto const& mutation : mutations) {
+          if (mutation.type == ShadowViewMutation::Type::Delete) {
+            deletedTags.push_back(mutation.oldChildShadowView.tag);
+          }
+        }
+        for (auto const& mutation : mutations) {
+          if (mutation.type == ShadowViewMutation::Type::Create) {
+            if (std::find(deletedTags.begin(), deletedTags.end(), mutation.newChildShadowView.tag) != deletedTags.end()) {
+              LOG(ERROR) << "Deleted tag was recreated in mutations list: [" << mutation.newChildShadowView.tag << "]";
+              FAIL();
+            }
+          }
+        }
+      }
+
       // Mutating the view tree.
       viewTree.mutate(mutations);
 

From 1ddc6542c79b7a4390c1c1b92db603de2932fdf1 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Fri, 18 Sep 2020 17:05:10 -0700
Subject: [PATCH 035/241] Fabric: Removing catching all exceptions in
 UIManager::completeRoot

Summary:
This is a revert of D23529233 (https://github.com/facebook/react-native/commit/902611f14837752353e919dd1740812ec7260fb8).
It turns out it was a bad idea. With this catch-all thing, we don't get new information. Yeah, we crash earlier now but seems we have even less information about the crash. :(

I think D23754284 (https://github.com/facebook/react-native/commit/04c874bd9c6b15274fd87acf10cb3533b2eabc0d) should fix the issue.

Changelog: [Internal] Fabric-specific internal change.

Original commit changeset: 7ac7fb26ac08

Reviewed By: sammy-SC

Differential Revision: D23786086

fbshipit-source-id: 86784df0193abfb7328c4d5a16a9af4214e9a161
---
 .../renderer/uimanager/UIManagerBinding.cpp   | 49 ++++++-------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
index 5c2765ca3996f9..0633fbcc6e6993 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
@@ -430,28 +430,17 @@ jsi::Value UIManagerBinding::get(
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
               size_t count) -> jsi::Value {
-            try {
-              auto surfaceId = surfaceIdFromValue(runtime, arguments[0]);
-              auto shadowNodeList =
-                  shadowNodeListFromValue(runtime, arguments[1]);
-
-              if (sharedUIManager->backgroundExecutor_) {
-                sharedUIManager->backgroundExecutor_(
-                    [sharedUIManager, surfaceId, shadowNodeList] {
-                      sharedUIManager->completeSurface(
-                          surfaceId, shadowNodeList);
-                    });
-              } else {
-                uiManager->completeSurface(surfaceId, shadowNodeList);
-              }
-            } catch (std::exception const &e) {
-              LOG(ERROR) << "Exception in UIManagerBinding::completeRoot(): "
-                         << e.what();
-              abort();
-            } catch (...) {
-              LOG(ERROR)
-                  << "Exception in UIManagerBinding::completeRoot(): Unknown.";
-              abort();
+            auto surfaceId = surfaceIdFromValue(runtime, arguments[0]);
+            auto shadowNodeList =
+                shadowNodeListFromValue(runtime, arguments[1]);
+
+            if (sharedUIManager->backgroundExecutor_) {
+              sharedUIManager->backgroundExecutor_(
+                  [sharedUIManager, surfaceId, shadowNodeList] {
+                    sharedUIManager->completeSurface(surfaceId, shadowNodeList);
+                  });
+            } else {
+              uiManager->completeSurface(surfaceId, shadowNodeList);
             }
 
             return jsi::Value::undefined();
@@ -468,19 +457,9 @@ jsi::Value UIManagerBinding::get(
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
               size_t count) -> jsi::Value {
-            try {
-              uiManager->completeSurface(
-                  surfaceIdFromValue(runtime, arguments[0]),
-                  shadowNodeListFromValue(runtime, arguments[1]));
-            } catch (std::exception const &e) {
-              LOG(ERROR) << "Exception in UIManagerBinding::completeRoot(): "
-                         << e.what();
-              abort();
-            } catch (...) {
-              LOG(ERROR)
-                  << "Exception in UIManagerBinding::completeRoot(): Unknown.";
-              abort();
-            }
+            uiManager->completeSurface(
+                surfaceIdFromValue(runtime, arguments[0]),
+                shadowNodeListFromValue(runtime, arguments[1]));
 
             return jsi::Value::undefined();
           });

From 57dd48b2464ac04b860f2f69cb4f131990fe4dbd Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Fri, 18 Sep 2020 17:05:10 -0700
Subject: [PATCH 036/241] Fabric: Marking all JS function lambdas `noexcept` in
 UIManagerBinding

Summary:
Exceptions in C++ work quite differently from exceptions in other languages. To make exceptions actually work **correctly** all the code needs to be written with "exceptions in mind" (e.g., see https://www.stroustrup.com/except.pdf). In short, if the code is not "exceptions ready", throwing an exception causes memory leaks, dangling pointers, and invariant violations all over the place, which will probably cause another crashes down the road (which will be especially hard to investigate and attribute to the original issue).
Fabric Core (Layout, Props parsing, ShadowNodes management, and so on) does not use exceptions because in most (all?) the cases the exception is now recoverable. So, if a program detects some internal state invariant violation or missing some resource, *logically* it's fatal. We also don't want to pay code-size and performance tax for exception support, so that's why we don't use them. It's just not the right fit for Fabric Core.

This does not mean that exceptions don't happen though. C++ standard library can throw them... sometimes. And if our library is compiled with exceptions enabled (still the case, unfortunately), an exception can bubble to JavaScript code and losing all context down the road. And it's hard to investigate such crashes. To isolate those occasional exceptions inside C++ core we are marking all C++/JS boundaries with `noexcept` that stops the bubbling.

I hope that will give us much more informative crash reports.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D23787492

fbshipit-source-id: 0822dbf36fc680c15b02b5cd0f2d87328296b642
---
 .../RCTSurfacePresenterBridgeAdapter.mm       |   2 +-
 .../react/renderer/core/EventTarget.cpp       |   2 +-
 ReactCommon/react/renderer/core/EventTarget.h |   2 +-
 .../react/renderer/uimanager/UIManager.cpp    |   4 +-
 .../react/renderer/uimanager/UIManager.h      |   4 +-
 .../uimanager/UIManagerAnimationDelegate.h    |   4 +-
 .../renderer/uimanager/UIManagerBinding.cpp   | 138 +++++++++---------
 .../renderer/uimanager/UIManagerBinding.h     |  14 +-
 .../react/renderer/uimanager/primitives.h     |  16 +-
 9 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
index a70c494d937838..8c20e934870864 100644
--- a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
+++ b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
@@ -48,7 +48,7 @@ static RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge)
   auto bridgeWeakWrapper = wrapManagedObjectWeakly([bridge batchedBridge] ?: bridge);
 
   RuntimeExecutor runtimeExecutor = [bridgeWeakWrapper](
-                                        std::function<void(facebook::jsi::Runtime & runtime)> &&callback) {
+                                        std::function<void(facebook::jsi::Runtime &runtime)> &&callback) {
     RCTBridge *bridge = unwrapManagedObjectWeakly(bridgeWeakWrapper);
 
     RCTAssert(bridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil at the moment of scheduling a call.");
diff --git a/ReactCommon/react/renderer/core/EventTarget.cpp b/ReactCommon/react/renderer/core/EventTarget.cpp
index c9f418c2d88fa6..01a5a77bd50f48 100644
--- a/ReactCommon/react/renderer/core/EventTarget.cpp
+++ b/ReactCommon/react/renderer/core/EventTarget.cpp
@@ -14,7 +14,7 @@ using Tag = EventTarget::Tag;
 
 EventTarget::EventTarget(
     jsi::Runtime &runtime,
-    const jsi::Value &instanceHandle,
+    jsi::Value const &instanceHandle,
     Tag tag)
     : weakInstanceHandle_(
           jsi::WeakObject(runtime, instanceHandle.asObject(runtime))),
diff --git a/ReactCommon/react/renderer/core/EventTarget.h b/ReactCommon/react/renderer/core/EventTarget.h
index 8bd7a03a1995ac..92f382a96c4965 100644
--- a/ReactCommon/react/renderer/core/EventTarget.h
+++ b/ReactCommon/react/renderer/core/EventTarget.h
@@ -35,7 +35,7 @@ class EventTarget {
   /*
    * Constructs an EventTarget from a weak instance handler and a tag.
    */
-  EventTarget(jsi::Runtime &runtime, const jsi::Value &instanceHandle, Tag tag);
+  EventTarget(jsi::Runtime &runtime, jsi::Value const &instanceHandle, Tag tag);
 
   /*
    * Sets the `enabled` flag that allows creating a strong instance handle from
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.cpp b/ReactCommon/react/renderer/uimanager/UIManager.cpp
index e4c4cdb8f5b461..a8b4c6964808fc 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManager.cpp
@@ -311,8 +311,8 @@ void UIManager::dispatchCommand(
 void UIManager::configureNextLayoutAnimation(
     jsi::Runtime &runtime,
     RawValue const &config,
-    const jsi::Value &successCallback,
-    const jsi::Value &failureCallback) const {
+    jsi::Value const &successCallback,
+    jsi::Value const &failureCallback) const {
   if (animationDelegate_) {
     animationDelegate_->uiManagerDidConfigureNextLayoutAnimation(
         runtime,
diff --git a/ReactCommon/react/renderer/uimanager/UIManager.h b/ReactCommon/react/renderer/uimanager/UIManager.h
index 4e53389615d04f..1235cf3532af14 100644
--- a/ReactCommon/react/renderer/uimanager/UIManager.h
+++ b/ReactCommon/react/renderer/uimanager/UIManager.h
@@ -147,8 +147,8 @@ class UIManager final : public ShadowTreeDelegate {
   void configureNextLayoutAnimation(
       jsi::Runtime &runtime,
       RawValue const &config,
-      const jsi::Value &successCallback,
-      const jsi::Value &failureCallback) const;
+      jsi::Value const &successCallback,
+      jsi::Value const &failureCallback) const;
 
   ShadowTreeRegistry const &getShadowTreeRegistry() const;
 
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
index cfbb0c00e558ea..9e55d1f3862e91 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerAnimationDelegate.h
@@ -26,8 +26,8 @@ class UIManagerAnimationDelegate {
   virtual void uiManagerDidConfigureNextLayoutAnimation(
       jsi::Runtime &runtime,
       RawValue const &config,
-      const jsi::Value &successCallback,
-      const jsi::Value &failureCallback) const = 0;
+      jsi::Value const &successCallback,
+      jsi::Value const &failureCallback) const = 0;
 
   /**
    * Set ComponentDescriptor registry.
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
index 0633fbcc6e6993..024eb3424dc573 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
@@ -17,7 +17,7 @@ namespace react {
 
 static jsi::Object getModule(
     jsi::Runtime &runtime,
-    const std::string &moduleName) {
+    std::string const &moduleName) {
   auto batchedBridge =
       runtime.global().getPropertyAsObject(runtime, "__fbBatchedBridge");
   auto getCallableModule =
@@ -82,8 +82,8 @@ void UIManagerBinding::attach(std::shared_ptr<UIManager> const &uiManager) {
 void UIManagerBinding::startSurface(
     jsi::Runtime &runtime,
     SurfaceId surfaceId,
-    const std::string &moduleName,
-    const folly::dynamic &initalProps) const {
+    std::string const &moduleName,
+    folly::dynamic const &initalProps) const {
   folly::dynamic parameters = folly::dynamic::object();
   parameters["rootTag"] = surfaceId;
   parameters["initialProps"] = initalProps;
@@ -128,9 +128,9 @@ void UIManagerBinding::stopSurface(jsi::Runtime &runtime, SurfaceId surfaceId)
 
 void UIManagerBinding::dispatchEvent(
     jsi::Runtime &runtime,
-    const EventTarget *eventTarget,
-    const std::string &type,
-    const ValueFactory &payloadFactory) const {
+    EventTarget const *eventTarget,
+    std::string const &type,
+    ValueFactory const &payloadFactory) const {
   SystraceSection s("UIManagerBinding::dispatchEvent");
 
   auto payload = payloadFactory(runtime);
@@ -158,7 +158,7 @@ void UIManagerBinding::dispatchEvent(
     : jsi::Value::null();
 
   auto &eventHandlerWrapper =
-      static_cast<const EventHandlerWrapper &>(*eventHandler_);
+      static_cast<EventHandlerWrapper const &>(*eventHandler_);
 
   eventHandlerWrapper.callback.call(
       runtime,
@@ -173,7 +173,7 @@ void UIManagerBinding::invalidate() const {
 
 jsi::Value UIManagerBinding::get(
     jsi::Runtime &runtime,
-    const jsi::PropNameID &name) {
+    jsi::PropNameID const &name) {
   auto methodName = name.utf8(runtime);
 
   // Convert shared_ptr<UIManager> to a raw ptr
@@ -213,9 +213,9 @@ jsi::Value UIManagerBinding::get(
         5,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->createNode(
@@ -235,9 +235,9 @@ jsi::Value UIManagerBinding::get(
         1,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(shadowNodeFromValue(runtime, arguments[0])));
@@ -251,9 +251,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           uiManager->setJSResponder(
               shadowNodeFromValue(runtime, arguments[0]),
               arguments[1].getBool());
@@ -269,9 +269,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           auto node = shadowNodeFromValue(runtime, arguments[0]);
           auto locationX = (Float)arguments[1].getNumber();
           auto locationY = (Float)arguments[2].getNumber();
@@ -299,9 +299,9 @@ jsi::Value UIManagerBinding::get(
         0,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           uiManager->clearJSResponder();
 
           return jsi::Value::undefined();
@@ -316,9 +316,9 @@ jsi::Value UIManagerBinding::get(
         1,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
@@ -335,10 +335,10 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
-          const auto &rawProps = RawProps(runtime, arguments[1]);
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
+          auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
@@ -356,10 +356,10 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
-          const auto &rawProps = RawProps(runtime, arguments[1]);
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
+          auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
@@ -376,9 +376,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           uiManager->appendChild(
               shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]));
@@ -392,9 +392,9 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [](jsi::Runtime &runtime,
-           const jsi::Value &thisValue,
-           const jsi::Value *arguments,
-           size_t count) -> jsi::Value {
+           jsi::Value const &thisValue,
+           jsi::Value const *arguments,
+           size_t count) noexcept -> jsi::Value {
           auto shadowNodeList =
               std::make_shared<SharedShadowNodeList>(SharedShadowNodeList({}));
           return valueFromShadowNodeList(runtime, shadowNodeList);
@@ -407,9 +407,9 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [](jsi::Runtime &runtime,
-           const jsi::Value &thisValue,
-           const jsi::Value *arguments,
-           size_t count) -> jsi::Value {
+           jsi::Value const &thisValue,
+           jsi::Value const *arguments,
+           size_t count) noexcept -> jsi::Value {
           auto shadowNodeList = shadowNodeListFromValue(runtime, arguments[0]);
           auto shadowNode = shadowNodeFromValue(runtime, arguments[1]);
           shadowNodeList->push_back(shadowNode);
@@ -429,7 +429,7 @@ jsi::Value UIManagerBinding::get(
               jsi::Runtime &runtime,
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
-              size_t count) -> jsi::Value {
+              size_t count) noexcept -> jsi::Value {
             auto surfaceId = surfaceIdFromValue(runtime, arguments[0]);
             auto shadowNodeList =
                 shadowNodeListFromValue(runtime, arguments[1]);
@@ -456,7 +456,7 @@ jsi::Value UIManagerBinding::get(
               jsi::Runtime &runtime,
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
-              size_t count) -> jsi::Value {
+              size_t count) noexcept -> jsi::Value {
             uiManager->completeSurface(
                 surfaceIdFromValue(runtime, arguments[0]),
                 shadowNodeListFromValue(runtime, arguments[1]));
@@ -473,9 +473,9 @@ jsi::Value UIManagerBinding::get(
         1,
         [this](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           auto eventHandler =
               arguments[0].getObject(runtime).getFunction(runtime);
           eventHandler_ =
@@ -491,9 +491,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -515,9 +515,9 @@ jsi::Value UIManagerBinding::get(
         3,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           uiManager->dispatchCommand(
               shadowNodeFromValue(runtime, arguments[0]),
               stringFromValue(runtime, arguments[1]),
@@ -535,9 +535,9 @@ jsi::Value UIManagerBinding::get(
         4,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -571,9 +571,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               nullptr,
@@ -606,9 +606,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               nullptr,
@@ -641,9 +641,9 @@ jsi::Value UIManagerBinding::get(
         2,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           uiManager->setNativeProps(
               *shadowNodeFromValue(runtime, arguments[0]),
               RawProps(runtime, arguments[1]));
@@ -659,9 +659,9 @@ jsi::Value UIManagerBinding::get(
         3,
         [uiManager](
             jsi::Runtime &runtime,
-            const jsi::Value &thisValue,
-            const jsi::Value *arguments,
-            size_t count) -> jsi::Value {
+            jsi::Value const &thisValue,
+            jsi::Value const *arguments,
+            size_t count) noexcept -> jsi::Value {
           uiManager->configureNextLayoutAnimation(
               runtime,
               // TODO: pass in JSI value instead of folly::dynamic to RawValue
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
index d4e133f59d38d4..d5616310716a19 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.h
@@ -47,8 +47,8 @@ class UIManagerBinding : public jsi::HostObject {
   void startSurface(
       jsi::Runtime &runtime,
       SurfaceId surfaceId,
-      const std::string &moduleName,
-      const folly::dynamic &initalProps) const;
+      std::string const &moduleName,
+      folly::dynamic const &initalProps) const;
 
   /*
    * Stops React Native Surface with given id.
@@ -62,9 +62,9 @@ class UIManagerBinding : public jsi::HostObject {
    */
   void dispatchEvent(
       jsi::Runtime &runtime,
-      const EventTarget *eventTarget,
-      const std::string &type,
-      const ValueFactory &payloadFactory) const;
+      EventTarget const *eventTarget,
+      std::string const &type,
+      ValueFactory const &payloadFactory) const;
 
   /*
    * Invalidates the binding and underlying UIManager.
@@ -78,11 +78,11 @@ class UIManagerBinding : public jsi::HostObject {
   /*
    * `jsi::HostObject` specific overloads.
    */
-  jsi::Value get(jsi::Runtime &runtime, const jsi::PropNameID &name) override;
+  jsi::Value get(jsi::Runtime &runtime, jsi::PropNameID const &name) override;
 
  private:
   std::shared_ptr<UIManager> uiManager_;
-  std::unique_ptr<const EventHandler> eventHandler_;
+  std::unique_ptr<EventHandler const> eventHandler_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/uimanager/primitives.h b/ReactCommon/react/renderer/uimanager/primitives.h
index cd9dde4a662c69..9fb2ea92786844 100644
--- a/ReactCommon/react/renderer/uimanager/primitives.h
+++ b/ReactCommon/react/renderer/uimanager/primitives.h
@@ -42,7 +42,7 @@ struct ShadowNodeListWrapper : public jsi::HostObject {
 
 inline static ShadowNode::Shared shadowNodeFromValue(
     jsi::Runtime &runtime,
-    const jsi::Value &value) {
+    jsi::Value const &value) {
   return value.getObject(runtime)
       .getHostObject<ShadowNodeWrapper>(runtime)
       ->shadowNode;
@@ -57,7 +57,7 @@ inline static jsi::Value valueFromShadowNode(
 
 inline static SharedShadowNodeUnsharedList shadowNodeListFromValue(
     jsi::Runtime &runtime,
-    const jsi::Value &value) {
+    jsi::Value const &value) {
   return value.getObject(runtime)
       .getHostObject<ShadowNodeListWrapper>(runtime)
       ->shadowNodeList;
@@ -72,31 +72,31 @@ inline static jsi::Value valueFromShadowNodeList(
 
 inline static SharedEventTarget eventTargetFromValue(
     jsi::Runtime &runtime,
-    const jsi::Value &eventTargetValue,
-    const jsi::Value &tagValue) {
+    jsi::Value const &eventTargetValue,
+    jsi::Value const &tagValue) {
   return std::make_shared<EventTarget>(
       runtime, eventTargetValue, tagValue.getNumber());
 }
 
-inline static Tag tagFromValue(jsi::Runtime &runtime, const jsi::Value &value) {
+inline static Tag tagFromValue(jsi::Runtime &runtime, jsi::Value const &value) {
   return (Tag)value.getNumber();
 }
 
 inline static SurfaceId surfaceIdFromValue(
     jsi::Runtime &runtime,
-    const jsi::Value &value) {
+    jsi::Value const &value) {
   return (SurfaceId)value.getNumber();
 }
 
 inline static std::string stringFromValue(
     jsi::Runtime &runtime,
-    const jsi::Value &value) {
+    jsi::Value const &value) {
   return value.getString(runtime).utf8(runtime);
 }
 
 inline static folly::dynamic commandArgsFromValue(
     jsi::Runtime &runtime,
-    const jsi::Value &value) {
+    jsi::Value const &value) {
   return jsi::dynamicFromValue(runtime, value);
 }
 

From 7c93f5b0015306b08f59f07254ea99c81a673135 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Sat, 19 Sep 2020 00:40:18 -0700
Subject: [PATCH 037/241] Move TurboModule Core from ReactCommon/turbomodule to
 ReactCommon/react/nativemodule

Summary:
This diff moves the code of TurboModule Core from ReactCommon/turbomodule to ReactCommon/react/nativemodule

For iOS: Pod spec name stays as "ReactCommon/turbomodule/..." for now, only the source/header location is affected. The target will be renamed/restructured closer to TurboModule rollout.

changelog: [internal] Internal

Reviewed By: RSNara

Differential Revision: D23362253

fbshipit-source-id: c2c8207578e50821c7573255d4319b9051b58a37
---
 Libraries/FBReactNativeSpec/BUCK                       |  2 +-
 .../src/main/java/com/facebook/fbreact/specs/BUCK      |  2 +-
 .../java/com/facebook/react/turbomodule/core/jni/BUCK  |  2 +-
 ReactCommon/ReactCommon.podspec                        | 10 ++++++----
 .../{turbomodule => react/nativemodule}/.clang-tidy    |  0
 .../{turbomodule => react/nativemodule}/core/BUCK      |  0
 .../nativemodule}/core/LongLivedObject.cpp             |  0
 .../nativemodule}/core/LongLivedObject.h               |  0
 .../nativemodule}/core/TurboCxxModule.cpp              |  0
 .../nativemodule}/core/TurboCxxModule.h                |  0
 .../nativemodule}/core/TurboModule.cpp                 |  0
 .../nativemodule}/core/TurboModule.h                   |  0
 .../nativemodule}/core/TurboModuleBinding.cpp          |  0
 .../nativemodule}/core/TurboModuleBinding.h            |  0
 .../nativemodule}/core/TurboModulePerfLogger.cpp       |  0
 .../nativemodule}/core/TurboModulePerfLogger.h         |  0
 .../nativemodule}/core/TurboModuleUtils.cpp            |  0
 .../nativemodule}/core/TurboModuleUtils.h              |  0
 .../core/platform/android/JavaTurboModule.cpp          |  0
 .../core/platform/android/JavaTurboModule.h            |  0
 .../nativemodule}/core/platform/ios/RCTTurboModule.h   |  0
 .../nativemodule}/core/platform/ios/RCTTurboModule.mm  |  0
 .../core/platform/ios/RCTTurboModuleManager.h          |  0
 .../core/platform/ios/RCTTurboModuleManager.mm         |  0
 .../{turbomodule => react/nativemodule}/samples/BUCK   |  2 +-
 .../samples/NativeSampleTurboCxxModuleSpecJSI.cpp      |  0
 .../samples/NativeSampleTurboCxxModuleSpecJSI.h        |  0
 .../nativemodule}/samples/SampleTurboCxxModule.cpp     |  0
 .../nativemodule}/samples/SampleTurboCxxModule.h       |  0
 .../platform/ios/RCTNativeSampleTurboModuleSpec.h      |  0
 .../platform/ios/RCTNativeSampleTurboModuleSpec.mm     |  0
 .../samples/platform/ios/RCTSampleTurboCxxModule.h     |  0
 .../samples/platform/ios/RCTSampleTurboCxxModule.mm    |  0
 .../samples/platform/ios/RCTSampleTurboModule.h        |  0
 .../samples/platform/ios/RCTSampleTurboModule.mm       |  0
 .../platform/ios/SampleTurboCxxModuleLegacyImpl.cpp    |  0
 .../platform/ios/SampleTurboCxxModuleLegacyImpl.h      |  0
 packages/react-native-codegen/DEFS.bzl                 |  2 +-
 packages/rn-tester/Podfile.lock                        |  2 +-
 39 files changed, 12 insertions(+), 10 deletions(-)
 rename ReactCommon/{turbomodule => react/nativemodule}/.clang-tidy (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/BUCK (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/LongLivedObject.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/LongLivedObject.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboCxxModule.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboCxxModule.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModule.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModule.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModuleBinding.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModuleBinding.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModulePerfLogger.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModulePerfLogger.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModuleUtils.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/TurboModuleUtils.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/platform/android/JavaTurboModule.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/platform/android/JavaTurboModule.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/platform/ios/RCTTurboModule.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/platform/ios/RCTTurboModule.mm (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/platform/ios/RCTTurboModuleManager.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/core/platform/ios/RCTTurboModuleManager.mm (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/BUCK (97%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/NativeSampleTurboCxxModuleSpecJSI.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/NativeSampleTurboCxxModuleSpecJSI.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/SampleTurboCxxModule.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/SampleTurboCxxModule.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/RCTSampleTurboCxxModule.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/RCTSampleTurboCxxModule.mm (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/RCTSampleTurboModule.h (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/RCTSampleTurboModule.mm (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp (100%)
 rename ReactCommon/{turbomodule => react/nativemodule}/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h (100%)

diff --git a/Libraries/FBReactNativeSpec/BUCK b/Libraries/FBReactNativeSpec/BUCK
index 3ab64ac8a7a14a..96f09f1d31c205 100644
--- a/Libraries/FBReactNativeSpec/BUCK
+++ b/Libraries/FBReactNativeSpec/BUCK
@@ -20,6 +20,6 @@ fb_apple_library(
     deps = [
         "//xplat/js/react-native-github:RCTTypeSafety",
         "//xplat/js/react-native-github/Libraries/RCTRequired:RCTRequired",
-        react_native_xplat_target_apple("turbomodule/core:core"),
+        react_native_xplat_target_apple("react/nativemodule/core:core"),
     ],
 )
diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/BUCK b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/BUCK
index 94067e4f20f33d..49f617762e45c9 100644
--- a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/BUCK
@@ -51,7 +51,7 @@ rn_xplat_cxx_library(
         react_native_xplat_target("cxxreact:bridge"),
     ],
     exported_deps = ([
-        react_native_xplat_target("turbomodule/core:core"),
+        react_native_xplat_target("react/nativemodule/core:core"),
     ]) + ([
         "//xplat/jsi:jsi",
     ]) if not IS_OSS_BUILD else [],
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
index 84258474072b91..934dd73ac5d5c7 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK
@@ -34,7 +34,7 @@ rn_xplat_cxx_library(
     exported_deps = [
         ":callinvokerholder",
         "//xplat/jsi:jsi",
-        react_native_xplat_target("turbomodule/core:core"),
+        react_native_xplat_target("react/nativemodule/core:core"),
         react_native_target("java/com/facebook/react/reactperflogger/jni:jni"),
     ],
 )
diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec
index bad800f338c274..5c0efe17a630dd 100644
--- a/ReactCommon/ReactCommon.podspec
+++ b/ReactCommon/ReactCommon.podspec
@@ -36,6 +36,8 @@ Pod::Spec.new do |s|
                                "USE_HEADERMAP" => "YES",
                                "CLANG_CXX_LANGUAGE_STANDARD" => "c++14" }
 
+  # TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
+  # Note: Update this only when ready to minimize breaking changes.
   s.subspec "turbomodule" do |ss|
     ss.dependency "React-callinvoker", version
     ss.dependency "React-perflogger", version
@@ -47,13 +49,13 @@ Pod::Spec.new do |s|
     ss.dependency "glog"
 
     ss.subspec "core" do |sss|
-      sss.source_files = "turbomodule/core/*.{cpp,h}",
-                         "turbomodule/core/platform/ios/*.{mm,cpp,h}"
+      sss.source_files = "react/nativemodule/core/*.{cpp,h}",
+                         "react/nativemodule/core/platform/ios/*.{mm,cpp,h}"
     end
 
     ss.subspec "samples" do |sss|
-      sss.source_files = "turbomodule/samples/*.{cpp,h}",
-                         "turbomodule/samples/platform/ios/*.{mm,cpp,h}"
+      sss.source_files = "react/nativemodule/samples/*.{cpp,h}",
+                         "react/nativemodule/samples/platform/ios/*.{mm,cpp,h}"
       sss.dependency "ReactCommon/turbomodule/core", version
     end
   end
diff --git a/ReactCommon/turbomodule/.clang-tidy b/ReactCommon/react/nativemodule/.clang-tidy
similarity index 100%
rename from ReactCommon/turbomodule/.clang-tidy
rename to ReactCommon/react/nativemodule/.clang-tidy
diff --git a/ReactCommon/turbomodule/core/BUCK b/ReactCommon/react/nativemodule/core/BUCK
similarity index 100%
rename from ReactCommon/turbomodule/core/BUCK
rename to ReactCommon/react/nativemodule/core/BUCK
diff --git a/ReactCommon/turbomodule/core/LongLivedObject.cpp b/ReactCommon/react/nativemodule/core/LongLivedObject.cpp
similarity index 100%
rename from ReactCommon/turbomodule/core/LongLivedObject.cpp
rename to ReactCommon/react/nativemodule/core/LongLivedObject.cpp
diff --git a/ReactCommon/turbomodule/core/LongLivedObject.h b/ReactCommon/react/nativemodule/core/LongLivedObject.h
similarity index 100%
rename from ReactCommon/turbomodule/core/LongLivedObject.h
rename to ReactCommon/react/nativemodule/core/LongLivedObject.h
diff --git a/ReactCommon/turbomodule/core/TurboCxxModule.cpp b/ReactCommon/react/nativemodule/core/TurboCxxModule.cpp
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboCxxModule.cpp
rename to ReactCommon/react/nativemodule/core/TurboCxxModule.cpp
diff --git a/ReactCommon/turbomodule/core/TurboCxxModule.h b/ReactCommon/react/nativemodule/core/TurboCxxModule.h
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboCxxModule.h
rename to ReactCommon/react/nativemodule/core/TurboCxxModule.h
diff --git a/ReactCommon/turbomodule/core/TurboModule.cpp b/ReactCommon/react/nativemodule/core/TurboModule.cpp
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModule.cpp
rename to ReactCommon/react/nativemodule/core/TurboModule.cpp
diff --git a/ReactCommon/turbomodule/core/TurboModule.h b/ReactCommon/react/nativemodule/core/TurboModule.h
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModule.h
rename to ReactCommon/react/nativemodule/core/TurboModule.h
diff --git a/ReactCommon/turbomodule/core/TurboModuleBinding.cpp b/ReactCommon/react/nativemodule/core/TurboModuleBinding.cpp
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModuleBinding.cpp
rename to ReactCommon/react/nativemodule/core/TurboModuleBinding.cpp
diff --git a/ReactCommon/turbomodule/core/TurboModuleBinding.h b/ReactCommon/react/nativemodule/core/TurboModuleBinding.h
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModuleBinding.h
rename to ReactCommon/react/nativemodule/core/TurboModuleBinding.h
diff --git a/ReactCommon/turbomodule/core/TurboModulePerfLogger.cpp b/ReactCommon/react/nativemodule/core/TurboModulePerfLogger.cpp
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModulePerfLogger.cpp
rename to ReactCommon/react/nativemodule/core/TurboModulePerfLogger.cpp
diff --git a/ReactCommon/turbomodule/core/TurboModulePerfLogger.h b/ReactCommon/react/nativemodule/core/TurboModulePerfLogger.h
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModulePerfLogger.h
rename to ReactCommon/react/nativemodule/core/TurboModulePerfLogger.h
diff --git a/ReactCommon/turbomodule/core/TurboModuleUtils.cpp b/ReactCommon/react/nativemodule/core/TurboModuleUtils.cpp
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModuleUtils.cpp
rename to ReactCommon/react/nativemodule/core/TurboModuleUtils.cpp
diff --git a/ReactCommon/turbomodule/core/TurboModuleUtils.h b/ReactCommon/react/nativemodule/core/TurboModuleUtils.h
similarity index 100%
rename from ReactCommon/turbomodule/core/TurboModuleUtils.h
rename to ReactCommon/react/nativemodule/core/TurboModuleUtils.h
diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp b/ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.cpp
similarity index 100%
rename from ReactCommon/turbomodule/core/platform/android/JavaTurboModule.cpp
rename to ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.cpp
diff --git a/ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h b/ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.h
similarity index 100%
rename from ReactCommon/turbomodule/core/platform/android/JavaTurboModule.h
rename to ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.h
diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h
similarity index 100%
rename from ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.h
rename to ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.h
diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
similarity index 100%
rename from ReactCommon/turbomodule/core/platform/ios/RCTTurboModule.mm
rename to ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.h b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
similarity index 100%
rename from ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.h
rename to ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.h
diff --git a/ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
similarity index 100%
rename from ReactCommon/turbomodule/core/platform/ios/RCTTurboModuleManager.mm
rename to ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModuleManager.mm
diff --git a/ReactCommon/turbomodule/samples/BUCK b/ReactCommon/react/nativemodule/samples/BUCK
similarity index 97%
rename from ReactCommon/turbomodule/samples/BUCK
rename to ReactCommon/react/nativemodule/samples/BUCK
index ae15f4706b606f..c760c2f06218ab 100644
--- a/ReactCommon/turbomodule/samples/BUCK
+++ b/ReactCommon/react/nativemodule/samples/BUCK
@@ -75,6 +75,6 @@ rn_xplat_cxx_library(
     ],
     exported_deps = [
         "//xplat/jsi:jsi",
-        react_native_xplat_target("turbomodule/core:core"),
+        react_native_xplat_target("react/nativemodule/core:core"),
     ],
 )
diff --git a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp b/ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp
similarity index 100%
rename from ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp
rename to ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp
diff --git a/ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h b/ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.h
similarity index 100%
rename from ReactCommon/turbomodule/samples/NativeSampleTurboCxxModuleSpecJSI.h
rename to ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.h
diff --git a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp b/ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.cpp
similarity index 100%
rename from ReactCommon/turbomodule/samples/SampleTurboCxxModule.cpp
rename to ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.cpp
diff --git a/ReactCommon/turbomodule/samples/SampleTurboCxxModule.h b/ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.h
similarity index 100%
rename from ReactCommon/turbomodule/samples/SampleTurboCxxModule.h
rename to ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.h
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h b/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.h
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm b/ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm
rename to ReactCommon/react/nativemodule/samples/platform/ios/RCTNativeSampleTurboModuleSpec.mm
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.h
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.h
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
rename to ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboCxxModule.mm
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.h b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.h
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.h
diff --git a/ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.mm b/ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/RCTSampleTurboModule.mm
rename to ReactCommon/react/nativemodule/samples/platform/ios/RCTSampleTurboModule.mm
diff --git a/ReactCommon/turbomodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp b/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp
rename to ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.cpp
diff --git a/ReactCommon/turbomodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h b/ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h
similarity index 100%
rename from ReactCommon/turbomodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h
rename to ReactCommon/react/nativemodule/samples/platform/ios/SampleTurboCxxModuleLegacyImpl.h
diff --git a/packages/react-native-codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl
index da49dac7fbdb32..33abd24eeaffe5 100644
--- a/packages/react-native-codegen/DEFS.bzl
+++ b/packages/react-native-codegen/DEFS.bzl
@@ -383,7 +383,7 @@ def rn_codegen_cxx_modules(
             ],
             visibility = ["PUBLIC"],
             exported_deps = [
-                react_native_xplat_target("turbomodule/core:core"),
+                react_native_xplat_target("react/nativemodule/core:core"),
             ],
         )
 
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 8b5b2eda2819e1..6f1ee93179b05f 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -524,7 +524,7 @@ SPEC CHECKSUMS:
   React-RCTText: 6c01963d3e562109f5548262b09b1b2bc260dd60
   React-RCTVibration: 0997fcaf753c7ac0a341177db120eebc438484cf
   React-runtimeexecutor: 60dd6204a13f68a1aa1118870edcc604a791df2b
-  ReactCommon: 1f231b4fbed866032aa084ca23973063bbb51927
+  ReactCommon: 982fb4cf650ef68a435f3c0bfff76fbdda1ba663
   Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

From 7b82df287d36e39073d29e3ae3adbe82cf424055 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Sat, 19 Sep 2020 02:31:08 -0700
Subject: [PATCH 038/241] Notify ViewManagers when a View is deleted

Summary:
In a previous recent diff we changed Android's Delete mount instruction to *not* recursively delete the tree. This is fine, but because of that, we stopped calling `onDropViewInstance` when views are normally deleted.

Bring back that behaviour.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23801666

fbshipit-source-id: 54e6b52ab51fff2a45102e37077fe41081499888
---
 .../facebook/react/fabric/mounting/MountingManager.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
index 41cf97c71fb095..6ff40bda0ffb18 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
@@ -399,7 +399,7 @@ public void removeViewAt(final int tag, final int parentTag, final int index) {
       }
 
       throw new IllegalStateException(
-          "Tried to delete view ["
+          "Tried to remove view ["
               + tag
               + "] of parent ["
               + parentTag
@@ -586,6 +586,12 @@ public void deleteView(int reactTag) {
     // Additionally, as documented in `dropView`, we cannot always trust a
     // view's children to be up-to-date.
     mTagToViewState.remove(reactTag);
+
+    // For non-root views we notify viewmanager with {@link ViewManager#onDropInstance}
+    ViewManager viewManager = viewState.mViewManager;
+    if (!viewState.mIsRoot && viewManager != null) {
+      viewManager.onDropViewInstance(viewState.mView);
+    }
   }
 
   @UiThread

From 412fc7d3249a11e6a0af944303b8e8f6dd3791da Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Sun, 20 Sep 2020 08:16:56 -0700
Subject: [PATCH 039/241] Prevent calling onTextLayout with the same value

Summary:
Changelog: [internal]

In D23648430 (https://github.com/facebook/react-native/commit/a315e4cd30e4b8da841f587650146a62c868f67d) I made a mistake. I prevented calling `onTextLayout` unless there are attachments in the component. It fixed the problem because I unintentionally prevented `onTextLayout`  to be called. Therefore, changes from D23648430 (https://github.com/facebook/react-native/commit/a315e4cd30e4b8da841f587650146a62c868f67d) need to be reverted.

To prevent infinite loop in `onTextLayout`, ParagraphEventEmitter checks if `linesMeasurements` have changed before dispatching it to JS.

Reviewed By: shergin

Differential Revision: D23782717

fbshipit-source-id: 0e84ae4f46d79ce0cf4c7340cd32be6f562ae179
---
 .../components/text/ParagraphEventEmitter.cpp | 17 +++++++++------
 .../components/text/ParagraphEventEmitter.h   |  4 ++++
 .../components/text/ParagraphShadowNode.cpp   | 17 +++++----------
 .../textlayoutmanager/TextMeasureCache.cpp    | 21 ++++++++++++++++++-
 .../textlayoutmanager/TextMeasureCache.h      |  2 ++
 5 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
index 1295108286f14b..ee16f5d02655c9 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.cpp
@@ -38,12 +38,17 @@ static jsi::Value linesMeasurementsPayload(
 
 void ParagraphEventEmitter::onTextLayout(
     LinesMeasurements const &linesMeasurements) const {
-  dispatchEvent(
-      "textLayout",
-      [linesMeasurements](jsi::Runtime &runtime) {
-        return linesMeasurementsPayload(runtime, linesMeasurements);
-      },
-      EventPriority::AsynchronousBatched);
+  {
+    std::lock_guard<std::mutex> guard(linesMeasurementsMutex_);
+    if (linesMeasurementsMetrics_ == linesMeasurements) {
+      return;
+    }
+    linesMeasurementsMetrics_ = linesMeasurements;
+  }
+
+  dispatchEvent("textLayout", [linesMeasurements](jsi::Runtime &runtime) {
+    return linesMeasurementsPayload(runtime, linesMeasurements);
+  });
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
index b73eb967d5afb2..597ef6baa2ddcb 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
+++ b/ReactCommon/react/renderer/components/text/ParagraphEventEmitter.h
@@ -18,6 +18,10 @@ class ParagraphEventEmitter : public ViewEventEmitter {
   using ViewEventEmitter::ViewEventEmitter;
 
   void onTextLayout(LinesMeasurements const &linesMeasurements) const;
+
+ private:
+  mutable std::mutex linesMeasurementsMutex_;
+  mutable LinesMeasurements linesMeasurementsMetrics_;
 };
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
index b4fc65923a619d..2a7f0421dea480 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
@@ -164,18 +164,6 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
 
   updateStateIfNeeded(content);
 
-  if (content.attachments.empty()) {
-#ifndef ANDROID
-    if (getConcreteProps().onTextLayout) {
-      // `onTextLayout` needs to be called even if text is empty
-      // to be compatible with Paper.
-      getConcreteEventEmitter().onTextLayout({});
-    }
-#endif
-    // No attachments, nothing to layout.
-    return;
-  }
-
   auto measurement = textLayoutManager_->measure(
       AttributedStringBox{content.attributedString},
       content.paragraphAttributes,
@@ -191,6 +179,11 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
   }
 #endif
 
+  if (content.attachments.empty()) {
+    // No attachments to layout.
+    return;
+  }
+
   //  Iterating on attachments, we clone shadow nodes and moving
   //  `paragraphShadowNode` that represents clones of `this` object.
   auto paragraphShadowNode = static_cast<ParagraphShadowNode *>(this);
diff --git a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
index 70904ed8b64de8..26b50ffd184972 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
@@ -8,5 +8,24 @@
 #include "TextMeasureCache.h"
 
 namespace facebook {
-namespace react {} // namespace react
+namespace react {
+
+bool LineMeasurement::operator==(LineMeasurement const &rhs) const {
+  return std::tie(
+             this->text,
+             this->frame,
+             this->descender,
+             this->capHeight,
+             this->ascender,
+             this->xHeight) ==
+      std::tie(
+             rhs.text,
+             rhs.frame,
+             rhs.descender,
+             rhs.capHeight,
+             rhs.ascender,
+             rhs.xHeight);
+}
+
+} // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
index 4a15c17925684b..34a0a2d870581c 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
@@ -23,6 +23,8 @@ struct LineMeasurement {
   Float capHeight;
   Float ascender;
   Float xHeight;
+
+  bool operator==(LineMeasurement const &rhs) const;
 };
 
 using LinesMeasurements = std::vector<LineMeasurement>;

From 5be44456f2f15b0dbc7343033854bbf77efbfbd2 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Sun, 20 Sep 2020 14:21:52 -0700
Subject: [PATCH 040/241] TurboModule Android: compile TurboModule C++ Core
 into ReactAndroid

Summary:
This is to prepare for enabling TurboModule on Android. This commit compiles in all the core files (C++) into the ReactAndroid NDK build step. This doesn't yet enable TurboModule by default, just compiling in the infra, just like for iOS.

New shared libs:
* libreact_nativemodule_core.so: The TurboModule Android core
* libreact_nativemodule_manager.so: The TurboModule manager/delegate

To be compatible with `<ReactCommon/` .h include prefix, the files had to move to local `ReactCommon` subdirs.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23805717

fbshipit-source-id: b41c392a592dd095ae003f7b2a689f4add2c37a9
---
 .../react/turbomodule/core/jni/Android.mk     | 35 +++++++++++++++++--
 .../src/main/jni/react/jni/Android.mk         |  5 ++-
 ReactCommon/ReactCommon.podspec               |  6 ++--
 .../react/nativemodule/core/Android.mk        | 31 ++++++++++++++++
 ReactCommon/react/nativemodule/core/BUCK      |  8 ++---
 .../{ => ReactCommon}/LongLivedObject.cpp     |  0
 .../core/{ => ReactCommon}/LongLivedObject.h  |  0
 .../core/{ => ReactCommon}/TurboCxxModule.cpp |  0
 .../core/{ => ReactCommon}/TurboCxxModule.h   |  0
 .../core/{ => ReactCommon}/TurboModule.cpp    |  0
 .../core/{ => ReactCommon}/TurboModule.h      |  0
 .../{ => ReactCommon}/TurboModuleBinding.cpp  |  0
 .../{ => ReactCommon}/TurboModuleBinding.h    |  0
 .../TurboModulePerfLogger.cpp                 |  0
 .../{ => ReactCommon}/TurboModulePerfLogger.h |  0
 .../{ => ReactCommon}/TurboModuleUtils.cpp    |  0
 .../core/{ => ReactCommon}/TurboModuleUtils.h |  0
 .../{ => ReactCommon}/JavaTurboModule.cpp     |  0
 .../{ => ReactCommon}/JavaTurboModule.h       |  0
 packages/rn-tester/Podfile.lock               |  2 +-
 20 files changed, 76 insertions(+), 11 deletions(-)
 create mode 100644 ReactCommon/react/nativemodule/core/Android.mk
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/LongLivedObject.cpp (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/LongLivedObject.h (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboCxxModule.cpp (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboCxxModule.h (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModule.cpp (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModule.h (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModuleBinding.cpp (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModuleBinding.h (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModulePerfLogger.cpp (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModulePerfLogger.h (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModuleUtils.cpp (100%)
 rename ReactCommon/react/nativemodule/core/{ => ReactCommon}/TurboModuleUtils.h (100%)
 rename ReactCommon/react/nativemodule/core/platform/android/{ => ReactCommon}/JavaTurboModule.cpp (100%)
 rename ReactCommon/react/nativemodule/core/platform/android/{ => ReactCommon}/JavaTurboModule.h (100%)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
index 80ba4096da6480..ba788dafca2713 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
@@ -5,6 +5,10 @@
 
 LOCAL_PATH := $(call my-dir)
 
+#########################
+### callinvokerholder ###
+#########################
+
 include $(CLEAR_VARS)
 
 # Header search path for all source files in this module.
@@ -15,10 +19,10 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
 
-LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni
-
 LOCAL_SHARED_LIBRARIES = libfb libfbjni
 
+LOCAL_STATIC_LIBRARIES = libcallinvoker libreactperfloggerjni
+
 # Name of this module.
 LOCAL_MODULE := callinvokerholder
 
@@ -27,3 +31,30 @@ LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/CallInvokerHolder.cpp
 
 # Build the files in this directory as a shared library
 include $(BUILD_STATIC_LIBRARY)
+
+##################################
+### react_nativemodule_manager ###
+##################################
+
+include $(CLEAR_VARS)
+
+# Name of this module.
+LOCAL_MODULE := react_nativemodule_manager
+
+# Header search path for all source files in this module.
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
+
+# Header search path for modules that depend on this module
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+LOCAL_SHARED_LIBRARIES = libfb libfbjni libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES = libcallinvokerholder libreactperfloggerjni
+
+# Compile all local c++ files
+LOCAL_SRC_FILES := $(LOCAL_PATH)/ReactCommon/TurboModuleManager.cpp $(LOCAL_PATH)/ReactCommon/OnLoad.cpp
+
+# Build the files in this directory as a shared library
+include $(BUILD_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index 70b65082fac834..a816d4fea7aad3 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -80,7 +80,7 @@ LOCAL_LDLIBS += -landroid
 LOCAL_SHARED_LIBRARIES := libreactnativeutilsjni libfolly_json libfb libfbjni libglog_init libyoga
 
 # The static libraries (.a files) that this module depends on.
-LOCAL_STATIC_LIBRARIES := libreactnative libcallinvokerholder libruntimeexecutor
+LOCAL_STATIC_LIBRARIES := libreactnative libruntimeexecutor libcallinvokerholder
 
 # Name of this module.
 #
@@ -128,8 +128,11 @@ $(call import-module,callinvoker)
 $(call import-module,reactperflogger)
 $(call import-module,hermes)
 $(call import-module,runtimeexecutor)
+$(call import-module,react/nativemodule/core)
 
 include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk
+# TODO (T48588859): Restructure this target to align with dir structure: "react/nativemodule/..."
+# Note: Update this only when ready to minimize breaking changes.
 include $(REACT_SRC_DIR)/turbomodule/core/jni/Android.mk
 
 ifeq ($(BUILD_FABRIC),true)
diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec
index 5c0efe17a630dd..0e306074b6239c 100644
--- a/ReactCommon/ReactCommon.podspec
+++ b/ReactCommon/ReactCommon.podspec
@@ -49,13 +49,13 @@ Pod::Spec.new do |s|
     ss.dependency "glog"
 
     ss.subspec "core" do |sss|
-      sss.source_files = "react/nativemodule/core/*.{cpp,h}",
-                         "react/nativemodule/core/platform/ios/*.{mm,cpp,h}"
+      sss.source_files = "react/nativemodule/core/ReactCommon/**/*.{cpp,h}",
+                         "react/nativemodule/core/platform/ios/**/*.{mm,cpp,h}"
     end
 
     ss.subspec "samples" do |sss|
       sss.source_files = "react/nativemodule/samples/*.{cpp,h}",
-                         "react/nativemodule/samples/platform/ios/*.{mm,cpp,h}"
+                         "react/nativemodule/samples/platform/ios/**/*.{mm,cpp,h}"
       sss.dependency "ReactCommon/turbomodule/core", version
     end
   end
diff --git a/ReactCommon/react/nativemodule/core/Android.mk b/ReactCommon/react/nativemodule/core/Android.mk
new file mode 100644
index 00000000000000..70f7651b4831f4
--- /dev/null
+++ b/ReactCommon/react/nativemodule/core/Android.mk
@@ -0,0 +1,31 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_nativemodule_core
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../ $(LOCAL_PATH)/ReactCommon $(LOCAL_PATH)/platform/android/ReactCommon
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp) $(wildcard $(LOCAL_PATH)/platform/android/ReactCommon/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/platform/android/
+
+LOCAL_SHARED_LIBRARIES := libfbjni libfolly_json libreactnativejni
+
+LOCAL_STATIC_LIBRARIES := libjsi libreactperflogger
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"ReactNative\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,folly)
+$(call import-module,jsi)
+$(call import-module,reactperflogger)
diff --git a/ReactCommon/react/nativemodule/core/BUCK b/ReactCommon/react/nativemodule/core/BUCK
index 549ddef0a9e243..1bc3b9950df7ee 100644
--- a/ReactCommon/react/nativemodule/core/BUCK
+++ b/ReactCommon/react/nativemodule/core/BUCK
@@ -4,12 +4,12 @@ load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "
 rn_xplat_cxx_library(
     name = "core",
     srcs = glob(
-        ["*.cpp"],
+        ["ReactCommon/**/*.cpp"],
     ),
     header_namespace = "",
     exported_headers = subdir_glob(
         [
-            ("", "*.h"),
+            ("ReactCommon", "*.h"),
         ],
         prefix = "ReactCommon",
     ),
@@ -26,13 +26,13 @@ rn_xplat_cxx_library(
     ],
     fbandroid_exported_headers = subdir_glob(
         [
-            ("platform/android", "*.h"),
+            ("platform/android/ReactCommon", "*.h"),
         ],
         prefix = "ReactCommon",
     ),
     fbandroid_srcs = glob(
         [
-            "platform/android/**/*.cpp",
+            "platform/android/ReactCommon/*.cpp",
         ],
     ),
     fbobjc_compiler_flags = [
diff --git a/ReactCommon/react/nativemodule/core/LongLivedObject.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/core/LongLivedObject.cpp
rename to ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.cpp
diff --git a/ReactCommon/react/nativemodule/core/LongLivedObject.h b/ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/LongLivedObject.h
rename to ReactCommon/react/nativemodule/core/ReactCommon/LongLivedObject.h
diff --git a/ReactCommon/react/nativemodule/core/TurboCxxModule.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboCxxModule.cpp
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.cpp
diff --git a/ReactCommon/react/nativemodule/core/TurboCxxModule.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboCxxModule.h
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboCxxModule.h
diff --git a/ReactCommon/react/nativemodule/core/TurboModule.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModule.cpp
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.cpp
diff --git a/ReactCommon/react/nativemodule/core/TurboModule.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModule.h
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModule.h
diff --git a/ReactCommon/react/nativemodule/core/TurboModuleBinding.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModuleBinding.cpp
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.cpp
diff --git a/ReactCommon/react/nativemodule/core/TurboModuleBinding.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModuleBinding.h
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleBinding.h
diff --git a/ReactCommon/react/nativemodule/core/TurboModulePerfLogger.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModulePerfLogger.cpp
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp
diff --git a/ReactCommon/react/nativemodule/core/TurboModulePerfLogger.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModulePerfLogger.h
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h
diff --git a/ReactCommon/react/nativemodule/core/TurboModuleUtils.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModuleUtils.cpp
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.cpp
diff --git a/ReactCommon/react/nativemodule/core/TurboModuleUtils.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/TurboModuleUtils.h
rename to ReactCommon/react/nativemodule/core/ReactCommon/TurboModuleUtils.h
diff --git a/ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.cpp b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.cpp
rename to ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
diff --git a/ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.h b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h
similarity index 100%
rename from ReactCommon/react/nativemodule/core/platform/android/JavaTurboModule.h
rename to ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.h
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 6f1ee93179b05f..35a1f000fa751e 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -524,7 +524,7 @@ SPEC CHECKSUMS:
   React-RCTText: 6c01963d3e562109f5548262b09b1b2bc260dd60
   React-RCTVibration: 0997fcaf753c7ac0a341177db120eebc438484cf
   React-runtimeexecutor: 60dd6204a13f68a1aa1118870edcc604a791df2b
-  ReactCommon: 982fb4cf650ef68a435f3c0bfff76fbdda1ba663
+  ReactCommon: e74025a9d02a02150f065719e14a8cbe03a93513
   Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

From e1b63ae17e0b4ad21e150ed2ea5bf276a94da770 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Sun, 20 Sep 2020 14:51:44 -0700
Subject: [PATCH 041/241] Add additional logging and asserts to StubViewTree

Summary:
Helps in testing LayoutAnimations or differ changes.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23797890

fbshipit-source-id: 1e612c04f9fbb256f2ace8a4a2ed9a477b4695a1
---
 .../react/renderer/mounting/StubViewTree.cpp  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/StubViewTree.cpp b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
index fc68777f349fda..698af4374f2522 100644
--- a/ReactCommon/react/renderer/mounting/StubViewTree.cpp
+++ b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
@@ -83,13 +83,15 @@ void StubViewTree::mutate(
         STUB_VIEW_ASSERT(registry.find(parentTag) != registry.end());
         auto parentStubView = registry[parentTag];
         auto childTag = mutation.newChildShadowView.tag;
-        STUB_VIEW_LOG({
-          LOG(ERROR) << "StubView: Insert: " << childTag << " into "
-                     << parentTag << " at " << mutation.index;
-        });
         STUB_VIEW_ASSERT(registry.find(childTag) != registry.end());
         auto childStubView = registry[childTag];
         childStubView->update(mutation.newChildShadowView);
+        STUB_VIEW_LOG({
+          LOG(ERROR) << "StubView: Insert: " << childTag << " into "
+                     << parentTag << " at " << mutation.index << "("
+                     << parentStubView->children.size() << " children)";
+        });
+        STUB_VIEW_ASSERT(parentStubView->children.size() >= mutation.index);
         parentStubView->children.insert(
             parentStubView->children.begin() + mutation.index, childStubView);
         break;
@@ -106,6 +108,7 @@ void StubViewTree::mutate(
                      << parentTag << " at index " << mutation.index << " with "
                      << parentStubView->children.size() << " children";
         });
+        STUB_VIEW_ASSERT(parentStubView->children.size() > mutation.index);
         STUB_VIEW_ASSERT(registry.find(childTag) != registry.end());
         auto childStubView = registry[childTag];
         bool childIsCorrect =
@@ -130,8 +133,15 @@ void StubViewTree::mutate(
         STUB_VIEW_LOG({
           LOG(ERROR) << "StubView: Update: " << mutation.newChildShadowView.tag;
         });
+
+        // We don't have a strict requirement that oldChildShadowView has any
+        // data. In particular, LayoutAnimations can produce UPDATEs with only a
+        // new node.
         STUB_VIEW_ASSERT(
-            mutation.newChildShadowView.tag == mutation.oldChildShadowView.tag);
+            mutation.newChildShadowView.tag ==
+                mutation.oldChildShadowView.tag ||
+            mutation.oldChildShadowView.tag == 0);
+
         STUB_VIEW_ASSERT(
             registry.find(mutation.newChildShadowView.tag) != registry.end());
         auto stubView = registry[mutation.newChildShadowView.tag];

From df9ada5fb7181763353f07470ef9224d49e4cb5f Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Sun, 20 Sep 2020 14:51:44 -0700
Subject: [PATCH 042/241] Deleting unnecessary Differentiator code

Summary:
In the new Flattening differ, I experimentally verified that these two code paths are not hit (or redundant) and deleted them.

One of the branches did nothing and the other produced duplicate DELETE mutations for the same tag, that is handled elsewhere.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23806161

fbshipit-source-id: 9ad2929e2d719a7b9b34640ed35f7a696103604b
---
 .../react/renderer/mounting/Differentiator.cpp       | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/ReactCommon/react/renderer/mounting/Differentiator.cpp b/ReactCommon/react/renderer/mounting/Differentiator.cpp
index 300c38059f8a64..d7fee08924385b 100644
--- a/ReactCommon/react/renderer/mounting/Differentiator.cpp
+++ b/ReactCommon/react/renderer/mounting/Differentiator.cpp
@@ -1076,11 +1076,7 @@ static void calculateShadowViewMutationsV2(
               for (auto &oldFlattenedNode : oldFlattenedNodes) {
                 auto unvisitedOldChildPairIt = unvisitedOldChildPairs.find(
                     oldFlattenedNode.shadowView.tag);
-                if (unvisitedOldChildPairIt != unvisitedOldChildPairs.end()) {
-                  // Node unvisited - delete it entirely
-                  deleteMutations.push_back(ShadowViewMutation::DeleteMutation(
-                      oldFlattenedNode.shadowView));
-                } else {
+                if (unvisitedOldChildPairIt == unvisitedOldChildPairs.end()) {
                   // Node was visited - make sure to remove it from
                   // "newRemainingPairs" map
                   auto newRemainingIt =
@@ -1202,11 +1198,7 @@ static void calculateShadowViewMutationsV2(
               for (auto &oldFlattenedNode : oldFlattenedNodes) {
                 auto unvisitedOldChildPairIt = unvisitedOldChildPairs.find(
                     oldFlattenedNode.shadowView.tag);
-                if (unvisitedOldChildPairIt != unvisitedOldChildPairs.end()) {
-                  // Node unvisited - delete it entirely
-                  deleteMutations.push_back(ShadowViewMutation::DeleteMutation(
-                      oldFlattenedNode.shadowView));
-                } else {
+                if (unvisitedOldChildPairIt == unvisitedOldChildPairs.end()) {
                   // Node was visited - make sure to remove it from
                   // "newRemainingPairs" map
                   auto newRemainingIt =

From 81c61705f78933ffd40731f2911aed1fb8415073 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Sun, 20 Sep 2020 14:51:44 -0700
Subject: [PATCH 043/241] LayoutAnimations: simplify index adjustment,
 (un)flattening detection

Summary:
In this diff I simplify index adjustment and add comments to rigorously describe what we're doing at each step of index adjustment.

I've also made unflattening detection more correct, robust, and slightly more efficient.

Bugs that existed before:

1) The reparenting detection that existed in the animations layer had some subtle bugs. I don't have proof that it results in any correctness issues or crashes, but I suspect it.
2) Correctness of index adjustment: there were cases where the Android mounting layer would crash because LayoutAnimations would try to remove a View at an index, but the index was wrong. This is why I sat down and diagrammed the relationships between all the bits of data we have for index readjustment - I believe this to be correct now.
3) Correctness of INSERT index adjustment: I had the insight that when we have batches of INSERTs to consecutive indices, we essentially want them to be treated as a single INSERT for adjustment purposes, so that they're all placed consecutively in the view layer. I added `ConsecutiveAdjustmentMetadata` to deal with this, and there are more comments in the code.

Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D23806163

fbshipit-source-id: cd9e94945034db8b840f2a806c6377034a91af61
---
 .../LayoutAnimationKeyFrameManager.cpp        | 449 ++++++++++--------
 .../LayoutAnimationKeyFrameManager.h          |  16 +-
 2 files changed, 252 insertions(+), 213 deletions(-)

diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
index 7599e85de2d62e..08fbe459d7a633 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -19,6 +19,7 @@
 #include <react/renderer/core/Props.h>
 #include <react/renderer/core/RawValue.h>
 #include <react/renderer/mounting/MountingCoordinator.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
 
 #include <react/renderer/mounting/Differentiator.h>
 #include <react/renderer/mounting/ShadowTreeRevision.h>
@@ -396,9 +397,12 @@ void LayoutAnimationKeyFrameManager::
     adjustImmediateMutationIndicesForDelayedMutations(
         SurfaceId surfaceId,
         ShadowViewMutation &mutation,
-        ShadowViewMutationList *auxiliaryMutations) const {
+        ConsecutiveAdjustmentMetadata &consecutiveAdjustmentMetadata,
+        bool skipLastAnimation,
+        bool lastAnimationOnly) const {
   bool isRemoveMutation = mutation.type == ShadowViewMutation::Type::Remove;
-  assert(isRemoveMutation || mutation.type == ShadowViewMutation::Type::Insert);
+  bool isInsertMutation = mutation.type == ShadowViewMutation::Type::Insert;
+  assert(isRemoveMutation || isInsertMutation);
 
   // TODO: turn all of this into a lambda and share code?
   if (mutatedViewIsVirtual(mutation)) {
@@ -412,36 +416,35 @@ void LayoutAnimationKeyFrameManager::
       "[IndexAdjustment] Calling adjustImmediateMutationIndicesForDelayedMutations for:",
       mutation);
 
+  // When adjusting INSERTs, we want to batch adjacent inserts so they're all
+  // adjacent to each other in the resulting view. For instance, if we're
+  // processing INSERTS into positions 2,3,4,5,6, etc, it is possible that
+  // delayed mutations would otherwise cause the inserts to be adjusted to
+  // positions 2, 4, 6, 8... etc, creating a striping effect. We want to prevent
+  // that.
+  if (isInsertMutation &&
+      mutation.parentShadowView.tag ==
+          consecutiveAdjustmentMetadata.lastAdjustedParent &&
+      mutation.index == (consecutiveAdjustmentMetadata.lastIndexOriginal + 1)) {
+    PrintMutationInstruction(
+        std::string(
+            "[IndexAdjustment] adjustImmediateMutationIndicesForDelayedMutations: Adjusting consecutive INSERT mutation by ") +
+            std::to_string(consecutiveAdjustmentMetadata.lastAdjustedDelta),
+        mutation);
+    consecutiveAdjustmentMetadata.lastIndexOriginal = mutation.index;
+    mutation.index += consecutiveAdjustmentMetadata.lastAdjustedDelta;
+    return;
+  }
+
   // First, collect all final mutations that could impact this immediate
   // mutation.
   std::vector<ShadowViewMutation *> candidateMutations{};
 
-  if (auxiliaryMutations != nullptr) {
-    for (auto &auxMutation : *auxiliaryMutations) {
-      if (auxMutation.parentShadowView.tag != mutation.parentShadowView.tag) {
-        continue;
-      }
-      if (auxMutation.type != ShadowViewMutation::Type::Remove) {
-        continue;
-      }
-      if (mutatedViewIsVirtual(auxMutation)) {
-        continue;
-      }
-      if (auxMutation.oldChildShadowView.tag ==
-          (isRemoveMutation ? mutation.oldChildShadowView.tag
-                            : mutation.newChildShadowView.tag)) {
-        continue;
-      }
-
-      PrintMutationInstructionRelative(
-          "[IndexAdjustment] adjustImmediateMutationIndicesForDelayedMutations auxiliary CANDIDATE for:",
-          mutation,
-          auxMutation);
-      candidateMutations.push_back(&auxMutation);
-    }
-  }
-
-  for (auto &inflightAnimation : inflightAnimations_) {
+  for (auto inflightAnimationIt =
+           inflightAnimations_.rbegin() + (skipLastAnimation ? 1 : 0);
+       inflightAnimationIt != inflightAnimations_.rend();
+       inflightAnimationIt++) {
+    auto &inflightAnimation = *inflightAnimationIt;
     if (inflightAnimation.surfaceId != surfaceId) {
       continue;
     }
@@ -464,9 +467,6 @@ void LayoutAnimationKeyFrameManager::
         continue;
       }
 
-      if (animatedKeyFrame.type != AnimationConfigurationType::Noop) {
-        continue;
-      }
       if (!animatedKeyFrame.finalMutationForKeyFrame.has_value()) {
         continue;
       }
@@ -491,21 +491,33 @@ void LayoutAnimationKeyFrameManager::
           delayedMutation);
       candidateMutations.push_back(&delayedMutation);
     }
+
+    if (lastAnimationOnly) {
+      break;
+    }
   }
 
   // While the mutation keeps being affected, keep checking. We use the vector
   // so we only perform one adjustment per delayed mutation. See comments at
   // bottom of adjustDelayedMutationIndicesForMutation for further explanation.
   bool changed = true;
+  int adjustedDelta = 0;
+  if (isInsertMutation) {
+    consecutiveAdjustmentMetadata.lastAdjustedParent =
+        mutation.parentShadowView.tag;
+    consecutiveAdjustmentMetadata.lastIndexOriginal = mutation.index;
+  }
   while (changed) {
     changed = false;
     candidateMutations.erase(
         std::remove_if(
             candidateMutations.begin(),
             candidateMutations.end(),
-            [&mutation, &changed](ShadowViewMutation *candidateMutation) {
-              if (candidateMutation->index <= mutation.index) {
+            [&](ShadowViewMutation *candidateMutation) {
+              bool indexConflicts = candidateMutation->index <= mutation.index;
+              if (indexConflicts) {
                 mutation.index++;
+                adjustedDelta++;
                 changed = true;
                 PrintMutationInstructionRelative(
                     "[IndexAdjustment] adjustImmediateMutationIndicesForDelayedMutations: Adjusting mutation UPWARD",
@@ -517,19 +529,17 @@ void LayoutAnimationKeyFrameManager::
             }),
         candidateMutations.end());
   }
-}
-
-void LayoutAnimationKeyFrameManager::
-    adjustLastAnimationDelayedMutationIndicesForMutation(
-        SurfaceId surfaceId,
-        ShadowViewMutation const &mutation) const {
-  adjustDelayedMutationIndicesForMutation(surfaceId, mutation, true);
+  if (isInsertMutation) {
+    consecutiveAdjustmentMetadata.lastAdjustedDelta = adjustedDelta;
+  } else {
+    consecutiveAdjustmentMetadata.lastAdjustedParent = -1;
+  }
 }
 
 void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
     SurfaceId surfaceId,
     ShadowViewMutation const &mutation,
-    bool lastAnimationOnly) const {
+    bool skipLastAnimation) const {
   bool isRemoveMutation = mutation.type == ShadowViewMutation::Type::Remove;
   bool isInsertMutation = mutation.type == ShadowViewMutation::Type::Insert;
   assert(isRemoveMutation || isInsertMutation);
@@ -545,7 +555,8 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
   // mutation.
   std::vector<ShadowViewMutation *> candidateMutations{};
 
-  for (auto inflightAnimationIt = inflightAnimations_.rbegin();
+  for (auto inflightAnimationIt =
+           inflightAnimations_.rbegin() + (skipLastAnimation ? 1 : 0);
        inflightAnimationIt != inflightAnimations_.rend();
        inflightAnimationIt++) {
     auto &inflightAnimation = *inflightAnimationIt;
@@ -572,9 +583,6 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
         continue;
       }
 
-      if (animatedKeyFrame.type != AnimationConfigurationType::Noop) {
-        continue;
-      }
       if (!animatedKeyFrame.finalMutationForKeyFrame.has_value()) {
         continue;
       }
@@ -587,19 +595,19 @@ void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
         continue;
       }
 
-      if (!mutatedViewIsVirtual(*animatedKeyFrame.finalMutationForKeyFrame) &&
-          finalAnimationMutation.type == ShadowViewMutation::Type::Remove) {
-        PrintMutationInstructionRelative(
-            "[IndexAdjustment] adjustDelayedMutationIndicesForMutation: CANDIDATE:",
-            mutation,
-            *animatedKeyFrame.finalMutationForKeyFrame);
-        candidateMutations.push_back(
-            animatedKeyFrame.finalMutationForKeyFrame.get_pointer());
+      if (finalAnimationMutation.type != ShadowViewMutation::Type::Remove) {
+        continue;
+      }
+      if (mutatedViewIsVirtual(*animatedKeyFrame.finalMutationForKeyFrame)) {
+        continue;
       }
-    }
 
-    if (lastAnimationOnly) {
-      break;
+      PrintMutationInstructionRelative(
+          "[IndexAdjustment] adjustDelayedMutationIndicesForMutation: CANDIDATE:",
+          mutation,
+          *animatedKeyFrame.finalMutationForKeyFrame);
+      candidateMutations.push_back(
+          animatedKeyFrame.finalMutationForKeyFrame.get_pointer());
     }
   }
 
@@ -685,18 +693,6 @@ LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
           continue;
         }
 
-        //        bool hasFinalMutation =
-        //            animatedKeyFrame.finalMutationForKeyFrame.hasValue();
-        //        int finalMutationTag = hasFinalMutation
-        //            ? (((*animatedKeyFrame.finalMutationForKeyFrame).type ==
-        //                    ShadowViewMutation::Create ||
-        //                (*animatedKeyFrame.finalMutationForKeyFrame).type ==
-        //                    ShadowViewMutation::Insert)
-        //                   ? (*animatedKeyFrame.finalMutationForKeyFrame)
-        //                         .newChildShadowView.tag
-        //                   : (*animatedKeyFrame.finalMutationForKeyFrame)
-        //                         .oldChildShadowView.tag)
-        //            : -1;
         bool conflicting = animatedKeyFrame.tag == baselineShadowView.tag ||
             ((mutation.type == ShadowViewMutation::Type::Delete ||
               mutation.type == ShadowViewMutation::Type::Create) &&
@@ -704,20 +700,6 @@ LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
              finalMutationTag == baselineShadowView.tag*/
             ;
 
-        // In some bizarre situations, there can be an ongoing Delete
-        // animation, and then a conflicting mutation to create and/or delete
-        // the same tag. In actuality this "bizarre" situation is just the
-        // animation of repeatedly flattening and unflattening a view; but
-        // it's not clear how to gracefully recover from this, so we just
-        // ensure that the Deletion is never executed in those cases. In these
-        // cases, the ongoing animation will stop; the view still exists; and
-        // then either a "Create" or "delete" animation will be recreated and
-        // executed for that tag.
-        bool shouldExecuteFinalMutation =
-            !(animatedKeyFrame.finalMutationForKeyFrame.hasValue() &&
-              (*animatedKeyFrame.finalMutationForKeyFrame).type ==
-                  ShadowViewMutation::Delete);
-
         // Conflicting animation detected: if we're mutating a tag under
         // animation, or deleting the parent of a tag under animation, or
         // reparenting.
@@ -735,7 +717,9 @@ LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
 
           animatedKeyFrame.invalidated = true;
 
-          if (shouldExecuteFinalMutation) {
+          if (animatedKeyFrame.finalMutationForKeyFrame.has_value() &&
+              !mutatedViewIsVirtual(
+                  *animatedKeyFrame.finalMutationForKeyFrame)) {
             conflictingAnimations.push_back(std::make_tuple(
                 animatedKeyFrame, *mutationConfig, &inflightAnimation));
           }
@@ -748,7 +732,7 @@ LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
                 *animatedKeyFrame.finalMutationForKeyFrame);
           } else {
             PrintMutationInstruction(
-                "Found mutation that conflicts with existing in-flight animation:",
+                "Found mutation that conflicts with existing in-flight animation (no final mutation):",
                 mutation);
           }
 #endif
@@ -756,13 +740,6 @@ LayoutAnimationKeyFrameManager::getAndEraseConflictingAnimations(
           // Delete from existing animation
           it = inflightAnimation.keyFrames.erase(it);
         } else {
-          //#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-          //          if (hasFinalMutation) {
-          //            PrintMutationInstructionRelative("getAndEraseConflictingAnimations,
-          //            NOT erasing non-conflicting mutation of ", mutation,
-          //            *animatedKeyFrame.finalMutationForKeyFrame);
-          //          }
-          //#endif
           it++;
         }
       }
@@ -844,7 +821,8 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         if (keyframe.invalidated) {
           continue;
         }
-        if (keyframe.finalMutationForKeyFrame) {
+        if (keyframe.finalMutationForKeyFrame &&
+            !mutatedViewIsVirtual(*keyframe.finalMutationForKeyFrame)) {
           std::string msg = "Animation " + std::to_string(i) + " keyframe " +
               std::to_string(j) + ": Final Animation";
           PrintMutationInstruction(msg, *keyframe.finalMutationForKeyFrame);
@@ -899,15 +877,23 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // being moves on the Differ level, since we know that there? We could use
       // TinyMap here, but it's not exposed by Differentiator (yet).
       std::vector<Tag> insertedTags;
-      std::vector<Tag> createdTags;
+      std::vector<Tag> deletedTags;
+      std::vector<Tag> reparentedTags; // tags that are deleted and recreated
       std::unordered_map<Tag, ShadowViewMutation> movedTags;
-      std::vector<Tag> reparentedTags;
       for (const auto &mutation : mutations) {
         if (mutation.type == ShadowViewMutation::Type::Insert) {
           insertedTags.push_back(mutation.newChildShadowView.tag);
         }
+        if (mutation.type == ShadowViewMutation::Type::Delete) {
+          deletedTags.push_back(mutation.oldChildShadowView.tag);
+        }
         if (mutation.type == ShadowViewMutation::Type::Create) {
-          createdTags.push_back(mutation.newChildShadowView.tag);
+          if (std::find(
+                  deletedTags.begin(),
+                  deletedTags.end(),
+                  mutation.newChildShadowView.tag) != deletedTags.end()) {
+            reparentedTags.push_back(mutation.newChildShadowView.tag);
+          }
         }
       }
 
@@ -954,26 +940,15 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         // This should eventually be optimized out of the diffing algorithm, but
         // for now we detect reparenting and prevent the corresponding
         // Delete/Create instructions from being animated.
-        bool isReparented =
-            (mutation.type == ShadowViewMutation::Delete &&
-             std::find(
-                 createdTags.begin(),
-                 createdTags.end(),
-                 mutation.oldChildShadowView.tag) != createdTags.end()) ||
-            (mutation.type == ShadowViewMutation::Create &&
-             std::find(
-                 reparentedTags.begin(),
-                 reparentedTags.end(),
-                 mutation.newChildShadowView.tag) != reparentedTags.end());
+        bool isReparented = std::find(
+                                reparentedTags.begin(),
+                                reparentedTags.end(),
+                                baselineShadowView.tag) != reparentedTags.end();
 
         if (isRemoveReinserted) {
           movedTags.insert({mutation.oldChildShadowView.tag, mutation});
         }
 
-        if (isReparented && mutation.type == ShadowViewMutation::Delete) {
-          reparentedTags.push_back(mutation.oldChildShadowView.tag);
-        }
-
         // Inserts that follow a "remove" of the same tag should be treated as
         // an update (move) animation.
         bool wasInsertedTagRemoved = false;
@@ -1205,30 +1180,31 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       }
 
 #ifdef RN_SHADOW_TREE_INTROSPECTION
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
       {
-        std::stringstream ss(getDebugDescription(immediateMutations, {}));
-        std::string to;
-        while (std::getline(ss, to, '\n')) {
-          LOG(ERROR)
-              << "LayoutAnimationKeyFrameManager.cpp: got IMMEDIATE list: Line: "
-              << to;
+        int idx = 0;
+        for (auto &mutation : immediateMutations) {
+          PrintMutationInstruction(
+              std::string("IMMEDIATE list: ") + std::to_string(idx) + "/" +
+                  std::to_string(immediateMutations.size()),
+              mutation);
+          idx++;
         }
       }
 
       {
+        int idx = 0;
         for (const auto &keyframe : keyFramesToAnimate) {
-          if (keyframe.finalMutationForKeyFrame) {
-            std::stringstream ss(
-                getDebugDescription(*keyframe.finalMutationForKeyFrame, {}));
-            std::string to;
-            while (std::getline(ss, to, '\n')) {
-              LOG(ERROR)
-                  << "LayoutAnimationKeyFrameManager.cpp: got FINAL list: Line: "
-                  << to;
-            }
+          if (keyframe.finalMutationForKeyFrame.has_value()) {
+            PrintMutationInstruction(
+                std::string("FINAL list: ") + std::to_string(idx) + "/" +
+                    std::to_string(keyFramesToAnimate.size()),
+                *keyframe.finalMutationForKeyFrame);
           }
+          idx++;
         }
       }
+#endif
 #endif
 
       auto finalConflictingMutations = ShadowViewMutationList{};
@@ -1247,59 +1223,121 @@ LayoutAnimationKeyFrameManager::pullTransaction(
           finalConflictingMutations.end(),
           &shouldFirstComeBeforeSecondMutation);
 
-      // Use "final conflicting mutations" to adjust delayed mutations *before*
-      // we adjust immediate mutations based on delayed mutations
+      std::stable_sort(
+          immediateMutations.begin(),
+          immediateMutations.end(),
+          &shouldFirstComeBeforeSecondRemovesOnly);
+
+      animation.keyFrames = keyFramesToAnimate;
+      inflightAnimations_.push_back(std::move(animation));
+
+      // At this point, we have the following information and knowledge graph:
+      // Knowledge Graph:
+      // [ImmediateMutations] -> assumes [FinalConflicting], [FrameDelayed],
+      // [Delayed] already executed [FrameDelayed] -> assumes
+      // [FinalConflicting], [Delayed] already executed [FinalConflicting] -> is
+      // adjusted based on [Delayed], no dependency on [FinalConflicting],
+      // [FrameDelayed] [Delayed] -> assumes [FinalConflicting],
+      // [ImmediateMutations] not executed yet
+      ConsecutiveAdjustmentMetadata consecutiveAdjustmentMetadata{};
+
+      // Adjust [Delayed] based on [FinalConflicting]
+      // Knowledge Graph:
+      // [ImmediateMutations] -> assumes [FinalConflicting], [FrameDelayed],
+      // [Delayed] already executed [FrameDelayed] -> assumes
+      // [FinalConflicting], [Delayed] already executed [FinalConflicting] -> is
+      // adjusted based on [Delayed], no dependency on [FinalConflicting],
+      // [FrameDelayed] [Delayed] -> adjusted for [FinalConflicting]; assumes
+      // [ImmediateMutations] not executed yet
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-      LOG(ERROR)
-          << "Adjust delayed mutations based on finalConflictingMutations";
+      LOG(ERROR) << "Adjust [Delayed] based on [FinalConflicting]";
 #endif
       for (auto &mutation : finalConflictingMutations) {
-        if (mutation.type == ShadowViewMutation::Remove ||
-            mutation.type == ShadowViewMutation::Insert) {
-          adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
+        if (mutation.type == ShadowViewMutation::Type::Insert ||
+            mutation.type == ShadowViewMutation::Type::Remove) {
+          adjustDelayedMutationIndicesForMutation(surfaceId, mutation, true);
         }
       }
 
-      // Adjust keyframes based on already-delayed, existing animations, before
-      // queueing. We adjust them as if finalConflictingMutations have already
-      // been executed - in all cases, finalConflictingMutations will be
-      // executed before any of these delayed mutations are.
+      // Adjust [FrameDelayed] based on [Delayed]
+      // Knowledge Graph:
+      // [ImmediateExecutions] -> assumes [FinalConflicting], [Delayed],
+      // [FrameDelayed] already executed [FrameDelayed] -> adjusted for
+      // [Delayed]; assumes [FinalConflicting] already executed
+      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
+      // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
+      // [FinalConflicting]; assumes [ImmediateExecutions] not executed yet
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-      LOG(ERROR)
-          << "Adjust immediate keyFramesToAnimate based on delayed mutations and finalConflictingMutations";
+      LOG(ERROR) << "Adjust [FrameDelayed] based on [Delayed]";
 #endif
-      for (auto &keyframe : keyFramesToAnimate) {
+      for (auto &keyframe : inflightAnimations_.back().keyFrames) {
         if (keyframe.finalMutationForKeyFrame.has_value()) {
-          auto &delayedMutation = *keyframe.finalMutationForKeyFrame;
-          if (delayedMutation.type == ShadowViewMutation::Type::Remove) {
+          auto &mutation = *keyframe.finalMutationForKeyFrame;
+          if (mutation.type == ShadowViewMutation::Type::Insert ||
+              mutation.type == ShadowViewMutation::Type::Remove) {
+            // When adjusting, skip adjusting against last animation - because
+            // all `mutation`s here come from the last animation, so we can't
+            // adjust a batch against itself.
             adjustImmediateMutationIndicesForDelayedMutations(
-                surfaceId, delayedMutation /*, &finalConflictingMutations*/);
+                surfaceId, mutation, consecutiveAdjustmentMetadata, true);
           }
         }
       }
 
-      // REMOVE mutations from this animation batch *cannot* be impacted by
-      // other REMOVEs from this batch, since they're already taken into
-      // account. INSERTs can impact delayed REMOVEs; see below.
+      // Adjust [ImmediateExecutions] based on [Delayed]
+      // Knowledge Graph:
+      // [ImmediateExecutions] -> adjusted for [FrameDelayed], [Delayed];
+      // assumes [FinalConflicting] already executed [FrameDelayed] -> adjusted
+      // for [Delayed]; assumes [FinalConflicting] already executed
+      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
+      // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
+      // [FinalConflicting]; assumes [ImmediateExecutions] not executed yet
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-      LOG(ERROR)
-          << "Adjust immediateMutations REMOVEs only, based on previously delayed mutations, without most-recent animation";
+      LOG(ERROR) << "Adjust [ImmediateExecutions] based on [Delayed]";
 #endif
-      std::stable_sort(
-          immediateMutations.begin(),
-          immediateMutations.end(),
-          &shouldFirstComeBeforeSecondRemovesOnly);
+      consecutiveAdjustmentMetadata = ConsecutiveAdjustmentMetadata{};
       for (auto &mutation : immediateMutations) {
-        if (mutation.type == ShadowViewMutation::Type::Remove) {
+        // Note: when adjusting [ImmediateExecutions] based on [FrameDelayed],
+        // we need only adjust Inserts. Since inserts are executed
+        // highest-index-first, lower indices being delayed does not impact the
+        // higher-index removals; and conversely, higher indices being delayed
+        // cannot impact lower index removal, regardless of order.
+        if (mutation.type == ShadowViewMutation::Type::Insert ||
+            mutation.type == ShadowViewMutation::Type::Remove) {
           adjustImmediateMutationIndicesForDelayedMutations(
-              surfaceId, mutation);
-          adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
+              surfaceId,
+              mutation,
+              consecutiveAdjustmentMetadata,
+              mutation.type == ShadowViewMutation::Type::Remove);
         }
       }
 
-      animation.keyFrames = keyFramesToAnimate;
-      inflightAnimations_.push_back(std::move(animation));
+      // Adjust [Delayed] based on [ImmediateExecutions] and [FinalConflicting]
+      // Knowledge Graph:
+      // [ImmediateExecutions] -> adjusted for [FrameDelayed], [Delayed];
+      // assumes [FinalConflicting] already executed [FrameDelayed] -> adjusted
+      // for [Delayed]; assumes [FinalConflicting] already executed
+      // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
+      // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
+      // [FinalConflicting], [ImmediateExecutions]
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
+      LOG(ERROR)
+          << "Adjust [Delayed] based on [ImmediateExecutions] and [FinalConflicting]";
+#endif
+      for (auto &mutation : immediateMutations) {
+        if (mutation.type == ShadowViewMutation::Type::Insert ||
+            mutation.type == ShadowViewMutation::Type::Remove) {
+          // Here we need to adjust both Delayed and FrameDelayed mutations.
+          // Delayed Removes can be impacted by non-delayed Inserts from the
+          // same frame.
+          adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
+        }
+      }
 
+      // If the knowledge graph progression above is correct, it is now safe to
+      // execute finalConflictingMutations and immediateMutations in that order,
+      // and to queue the delayed animations from this frame.
+      //
       // Execute the conflicting, delayed operations immediately. Any UPDATE
       // operations that smoothly transition into another animation will be
       // overridden by generated UPDATE operations at the end of the list, and
@@ -1307,72 +1345,75 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // Additionally, this should allow us to avoid performing index adjustment
       // between this list of conflicting animations and the batch we're about
       // to execute.
-      mutations = ShadowViewMutationList{};
-      for (auto &mutation : finalConflictingMutations) {
-        mutations.push_back(mutation);
+      finalConflictingMutations.insert(
+          finalConflictingMutations.end(),
+          immediateMutations.begin(),
+          immediateMutations.end());
+      mutations = finalConflictingMutations;
+    } /* if (currentAnimation) */ else {
+      // If there's no "next" animation, make sure we queue up "final"
+      // operations from all ongoing, conflicting animations.
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
+      LOG(ERROR) << "No Animation: Queue up final conflicting animations";
+#endif
+      ShadowViewMutationList finalMutationsForConflictingAnimations{};
+      for (auto &conflictingKeyframeTuple : conflictingAnimations) {
+        auto &keyFrame = std::get<0>(conflictingKeyframeTuple);
+        if (keyFrame.finalMutationForKeyFrame.hasValue()) {
+          PrintMutationInstruction(
+              "No Animation: Queueing final mutation instruction",
+              *keyFrame.finalMutationForKeyFrame);
+          finalMutationsForConflictingAnimations.push_back(
+              *keyFrame.finalMutationForKeyFrame);
+        }
       }
 
-      // Before computing mutations based on animations / final mutations for
-      // this frame, we want to update any pending final mutations since they
-      // will execute *after* this batch of immediate mutations. Important case
-      // to consider (as an example, there are other interesting cases): there's
-      // a delayed "Remove", then an immediate "insert" is scheduled for an
-      // earlier index with the same parent. The remove needs to be adjusted
-      // upward here. Conversely, Inserts at later indices will assume the
-      // remove has already been executed, which may not be the case.
+      // Make sure that all operations execute in the proper order.
+      // REMOVE operations with highest indices must operate first.
+      std::stable_sort(
+          finalMutationsForConflictingAnimations.begin(),
+          finalMutationsForConflictingAnimations.end(),
+          &shouldFirstComeBeforeSecondMutation);
+
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
       LOG(ERROR)
-          << "Adjust immediateMutations and delayed mutations, including just-queued animations, based on each one";
+          << "No Animation: Adjust delayed mutations based on all finalMutationsForConflictingAnimations";
 #endif
-      for (auto &mutation : immediateMutations) {
-        if (mutation.type == ShadowViewMutation::Type::Remove) {
-          adjustLastAnimationDelayedMutationIndicesForMutation(
-              surfaceId, mutation);
-        } else if (mutation.type == ShadowViewMutation::Type::Insert) {
-          adjustImmediateMutationIndicesForDelayedMutations(
-              surfaceId, mutation);
+      for (auto &mutation : finalMutationsForConflictingAnimations) {
+        if (mutation.type == ShadowViewMutation::Type::Remove ||
+            mutation.type == ShadowViewMutation::Type::Insert) {
           adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
         }
       }
 
-      // These will be executed immediately. These should already be sorted
-      // properly.
-      mutations.insert(
-          mutations.end(),
-          immediateMutations.begin(),
-          immediateMutations.end());
-    } /* if (currentAnimation) */ else {
       // The ShadowTree layer doesn't realize that certain operations have been
       // delayed, so we must adjust all Remove and Insert operations based on
       // what else has been deferred, whether we are executing this immediately
       // or later.
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
+      LOG(ERROR)
+          << "No Animation: Adjust mutations based on remaining delayed mutations";
+#endif
+      ConsecutiveAdjustmentMetadata consecutiveAdjustmentMetadata{};
       for (auto &mutation : mutations) {
         if (mutation.type == ShadowViewMutation::Type::Remove ||
             mutation.type == ShadowViewMutation::Type::Insert) {
           adjustImmediateMutationIndicesForDelayedMutations(
-              surfaceId, mutation);
-          adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
+              surfaceId, mutation, consecutiveAdjustmentMetadata);
         }
       }
 
-      // If there's no "next" animation, make sure we queue up "final"
-      // operations from all ongoing, conflicting animations.
-      ShadowViewMutationList finalMutationsForConflictingAnimations{};
-      for (auto &conflictingKeyframeTuple : conflictingAnimations) {
-        auto &keyFrame = std::get<0>(conflictingKeyframeTuple);
-        if (keyFrame.finalMutationForKeyFrame.hasValue()) {
-          finalMutationsForConflictingAnimations.push_back(
-              *keyFrame.finalMutationForKeyFrame);
+#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
+      LOG(ERROR)
+          << "No Animation: Adjust delayed mutations based on all immediate mutations";
+#endif
+      for (auto &mutation : mutations) {
+        if (mutation.type == ShadowViewMutation::Type::Remove ||
+            mutation.type == ShadowViewMutation::Type::Insert) {
+          adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
         }
       }
 
-      // Make sure that all operations execute in the proper order.
-      // REMOVE operations with highest indices must operate first.
-      std::stable_sort(
-          finalMutationsForConflictingAnimations.begin(),
-          finalMutationsForConflictingAnimations.end(),
-          &shouldFirstComeBeforeSecondMutation);
-
       // Append mutations to this list and swap - so that the final
       // conflicting mutations happen before any other mutations
       finalMutationsForConflictingAnimations.insert(
@@ -1392,13 +1433,6 @@ LayoutAnimationKeyFrameManager::pullTransaction(
   ShadowViewMutationList mutationsForAnimation{};
   animationMutationsForFrame(surfaceId, mutationsForAnimation, now);
 
-  // Erase any remaining animations that conflict with these mutations
-  // In some marginal cases, a DELETE animation can be queued up and a final
-  // DELETE mutation be executed by the animation driver. These cases deserve
-  // further scrutiny, but for now to prevent crashes, just make sure the queued
-  // DELETE operations are removed.
-  getAndEraseConflictingAnimations(surfaceId, mutationsForAnimation, true);
-
   // If any delayed removes were executed, update remaining delayed keyframes
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
   LOG(ERROR)
@@ -1431,7 +1465,8 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       if (keyframe.invalidated) {
         continue;
       }
-      if (keyframe.finalMutationForKeyFrame) {
+      if (keyframe.finalMutationForKeyFrame &&
+          !mutatedViewIsVirtual(*keyframe.finalMutationForKeyFrame)) {
         std::string msg = "Animation " + std::to_string(i) + " keyframe " +
             std::to_string(j) + ": Final Animation";
         PrintMutationInstruction(msg, *keyframe.finalMutationForKeyFrame);
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
index 686fcaa9da9e21..e6aba6e3c07bcd 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
@@ -110,6 +110,12 @@ struct AnimationKeyFrame {
   bool invalidated{false};
 };
 
+struct ConsecutiveAdjustmentMetadata {
+  Tag lastAdjustedParent{-1};
+  int lastAdjustedDelta{0};
+  int lastIndexOriginal{0};
+};
+
 class LayoutAnimationCallbackWrapper {
  public:
   LayoutAnimationCallbackWrapper(jsi::Function &&callback)
@@ -212,16 +218,14 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
   void adjustImmediateMutationIndicesForDelayedMutations(
       SurfaceId surfaceId,
       ShadowViewMutation &mutation,
-      ShadowViewMutationList *auxiliaryMutations = nullptr) const;
+      ConsecutiveAdjustmentMetadata &consecutiveAdjustmentMetadata,
+      bool skipLastAnimation = false,
+      bool lastAnimationOnly = false) const;
 
   void adjustDelayedMutationIndicesForMutation(
       SurfaceId surfaceId,
       ShadowViewMutation const &mutation,
-      bool lastAnimationOnly = false) const;
-
-  void adjustLastAnimationDelayedMutationIndicesForMutation(
-      SurfaceId surfaceId,
-      ShadowViewMutation const &mutation) const;
+      bool skipLastAnimation = false) const;
 
   std::vector<std::tuple<AnimationKeyFrame, AnimationConfig, LayoutAnimation *>>
   getAndEraseConflictingAnimations(

From 54016faa7dfdde321023e729636a45b5bb682856 Mon Sep 17 00:00:00 2001
From: Mike Vitousek <mvitousek@fb.com>
Date: Sun, 20 Sep 2020 21:45:12 -0700
Subject: [PATCH 044/241] Deploy Flow v0.134.0

Summary: Changelog: [Internal]

Reviewed By: dsainati1

Differential Revision: D23769795

fbshipit-source-id: 520e3974a53ba5961a081219c0cbf19b7dfade06
---
 .flowconfig              | 2 +-
 .flowconfig.android      | 2 +-
 package.json             | 2 +-
 repo-config/package.json | 2 +-
 template/_flowconfig     | 2 +-
 yarn.lock                | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index 75ab9756c8e742..edd3fc461862b4 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -75,4 +75,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.133.0
+^0.134.0
diff --git a/.flowconfig.android b/.flowconfig.android
index 622c4e6b937556..63d4ec5bcecaaa 100644
--- a/.flowconfig.android
+++ b/.flowconfig.android
@@ -75,4 +75,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.133.0
+^0.134.0
diff --git a/package.json b/package.json
index dc045489e56b55..8289be281dbbe8 100644
--- a/package.json
+++ b/package.json
@@ -118,7 +118,7 @@
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "flow-bin": "^0.133.0",
+    "flow-bin": "^0.134.0",
     "react": "16.13.1"
   },
   "detox": {
diff --git a/repo-config/package.json b/repo-config/package.json
index 1e36007fd97303..ea2ac36be0f543 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -33,7 +33,7 @@
     "eslint-plugin-react-hooks": "^4.0.7",
     "eslint-plugin-react-native": "3.8.1",
     "eslint-plugin-relay": "1.7.1",
-    "flow-bin": "^0.133.0",
+    "flow-bin": "^0.134.0",
     "jest": "^26.0.1",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.9.0",
diff --git a/template/_flowconfig b/template/_flowconfig
index 8c7fe9a703f98e..b1e00ccf3aa23f 100644
--- a/template/_flowconfig
+++ b/template/_flowconfig
@@ -63,4 +63,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.133.0
+^0.134.0
diff --git a/yarn.lock b/yarn.lock
index 05196e9070286f..b609e76d6021d8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3261,10 +3261,10 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-flow-bin@^0.133.0:
-  version "0.133.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.133.0.tgz#2ee44e3f5d0c0256cfe8e99d9a85e9801c281c50"
-  integrity sha512-01T5g8GdhtJEn+lhAwuv5zkrMStrmkuHrY3Nn9/aS9y6waNmNgimMKlzRpFH66S0F6Ez9EqU9psz5QaRveSJIA==
+flow-bin@^0.134.0:
+  version "0.134.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.134.0.tgz#e98e5724f6ed5a1265cf904bbb5e4c096ea3a026"
+  integrity sha512-j5aCugO3jmwDsUKc+7KReArgnL6aVjHLo6DlozKhxKYN+TaP8BY+mintPSISjSQtKZFJyvoNAc1oXA79X5WjIA==
 
 flow-parser@0.*:
   version "0.89.0"

From 3f85b83653411d8eaf120d30fd16e1337d56af2f Mon Sep 17 00:00:00 2001
From: generatedunixname89002005287564 <generatedunixname89002005287564@fb.com>
Date: Mon, 21 Sep 2020 04:36:22 -0700
Subject: [PATCH 045/241] Daily `arc lint --take CLANGFORMAT`

Reviewed By: zertosh

Differential Revision: D23811656

fbshipit-source-id: 4104948d2e4db786998320bcfdb1598d4a497f2d
---
 .../RCTSurfacePresenterBridgeAdapter.mm       |  2 +-
 .../tests/ShadowTreeLifeCycleTest.cpp         | 18 ++--
 .../renderer/uimanager/UIManagerBinding.cpp   | 86 +++++++++----------
 3 files changed, 55 insertions(+), 51 deletions(-)

diff --git a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
index 8c20e934870864..a70c494d937838 100644
--- a/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
+++ b/React/Fabric/RCTSurfacePresenterBridgeAdapter.mm
@@ -48,7 +48,7 @@ static RuntimeExecutor RCTRuntimeExecutorFromBridge(RCTBridge *bridge)
   auto bridgeWeakWrapper = wrapManagedObjectWeakly([bridge batchedBridge] ?: bridge);
 
   RuntimeExecutor runtimeExecutor = [bridgeWeakWrapper](
-                                        std::function<void(facebook::jsi::Runtime &runtime)> &&callback) {
+                                        std::function<void(facebook::jsi::Runtime & runtime)> &&callback) {
     RCTBridge *bridge = unwrapManagedObjectWeakly(bridgeWeakWrapper);
 
     RCTAssert(bridge, @"RCTRuntimeExecutorFromBridge: Bridge must not be nil at the moment of scheduling a call.");
diff --git a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
index 46d2fc4c6cdd25..1ecfd21a69b670 100644
--- a/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
+++ b/ReactCommon/react/renderer/mounting/tests/ShadowTreeLifeCycleTest.cpp
@@ -12,8 +12,8 @@
 
 #include <react/renderer/components/root/RootComponentDescriptor.h>
 #include <react/renderer/components/view/ViewComponentDescriptor.h>
-#include <react/renderer/mounting/ShadowViewMutation.h>
 #include <react/renderer/mounting/Differentiator.h>
+#include <react/renderer/mounting/ShadowViewMutation.h>
 #include <react/renderer/mounting/stubs.h>
 
 #include "Entropy.h"
@@ -105,19 +105,23 @@ static void testShadowNodeTreeLifeCycle(
       auto mutations = calculateShadowViewMutations(
           *currentRootNode, *nextRootNode, useFlattener);
 
-      // If using flattener: make sure that in a single frame, a DELETE for a view is not
-      // followed by a CREATE for the same view.
+      // If using flattener: make sure that in a single frame, a DELETE for a
+      // view is not followed by a CREATE for the same view.
       if (useFlattener) {
         std::vector<int> deletedTags{};
-        for (auto const& mutation : mutations) {
+        for (auto const &mutation : mutations) {
           if (mutation.type == ShadowViewMutation::Type::Delete) {
             deletedTags.push_back(mutation.oldChildShadowView.tag);
           }
         }
-        for (auto const& mutation : mutations) {
+        for (auto const &mutation : mutations) {
           if (mutation.type == ShadowViewMutation::Type::Create) {
-            if (std::find(deletedTags.begin(), deletedTags.end(), mutation.newChildShadowView.tag) != deletedTags.end()) {
-              LOG(ERROR) << "Deleted tag was recreated in mutations list: [" << mutation.newChildShadowView.tag << "]";
+            if (std::find(
+                    deletedTags.begin(),
+                    deletedTags.end(),
+                    mutation.newChildShadowView.tag) != deletedTags.end()) {
+              LOG(ERROR) << "Deleted tag was recreated in mutations list: ["
+                         << mutation.newChildShadowView.tag << "]";
               FAIL();
             }
           }
diff --git a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
index 024eb3424dc573..14eee6775f405b 100644
--- a/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
+++ b/ReactCommon/react/renderer/uimanager/UIManagerBinding.cpp
@@ -212,10 +212,10 @@ jsi::Value UIManagerBinding::get(
         name,
         5,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->createNode(
@@ -234,10 +234,10 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(shadowNodeFromValue(runtime, arguments[0])));
@@ -250,10 +250,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           uiManager->setJSResponder(
               shadowNodeFromValue(runtime, arguments[0]),
               arguments[1].getBool());
@@ -268,10 +268,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto node = shadowNodeFromValue(runtime, arguments[0]);
           auto locationX = (Float)arguments[1].getNumber();
           auto locationY = (Float)arguments[2].getNumber();
@@ -298,10 +298,10 @@ jsi::Value UIManagerBinding::get(
         name,
         0,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           uiManager->clearJSResponder();
 
           return jsi::Value::undefined();
@@ -315,10 +315,10 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           return valueFromShadowNode(
               runtime,
               uiManager->cloneNode(
@@ -334,10 +334,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
@@ -355,10 +355,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto const &rawProps = RawProps(runtime, arguments[1]);
           return valueFromShadowNode(
               runtime,
@@ -375,10 +375,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           uiManager->appendChild(
               shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]));
@@ -391,10 +391,10 @@ jsi::Value UIManagerBinding::get(
         runtime,
         name,
         1,
-        [](jsi::Runtime &runtime,
+        [](jsi::Runtime & runtime,
            jsi::Value const &thisValue,
            jsi::Value const *arguments,
-           size_t count) noexcept -> jsi::Value {
+           size_t count) noexcept->jsi::Value {
           auto shadowNodeList =
               std::make_shared<SharedShadowNodeList>(SharedShadowNodeList({}));
           return valueFromShadowNodeList(runtime, shadowNodeList);
@@ -406,10 +406,10 @@ jsi::Value UIManagerBinding::get(
         runtime,
         name,
         2,
-        [](jsi::Runtime &runtime,
+        [](jsi::Runtime & runtime,
            jsi::Value const &thisValue,
            jsi::Value const *arguments,
-           size_t count) noexcept -> jsi::Value {
+           size_t count) noexcept->jsi::Value {
           auto shadowNodeList = shadowNodeListFromValue(runtime, arguments[0]);
           auto shadowNode = shadowNodeFromValue(runtime, arguments[1]);
           shadowNodeList->push_back(shadowNode);
@@ -425,11 +425,11 @@ jsi::Value UIManagerBinding::get(
           runtime,
           name,
           2,
-          [uiManager, sharedUIManager = uiManager_](
-              jsi::Runtime &runtime,
+          [ uiManager, sharedUIManager = uiManager_ ](
+              jsi::Runtime & runtime,
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
-              size_t count) noexcept -> jsi::Value {
+              size_t count) noexcept->jsi::Value {
             auto surfaceId = surfaceIdFromValue(runtime, arguments[0]);
             auto shadowNodeList =
                 shadowNodeListFromValue(runtime, arguments[1]);
@@ -453,10 +453,10 @@ jsi::Value UIManagerBinding::get(
           name,
           2,
           [uiManager](
-              jsi::Runtime &runtime,
+              jsi::Runtime & runtime,
               jsi::Value const &thisValue,
               jsi::Value const *arguments,
-              size_t count) noexcept -> jsi::Value {
+              size_t count) noexcept->jsi::Value {
             uiManager->completeSurface(
                 surfaceIdFromValue(runtime, arguments[0]),
                 shadowNodeListFromValue(runtime, arguments[1]));
@@ -472,10 +472,10 @@ jsi::Value UIManagerBinding::get(
         name,
         1,
         [this](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto eventHandler =
               arguments[0].getObject(runtime).getFunction(runtime);
           eventHandler_ =
@@ -490,10 +490,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -514,10 +514,10 @@ jsi::Value UIManagerBinding::get(
         name,
         3,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           uiManager->dispatchCommand(
               shadowNodeFromValue(runtime, arguments[0]),
               stringFromValue(runtime, arguments[1]),
@@ -534,10 +534,10 @@ jsi::Value UIManagerBinding::get(
         name,
         4,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               shadowNodeFromValue(runtime, arguments[1]).get(),
@@ -570,10 +570,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               nullptr,
@@ -605,10 +605,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           auto layoutMetrics = uiManager->getRelativeLayoutMetrics(
               *shadowNodeFromValue(runtime, arguments[0]),
               nullptr,
@@ -640,10 +640,10 @@ jsi::Value UIManagerBinding::get(
         name,
         2,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           uiManager->setNativeProps(
               *shadowNodeFromValue(runtime, arguments[0]),
               RawProps(runtime, arguments[1]));
@@ -658,10 +658,10 @@ jsi::Value UIManagerBinding::get(
         name,
         3,
         [uiManager](
-            jsi::Runtime &runtime,
+            jsi::Runtime & runtime,
             jsi::Value const &thisValue,
             jsi::Value const *arguments,
-            size_t count) noexcept -> jsi::Value {
+            size_t count) noexcept->jsi::Value {
           uiManager->configureNextLayoutAnimation(
               runtime,
               // TODO: pass in JSI value instead of folly::dynamic to RawValue

From 22b5f32f74bc99be5a4d2f0ea987fa1b08a1c901 Mon Sep 17 00:00:00 2001
From: Andrei Shikov <ashikov@fb.com>
Date: Mon, 21 Sep 2020 07:34:43 -0700
Subject: [PATCH 046/241] Add extras to timespan and points in performance
 logger

Summary:
Changelog:
[Internal][Added] Added point-level extras to performance logger

Reviewed By: lunaleaps, rubennorte

Differential Revision: D23730275

fbshipit-source-id: 285c5d7ac769bd109df7ce0294da024401edf7d3
---
 .../__tests__/PerformanceLogger-test.js       | 22 +++++++++
 .../Utilities/createPerformanceLogger.js      | 45 +++++++++++++++----
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index ea940f10947785..a762157a1654dd 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -21,6 +21,8 @@ const EXTRA_VALUE_2 = '<extra_value_2>';
 const POINT = '<point>';
 const POINT_TIMESTAMP = 99;
 const POINT_TIMESTAMP_2 = 999;
+const POINT_ANNOTATION_1 = {extra: 'value1'};
+const POINT_ANNOTATION_2 = {extra: 'value2'};
 
 describe('PerformanceLogger', () => {
   beforeEach(() => {
@@ -167,4 +169,24 @@ describe('PerformanceLogger', () => {
     checkLogger(localPerformanceLogger2, true);
     checkLogger(GlobalPerformanceLogger, true);
   });
+
+  it('records extras for a timespan', () => {
+    let perfLogger = createPerformanceLogger();
+    perfLogger.startTimespan(TIMESPAN_1, POINT_ANNOTATION_1);
+    perfLogger.stopTimespan(TIMESPAN_1, POINT_ANNOTATION_2);
+    expect(perfLogger.getTimespans()[TIMESPAN_1].startExtras).toEqual(
+      POINT_ANNOTATION_1,
+    );
+    expect(perfLogger.getTimespans()[TIMESPAN_1].endExtras).toEqual(
+      POINT_ANNOTATION_2,
+    );
+  });
+
+  it('records extras for a point', () => {
+    let perfLogger = createPerformanceLogger();
+    perfLogger.markPoint(POINT, POINT_TIMESTAMP, POINT_ANNOTATION_1);
+
+    expect(Object.keys(perfLogger.getPointExtras())).toEqual([POINT]);
+    expect(perfLogger.getPointExtras()[POINT]).toEqual(POINT_ANNOTATION_1);
+  });
 });
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index c9baf0cd07aa90..195c1b30807c7a 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -20,15 +20,25 @@ type Timespan = {
   startTime: number,
   endTime?: number,
   totalTime?: number,
+  startExtras?: Extras,
+  endExtras?: Extras,
 };
 
 // Extra values should be serializable primitives
 type ExtraValue = number | string | boolean;
 
+type Extras = {[key: string]: ExtraValue};
+
 export interface IPerformanceLogger {
-  addTimespan(key: string, startTime: number, endTime: number): void;
-  startTimespan(key: string): void;
-  stopTimespan(key: string): void;
+  addTimespan(
+    key: string,
+    startTime: number,
+    endTime: number,
+    startExtras?: Extras,
+    endExtras?: Extras,
+  ): void;
+  startTimespan(key: string, extras?: Extras): void;
+  stopTimespan(key: string, extras?: Extras): void;
   clear(): void;
   clearCompleted(): void;
   currentTimestamp(): number;
@@ -37,8 +47,9 @@ export interface IPerformanceLogger {
   setExtra(key: string, value: ExtraValue): void;
   getExtras(): {[key: string]: ExtraValue, ...};
   removeExtra(key: string): ExtraValue | void;
-  markPoint(key: string, timestamp?: number): void;
+  markPoint(key: string, timestamp?: number, extras?: Extras): void;
   getPoints(): {[key: string]: number, ...};
+  getPointExtras(): {[key: string]: Extras, ...};
   logEverything(): void;
 }
 
@@ -50,8 +61,15 @@ class PerformanceLogger implements IPerformanceLogger {
   _timespans: {[key: string]: Timespan} = {};
   _extras: {[key: string]: ExtraValue} = {};
   _points: {[key: string]: number} = {};
+  _pointExtras: {[key: string]: Extras, ...} = {};
 
-  addTimespan(key: string, startTime: number, endTime: number) {
+  addTimespan(
+    key: string,
+    startTime: number,
+    endTime: number,
+    startExtras?: Extras,
+    endExtras?: Extras,
+  ) {
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -66,10 +84,12 @@ class PerformanceLogger implements IPerformanceLogger {
       startTime,
       endTime,
       totalTime: endTime - (startTime || 0),
+      startExtras,
+      endExtras,
     };
   }
 
-  startTimespan(key: string) {
+  startTimespan(key: string, extras?: Extras) {
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -82,6 +102,7 @@ class PerformanceLogger implements IPerformanceLogger {
 
     this._timespans[key] = {
       startTime: performanceNow(),
+      startExtras: extras,
     };
     _cookies[key] = Systrace.beginAsyncEvent(key);
     if (PRINT_TO_CONSOLE) {
@@ -89,7 +110,7 @@ class PerformanceLogger implements IPerformanceLogger {
     }
   }
 
-  stopTimespan(key: string) {
+  stopTimespan(key: string, extras?: Extras) {
     const timespan = this._timespans[key];
     if (!timespan || timespan.startTime == null) {
       if (PRINT_TO_CONSOLE && __DEV__) {
@@ -110,6 +131,7 @@ class PerformanceLogger implements IPerformanceLogger {
       return;
     }
 
+    timespan.endExtras = extras;
     timespan.endTime = performanceNow();
     timespan.totalTime = timespan.endTime - (timespan.startTime || 0);
     if (PRINT_TO_CONSOLE) {
@@ -179,7 +201,7 @@ class PerformanceLogger implements IPerformanceLogger {
     return value;
   }
 
-  markPoint(key: string, timestamp?: number) {
+  markPoint(key: string, timestamp?: number, extras?: Extras) {
     if (this._points[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -190,12 +212,19 @@ class PerformanceLogger implements IPerformanceLogger {
       return;
     }
     this._points[key] = timestamp ?? performanceNow();
+    if (extras) {
+      this._pointExtras[key] = extras;
+    }
   }
 
   getPoints() {
     return this._points;
   }
 
+  getPointExtras() {
+    return this._pointExtras;
+  }
+
   logEverything() {
     if (PRINT_TO_CONSOLE) {
       // log timespans

From e1bf515ae8e77fb24f76037d9f22e903799fb637 Mon Sep 17 00:00:00 2001
From: Agastya Darma <gedeagas22@gmail.com>
Date: Mon, 21 Sep 2020 10:06:25 -0700
Subject: [PATCH 047/241] Making Android versionCodeOverride for new apps using
 the template human-readable (#29808)

Summary:
The current calculation on versionCodeOverride is not human-readable.

Imagine if we have an android app with **versionName** `4.0` and **version code** `4`.

In the current implementation, the result of **versionCode** `4` for `armeabi-v7a` will be the seemingly arbitrary **1048580**. This makes the version code to be seemingly arbitrary and hard to read for humans. This PR proposes to change this calculation closer to google implementation of build number in Flutter (`abiVersionCode * 1000 + variant.versionCode`).
https://github.com/flutter/flutter/blob/39d7a019c150ca421b980426e85b254a0ec63ebd/packages/flutter_tools/gradle/flutter.gradle#L643-L647

With this change, our app with `versionCode 4 versionName "4.0"` for  `armeabi-v7a`  will have **1004**  as the version code instead of the seemingly arbitrary **1048580**. As you can see adopting the flutter style implementation make the version code easier to read and debug.

**1004**
**1** - The ABI Type `["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]`
**004** - Our versionCode.

Hopefully, this can prevent future issues like this https://github.com/facebook/react-native/issues/29790.

## Changelog

[Android] [Changed] - Making Android versionCodeOverride for new apps using the template human-readable

Pull Request resolved: https://github.com/facebook/react-native/pull/29808

Reviewed By: sammy-SC

Differential Revision: D23804632

Pulled By: fkgozali

fbshipit-source-id: 89b2c196b3bfe01fa608dfb595db6d3314ca1d63
---
 template/android/app/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/template/android/app/build.gradle b/template/android/app/build.gradle
index a5a0ea4e8bc90c..f75c160968e7eb 100644
--- a/template/android/app/build.gradle
+++ b/template/android/app/build.gradle
@@ -171,11 +171,12 @@ android {
         variant.outputs.each { output ->
             // For each separate APK per architecture, set a unique version code as described here:
             // https://developer.android.com/studio/build/configure-apk-splits.html
+            // Example: versionCode 1 will generate 1001 for armeabi-v7a, 1002 for x86, etc.
             def versionCodes = ["armeabi-v7a": 1, "x86": 2, "arm64-v8a": 3, "x86_64": 4]
             def abi = output.getFilter(OutputFile.ABI)
             if (abi != null) {  // null for the universal-debug, universal-release variants
                 output.versionCodeOverride =
-                        versionCodes.get(abi) * 1048576 + defaultConfig.versionCode
+                        defaultConfig.versionCode * 1000 + versionCodes.get(abi)
             }
 
         }

From 8cca54a7a76f49d263517da40e050d19b7c1e546 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Mon, 21 Sep 2020 11:06:54 -0700
Subject: [PATCH 048/241] Codegen Android: adjust JNI output to compile from
 Gradle

Summary:
This adjusted the C++ output for Android codegen (NativeModule specs) so we can compile it with ndk-build in Gradle:
* Use `#include` instead of `#import` for header files
* Added `#pragma once`
* Removed direct include of `<fb/fbjni.h>` -- this is not necessary
* Added generated Android.mk file based on library name

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23809082

fbshipit-source-id: 11ddfea7b48c8b2eb6efe885641ace4fc327d50d
---
 .../modules/GenerateModuleJniCpp.js           |   1 +
 .../generators/modules/GenerateModuleJniH.js  |  52 +++-
 .../GenerateModuleJniCpp-test.js.snap         |   7 +
 .../GenerateModuleJniH-test.js.snap           | 280 +++++++++++++++---
 scripts/generate-native-modules-specs-cli.js  |   5 +-
 5 files changed, 294 insertions(+), 51 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
index 1af032bbc26e1e..aac88138b51f45 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
@@ -67,6 +67,7 @@ namespace react {
 
 std::shared_ptr<TurboModule> ::_LIBRARY_NAME_::_ModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
 ::_MODULE_LOOKUP_::
+  return nullptr;
 }
 
 } // namespace react
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 1b50545f5f4071..4d9a5aac0cf688 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -23,8 +23,7 @@ public:
 };
 `;
 
-const template = `
-/**
+const template = `/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -33,10 +32,11 @@ const template = `
  * ${'@'}generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -49,6 +49,35 @@ std::shared_ptr<TurboModule> ::_LIBRARY_NAME_::_ModuleProvider(const std::string
 } // namespace facebook
 `;
 
+const androidMkTemplate = `# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := ::_LIBRARY_NAME_::
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\
+  -DLOG_TAG=\\"ReactNative\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
+`;
+
 module.exports = {
   generate(
     libraryName: string,
@@ -76,6 +105,15 @@ module.exports = {
     const replacedTemplate = template
       .replace(/::_MODULES_::/g, modules)
       .replace(/::_LIBRARY_NAME_::/g, libraryName);
-    return new Map([[fileName, replacedTemplate]]);
+    return new Map([
+      [fileName, replacedTemplate],
+      [
+        'Android.mk',
+        androidMkTemplate.replace(
+          /::_LIBRARY_NAME_::/g,
+          `react_codegen_${libraryName.toLowerCase()}`,
+        ),
+      ],
+    ]);
   },
 };
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
index d12482b2b57f7a..47f3a3168ef989 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniCpp-test.js.snap
@@ -46,6 +46,7 @@ std::shared_ptr<TurboModule> COMPLEX_OBJECTS_ModuleProvider(const std::string mo
   if (moduleName == \\"SampleTurboModule\\") {
     return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
   }
+  return nullptr;
 }
 
 } // namespace react
@@ -82,6 +83,7 @@ std::shared_ptr<TurboModule> EMPTY_NATIVE_MODULES_ModuleProvider(const std::stri
   if (moduleName == \\"SampleTurboModule\\") {
     return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
   }
+  return nullptr;
 }
 
 } // namespace react
@@ -123,6 +125,7 @@ std::shared_ptr<TurboModule> NATIVE_MODULES_WITH_TYPE_ALIASES_ModuleProvider(con
   if (moduleName == \\"AliasTurboModule\\") {
     return std::make_shared<NativeAliasTurboModuleSpecJSI>(params);
   }
+  return nullptr;
 }
 
 } // namespace react
@@ -218,6 +221,7 @@ std::shared_ptr<TurboModule> REAL_MODULE_EXAMPLE_ModuleProvider(const std::strin
   if (moduleName == \\"ExceptionsManager\\") {
     return std::make_shared<NativeExceptionsManagerSpecJSI>(params);
   }
+  return nullptr;
 }
 
 } // namespace react
@@ -307,6 +311,7 @@ std::shared_ptr<TurboModule> SIMPLE_NATIVE_MODULES_ModuleProvider(const std::str
   if (moduleName == \\"SampleTurboModule\\") {
     return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
   }
+  return nullptr;
 }
 
 } // namespace react
@@ -360,6 +365,7 @@ std::shared_ptr<TurboModule> TWO_MODULES_DIFFERENT_FILES_ModuleProvider(const st
   if (moduleName == \\"Sample2TurboModule\\") {
     return std::make_shared<NativeSample2TurboModuleSpecJSI>(params);
   }
+  return nullptr;
 }
 
 } // namespace react
@@ -411,6 +417,7 @@ std::shared_ptr<TurboModule> TWO_MODULES_SAME_FILE_ModuleProvider(const std::str
   if (moduleName == \\"Sample2TurboModule\\") {
     return std::make_shared<NativeSample2TurboModuleSpecJSI>(params);
   }
+  return nullptr;
 }
 
 } // namespace react
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
index afb55a73886ba9..efe08283828084 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -2,8 +2,7 @@
 
 exports[`GenerateModuleJniH can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -12,10 +11,11 @@ Map {
  * @generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -33,14 +33,41 @@ std::shared_ptr<TurboModule> COMPLEX_OBJECTS_ModuleProvider(const std::string mo
 
 } // namespace react
 } // namespace facebook
+",
+  "Android.mk" => "# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_codegen_complex_objects
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\\\
+  -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
 ",
 }
 `;
 
 exports[`GenerateModuleJniH can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -49,10 +76,11 @@ Map {
  * @generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -70,14 +98,41 @@ std::shared_ptr<TurboModule> EMPTY_NATIVE_MODULES_ModuleProvider(const std::stri
 
 } // namespace react
 } // namespace facebook
+",
+  "Android.mk" => "# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_codegen_empty_native_modules
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\\\
+  -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
 ",
 }
 `;
 
 exports[`GenerateModuleJniH can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -86,10 +141,11 @@ Map {
  * @generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -107,14 +163,41 @@ std::shared_ptr<TurboModule> NATIVE_MODULES_WITH_TYPE_ALIASES_ModuleProvider(con
 
 } // namespace react
 } // namespace facebook
+",
+  "Android.mk" => "# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_codegen_native_modules_with_type_aliases
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\\\
+  -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
 ",
 }
 `;
 
 exports[`GenerateModuleJniH can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -123,10 +206,11 @@ Map {
  * @generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -160,14 +244,41 @@ std::shared_ptr<TurboModule> REAL_MODULE_EXAMPLE_ModuleProvider(const std::strin
 
 } // namespace react
 } // namespace facebook
+",
+  "Android.mk" => "# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_codegen_real_module_example
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\\\
+  -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
 ",
 }
 `;
 
 exports[`GenerateModuleJniH can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -176,10 +287,11 @@ Map {
  * @generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -197,14 +309,41 @@ std::shared_ptr<TurboModule> SIMPLE_NATIVE_MODULES_ModuleProvider(const std::str
 
 } // namespace react
 } // namespace facebook
+",
+  "Android.mk" => "# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_codegen_simple_native_modules
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\\\
+  -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
 ",
 }
 `;
 
 exports[`GenerateModuleJniH can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -213,10 +352,11 @@ Map {
  * @generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -242,14 +382,41 @@ std::shared_ptr<TurboModule> TWO_MODULES_DIFFERENT_FILES_ModuleProvider(const st
 
 } // namespace react
 } // namespace facebook
+",
+  "Android.mk" => "# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_codegen_two_modules_different_files
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\\\
+  -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
 ",
 }
 `;
 
 exports[`GenerateModuleJniH can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -258,10 +425,11 @@ Map {
  * @generated by codegen project: GenerateModuleJniH.js
  */
 
-#import <ReactCommon/JavaTurboModule.h>
-#import <ReactCommon/TurboModule.h>
-#import <fb/fbjni.h>
-#import <jsi/jsi.h>
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <jsi/jsi.h>
 
 namespace facebook {
 namespace react {
@@ -287,6 +455,34 @@ std::shared_ptr<TurboModule> TWO_MODULES_SAME_FILE_ModuleProvider(const std::str
 
 } // namespace react
 } // namespace facebook
+",
+  "Android.mk" => "# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := react_codegen_two_modules_same_file
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core
+
+LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \\\\
+  -DLOG_TAG=\\\\\\"ReactNative\\\\\\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
 ",
 }
 `;
diff --git a/scripts/generate-native-modules-specs-cli.js b/scripts/generate-native-modules-specs-cli.js
index 003c4105ab2024..a668c58b9ccecc 100644
--- a/scripts/generate-native-modules-specs-cli.js
+++ b/scripts/generate-native-modules-specs-cli.js
@@ -90,8 +90,9 @@ function generateSpec(
     files
       .filter(
         f =>
-          f.startsWith(moduleSpecName) &&
-          (f.endsWith('.h') || f.endsWith('.cpp')),
+          f === 'Android.mk' ||
+          (f.startsWith(moduleSpecName) &&
+            (f.endsWith('.h') || f.endsWith('.cpp'))),
       )
       .forEach(f => {
         fs.copyFileSync(

From 2b46fd065f8af654929e651cd3ee30a468e4db95 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Mon, 21 Sep 2020 11:06:54 -0700
Subject: [PATCH 049/241] Codegen Android: Compile ReactAndroid codegen C++
 output

Summary:
Now that the react-native-codegen produces the Android.mk for the JNI C++ output, let's compile them into its own shared library, to be included in the ReactAndroid final deliverable: libreact_codegen_reactandroidspec.so. This is gated behind `USE_CODEGEN` env var.

Note: RNTester specific C++ spec files are not compiled here.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23809081

fbshipit-source-id: 7a90f420a923d5d02654facac01ffe025c321e44
---
 ReactAndroid/build.gradle                         |  7 ++++++-
 ReactAndroid/src/main/jni/Application.mk          |  2 +-
 ReactAndroid/src/main/jni/react/jni/Android.mk    |  4 ++++
 .../react/codegen/plugin/CodegenPlugin.java       | 15 +++++++++++----
 .../codegen/plugin/CodegenPluginExtension.java    |  1 -
 packages/rn-tester/android/app/build.gradle       |  1 -
 6 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle
index 1189ead6e9a4c4..1c0a3a0f9b301a 100644
--- a/ReactAndroid/build.gradle
+++ b/ReactAndroid/build.gradle
@@ -33,6 +33,9 @@ def thirdPartyNdkDir = new File("$buildDir/third-party-ndk")
 //   - glog-0.3.5
 def dependenciesPath = System.getenv("REACT_NATIVE_DEPENDENCIES")
 
+// The 'USE_CODEGEN' environment variable will use codegen and compile the output.
+def enableCodegen =  (System.getenv('USE_CODEGEN') ?: '0').toBoolean()
+
 // The 'USE_FABRIC' environment variable will build Fabric C++ code into the bundle
 // USE_FABRIC=0 will build RN excluding fabric
 // USE_FABRIC=1 will build RN including fabric
@@ -301,6 +304,7 @@ def getNdkBuildFullPath() {
 
 def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
     dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
+    dependsOn("generateCodegenArtifactsFromSchema");
 
     inputs.dir("$projectDir/../ReactCommon")
     inputs.dir("src/main/jni")
@@ -314,8 +318,10 @@ def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
             "NDK_LIBS_OUT=$buildDir/react-ndk/all",
             "THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
             "REACT_COMMON_DIR=$projectDir/../ReactCommon",
+            "REACT_GENERATED_SRC_DIR=$buildDir/generated/source",
             "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
             "BUILD_FABRIC=$enableFabric",
+            "USE_CODEGEN=$enableCodegen",
             "-C", file("src/main/jni/react/jni").absolutePath,
             "--jobs", project.findProperty("jobs") ?: Runtime.runtime.availableProcessors()
     )
@@ -471,7 +477,6 @@ dependencies {
 apply(from: "release.gradle")
 
 react {
-    enableCodegen = System.getenv("USE_CODEGEN") ?: false
     jsRootDir = file("../Libraries")
     reactNativeRootDir = file("$rootDir")
     useJavaGenerator = System.getenv("USE_CODEGEN_JAVAPOET") ?: false
diff --git a/ReactAndroid/src/main/jni/Application.mk b/ReactAndroid/src/main/jni/Application.mk
index 84eae80adf4c9d..8bcc6cfa8b8817 100644
--- a/ReactAndroid/src/main/jni/Application.mk
+++ b/ReactAndroid/src/main/jni/Application.mk
@@ -22,7 +22,7 @@ APP_MK_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
 # Where are APP_MK_DIR, THIRD_PARTY_NDK_DIR, etc. defined?
 #   The directories inside NDK_MODULE_PATH (ex: APP_MK_DIR, THIRD_PARTY_NDK_DIR,
 #   etc.) are defined inside build.gradle.
-NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party$(HOST_DIRSEP)$(REACT_SRC_DIR)
+NDK_MODULE_PATH := $(APP_MK_DIR)$(HOST_DIRSEP)$(THIRD_PARTY_NDK_DIR)$(HOST_DIRSEP)$(REACT_COMMON_DIR)$(HOST_DIRSEP)$(APP_MK_DIR)first-party$(HOST_DIRSEP)$(REACT_SRC_DIR)$(HOST_DIRSEP)$(REACT_GENERATED_SRC_DIR)
 
 APP_STL := c++_shared
 
diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/main/jni/react/jni/Android.mk
index a816d4fea7aad3..b4ba8ddce6a245 100644
--- a/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -148,3 +148,7 @@ include $(REACT_SRC_DIR)/jscexecutor/Android.mk
 include $(REACT_SRC_DIR)/../hermes/reactexecutor/Android.mk
 include $(REACT_SRC_DIR)/../hermes/instrumentation/Android.mk
 include $(REACT_SRC_DIR)/modules/blob/jni/Android.mk
+
+ifeq ($(USE_CODEGEN),true)
+  include $(REACT_GENERATED_SRC_DIR)/codegen/jni/Android.mk
+endif
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
index 68cd4139a64ec0..1d58a2e561259d 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
+++ b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPlugin.java
@@ -25,6 +25,12 @@
 public class CodegenPlugin implements Plugin<Project> {
 
   public void apply(final Project project) {
+    // This flag should have been defined in CodegenPluginExtension, but the extension values
+    // resolution is pending project full evaluation. Given that no codegen actual task should
+    // be defined if the flag is not enabled, read directly from env var here.
+    final String useCodegenVar = System.getenv("USE_CODEGEN");
+    final boolean enableCodegen =
+        useCodegenVar != null && (Boolean.parseBoolean(useCodegenVar) || useCodegenVar.equals("1"));
     final CodegenPluginExtension extension =
         project.getExtensions().create("react", CodegenPluginExtension.class, project);
 
@@ -39,7 +45,8 @@ public void apply(final Project project) {
             "generateCodegenSchemaFromJavaScript",
             Exec.class,
             task -> {
-              if (!extension.enableCodegen) {
+              if (!enableCodegen) {
+                task.commandLine("echo", "Skipping: not using react-native-codegen.");
                 return;
               }
 
@@ -79,7 +86,8 @@ public void apply(final Project project) {
             "generateCodegenArtifactsFromSchema",
             Exec.class,
             task -> {
-              if (!extension.enableCodegen) {
+              if (!enableCodegen) {
+                task.commandLine("echo", "Skipping: not using react-native-codegen.");
                 return;
               }
 
@@ -116,7 +124,7 @@ public void apply(final Project project) {
     // Note: This last step needs to happen after the project has been evaluated.
     project.afterEvaluate(
         s -> {
-          if (!extension.enableCodegen) {
+          if (!enableCodegen) {
             return;
           }
 
@@ -142,7 +150,6 @@ public void apply(final Project project) {
               .getByName("main")
               .getJava()
               .srcDir(new File(generatedSrcDir, "java"));
-          // TODO: Add JNI sources.
         });
   }
 
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
index 97817617d947a5..fe540dd353dc92 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
+++ b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/plugin/CodegenPluginExtension.java
@@ -15,7 +15,6 @@
 public class CodegenPluginExtension {
   // TODO: Remove beta.
   public String codegenJavaPackageName = "com.facebook.fbreact.specs.beta";
-  public boolean enableCodegen = false;
   public File jsRootDir;
   public String libraryName;
   public String[] nodeExecutableAndArgs = {"node"};
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index 3bad38b8dc353f..38b128c87a23ef 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -220,7 +220,6 @@ dependencies {
 }
 
 react {
-    enableCodegen = System.getenv("USE_CODEGEN") ?: false
     jsRootDir = file("$rootDir/packages/rn-tester")
     reactNativeRootDir = file("$rootDir")
     useJavaGenerator = System.getenv("USE_CODEGEN_JAVAPOET") ?: false

From 30d170adc6b0d5edfc2fad525e2e8ab07866f771 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Mon, 21 Sep 2020 11:07:12 -0700
Subject: [PATCH 050/241] Use Element<> in FindNodeAtPointTest

Summary: Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D23815171

fbshipit-source-id: bf420be172a55a966f8881371473e121c3848c78
---
 .../core/tests/FindNodeAtPointTest.cpp        | 239 +++++++++---------
 1 file changed, 123 insertions(+), 116 deletions(-)

diff --git a/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp b/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp
index 79787b4bf9bfef..f84a89cf60a66b 100644
--- a/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp
@@ -6,134 +6,141 @@
  */
 
 #include <gtest/gtest.h>
+#include <react/renderer/element/Element.h>
+#include <react/renderer/element/testUtils.h>
+
 #include "TestComponent.h"
 
 using namespace facebook::react;
 
-/*
- *┌─────────────────────────┐
- *│nodeA_                   │
- *│                         │
- *│                         │
- *│                         │
- *│                         │
- *│                         │
- *│                         │
- *│      ┌────────────────┐ │
- *│      │nodeAA_         │ │
- *│      │                │ │
- *│      │     ┌───────┐  │ │
- *│      │     │nodeAA_│  │ │
- *│      │     │       │  │ │
- *│      │     └───────┘  │ │
- *│      └────────────────┘ │
- *└─────────────────────────┘
- */
-class FindNodeAtPointTest : public ::testing::Test {
- protected:
-  FindNodeAtPointTest()
-      : eventDispatcher_(std::shared_ptr<EventDispatcher const>()),
-        componentDescriptor_(TestComponentDescriptor({eventDispatcher_})) {
-    auto traits = TestShadowNode::BaseTraits();
-
-    auto familyA = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 9,
-            /* .surfaceId = */ 1,
-            /* .eventEmitter = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
-
-    nodeA_ = std::make_shared<TestShadowNode>(
-        ShadowNodeFragment{
-            /* .props = */ std::make_shared<const TestProps>(),
-            /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
-        },
-        familyA,
-        traits);
-
-    auto familyAA = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 10,
-            /* .surfaceId = */ 1,
-            /* .eventEmitter = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
-
-    nodeAA_ = std::make_shared<TestShadowNode>(
-        ShadowNodeFragment{
-            /* .props = */ std::make_shared<const TestProps>(),
-            /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
-        },
-        familyAA,
-        traits);
-
-    auto familyAAA = std::make_shared<ShadowNodeFamily>(
-        ShadowNodeFamilyFragment{
-            /* .tag = */ 11,
-            /* .surfaceId = */ 1,
-            /* .eventEmitter = */ nullptr,
-        },
-        eventDispatcher_,
-        componentDescriptor_);
-
-    nodeAAA_ = std::make_shared<TestShadowNode>(
-        ShadowNodeFragment{
-            /* .props = */ std::make_shared<const TestProps>(),
-            /* .children = */ ShadowNode::emptySharedShadowNodeSharedList(),
-        },
-        familyAAA,
-        traits);
-
-    nodeA_->appendChild(nodeAA_);
-    nodeAA_->appendChild(nodeAAA_);
-
-    auto layoutMetrics = EmptyLayoutMetrics;
-
-    layoutMetrics.frame = facebook::react::Rect{
-        facebook::react::Point{0, 0}, facebook::react::Size{1000, 1000}};
-    nodeA_->setLayoutMetrics(layoutMetrics);
-
-    layoutMetrics.frame = facebook::react::Rect{
-        facebook::react::Point{100, 100}, facebook::react::Size{100, 100}};
-    nodeAA_->setLayoutMetrics(layoutMetrics);
-
-    layoutMetrics.frame = facebook::react::Rect{facebook::react::Point{10, 10},
-                                                facebook::react::Size{10, 10}};
-    nodeAAA_->setLayoutMetrics(layoutMetrics);
-  }
-
-  std::shared_ptr<EventDispatcher const> eventDispatcher_;
-  std::shared_ptr<TestShadowNode> nodeA_;
-  std::shared_ptr<TestShadowNode> nodeAA_;
-  std::shared_ptr<TestShadowNode> nodeAAA_;
-  TestComponentDescriptor componentDescriptor_;
-};
-
-TEST_F(FindNodeAtPointTest, withoutTransform) {
+TEST(FindNodeAtPointTest, withoutTransform) {
+  auto builder = simpleComponentBuilder();
+
+  // clang-format off
+  auto element =
+    Element<ViewShadowNode>()
+      .tag(1)
+      .finalize([](ViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {1000, 1000};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+      })
+      .children({
+        Element<ViewShadowNode>()
+        .tag(2)
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {100, 100};
+          layoutMetrics.frame.size = {100, 100};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        })
+        .children({
+          Element<ViewShadowNode>()
+          .tag(3)
+          .finalize([](ViewShadowNode &shadowNode){
+            auto layoutMetrics = EmptyLayoutMetrics;
+            layoutMetrics.frame.origin = {10, 10};
+            layoutMetrics.frame.size = {10, 10};
+            shadowNode.setLayoutMetrics(layoutMetrics);
+          })
+        })
+    });
+  
+  auto parentShadowNode = builder.build(element);
+  
   EXPECT_EQ(
-      LayoutableShadowNode::findNodeAtPoint(nodeA_, {115, 115}), nodeAAA_);
-  EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(nodeA_, {105, 105}), nodeAA_);
-  EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(nodeA_, {900, 900}), nodeA_);
+            LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {115, 115})->getTag(), 3);
+  EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {105, 105})->getTag(), 2);
+  EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {900, 900})->getTag(), 1);
   EXPECT_EQ(
-      LayoutableShadowNode::findNodeAtPoint(nodeA_, {1001, 1001}), nullptr);
+      LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {1001, 1001}), nullptr);
 }
 
-TEST_F(FindNodeAtPointTest, viewIsTranslated) {
-  nodeA_->_contentOriginOffset = {-100, -100};
+TEST(FindNodeAtPointTest, viewIsTranslated) {
+  auto builder = simpleComponentBuilder();
+
+  // clang-format off
+  auto element =
+    Element<ScrollViewShadowNode>()
+      .tag(1)
+      .finalize([](ScrollViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {1000, 1000};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+      })
+      .stateData([](ScrollViewState &data) {
+        data.contentOffset = {100, 100};
+      })
+      .children({
+        Element<ViewShadowNode>()
+        .tag(2)
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {100, 100};
+          layoutMetrics.frame.size = {100, 100};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        })
+        .children({
+          Element<ViewShadowNode>()
+          .tag(3)
+          .finalize([](ViewShadowNode &shadowNode){
+            auto layoutMetrics = EmptyLayoutMetrics;
+            layoutMetrics.frame.origin = {10, 10};
+            layoutMetrics.frame.size = {10, 10};
+            shadowNode.setLayoutMetrics(layoutMetrics);
+          })
+        })
+    });
+  
+  auto parentShadowNode = builder.build(element);
 
   EXPECT_EQ(
-      LayoutableShadowNode::findNodeAtPoint(nodeA_, {15, 15})->getTag(),
-      nodeAAA_->getTag());
-  EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(nodeA_, {5, 5}), nodeAA_);
+      LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {15, 15})->getTag(),
+      3);
+  EXPECT_EQ(LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {5, 5})->getTag(), 2);
 }
 
-TEST_F(FindNodeAtPointTest, viewIsScaled) {
-  nodeAAA_->_transform = Transform::Identity() * Transform::Scale(0.5, 0.5, 0);
+TEST(FindNodeAtPointTest, viewIsScaled) {
+  auto builder = simpleComponentBuilder();
+
+  // clang-format off
+  auto element =
+    Element<ViewShadowNode>()
+      .tag(1)
+      .finalize([](ViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {1000, 1000};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+      })
+      .children({
+        Element<ViewShadowNode>()
+        .tag(2)
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {100, 100};
+          layoutMetrics.frame.size = {100, 100};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        })
+        .children({
+          Element<ViewShadowNode>()
+          .tag(3)
+          .props([] {
+            auto sharedProps = std::make_shared<ViewProps>();
+            sharedProps->transform = Transform::Scale(0.5, 0.5, 0);
+            return sharedProps;
+          })
+          .finalize([](ViewShadowNode &shadowNode){
+            auto layoutMetrics = EmptyLayoutMetrics;
+            layoutMetrics.frame.origin = {10, 10};
+            layoutMetrics.frame.size = {10, 10};
+            shadowNode.setLayoutMetrics(layoutMetrics);
+          })
+        })
+    });
+  
+  auto parentShadowNode = builder.build(element);
 
   EXPECT_EQ(
-      LayoutableShadowNode::findNodeAtPoint(nodeA_, {119, 119})->getTag(),
-      nodeAA_->getTag());
+      LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {119, 119})->getTag(),
+      2);
 }

From 18f29db5a765b1e3523773aad8301c0e7e52ab9a Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Mon, 21 Sep 2020 11:07:12 -0700
Subject: [PATCH 051/241] Fix ordering of children in
 LayoutableShadowNode::findNodeAtPoint

Summary:
Changelog: [internal]

`LayoutableShadowNode::findNodeAtPoint` was iterating children in incorrect order and wasn't taking zIndex into accout.

Reviewed By: JoshuaGross

Differential Revision: D23814866

fbshipit-source-id: 38eee297147a5c5912304d139bb10f8b16ae2ee1
---
 .../renderer/core/LayoutableShadowNode.cpp    | 12 ++-
 .../core/tests/FindNodeAtPointTest.cpp        | 83 +++++++++++++++++++
 2 files changed, 94 insertions(+), 1 deletion(-)

diff --git a/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
index 51b29867787525..3809740c83e72d 100644
--- a/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
+++ b/ReactCommon/react/renderer/core/LayoutableShadowNode.cpp
@@ -238,7 +238,17 @@ ShadowNode::Shared LayoutableShadowNode::findNodeAtPoint(
 
   auto newPoint = point - transformedFrame.origin -
       layoutableShadowNode->getContentOriginOffset();
-  for (const auto &childShadowNode : node->getChildren()) {
+
+  auto sortedChildren = node->getChildren();
+  std::stable_sort(
+      sortedChildren.begin(),
+      sortedChildren.end(),
+      [](auto const &lhs, auto const &rhs) -> bool {
+        return lhs->getOrderIndex() < rhs->getOrderIndex();
+      });
+
+  for (auto it = sortedChildren.rbegin(); it != sortedChildren.rend(); it++) {
+    auto const &childShadowNode = *it;
     auto hitView = findNodeAtPoint(childShadowNode, newPoint);
     if (hitView) {
       return hitView;
diff --git a/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp b/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp
index f84a89cf60a66b..37f1c4106db603 100644
--- a/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp
+++ b/ReactCommon/react/renderer/core/tests/FindNodeAtPointTest.cpp
@@ -144,3 +144,86 @@ TEST(FindNodeAtPointTest, viewIsScaled) {
       LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {119, 119})->getTag(),
       2);
 }
+
+TEST(FindNodeAtPointTest, overlappingViews) {
+  auto builder = simpleComponentBuilder();
+
+  // clang-format off
+  auto element =
+    Element<ViewShadowNode>()
+      .tag(1)
+      .finalize([](ViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {100, 100};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+      })
+      .children({
+        Element<ViewShadowNode>()
+        .tag(2)
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {25, 25};
+          layoutMetrics.frame.size = {50, 50};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        }),
+        Element<ViewShadowNode>()
+        .tag(3)
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {50, 50};
+          layoutMetrics.frame.size = {50, 50};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        })
+    });
+  
+  auto parentShadowNode = builder.build(element);
+  
+  EXPECT_EQ(
+            LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {50, 50})->getTag(), 3);
+}
+
+TEST(FindNodeAtPointTest, overlappingViewsWithZIndex) {
+  auto builder = simpleComponentBuilder();
+
+  // clang-format off
+  auto element =
+    Element<ViewShadowNode>()
+      .tag(1)
+      .finalize([](ViewShadowNode &shadowNode){
+        auto layoutMetrics = EmptyLayoutMetrics;
+        layoutMetrics.frame.size = {100, 100};
+        shadowNode.setLayoutMetrics(layoutMetrics);
+      })
+      .children({
+        Element<ViewShadowNode>()
+        .tag(2)
+        .props([] {
+          auto sharedProps = std::make_shared<ViewProps>();
+          sharedProps->zIndex = 1;
+          auto &yogaStyle = sharedProps->yogaStyle;
+          yogaStyle.positionType() = YGPositionTypeAbsolute;
+          return sharedProps;
+        })
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {25, 25};
+          layoutMetrics.frame.size = {50, 50};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        }),
+        Element<ViewShadowNode>()
+        .tag(3)
+        .finalize([](ViewShadowNode &shadowNode){
+          auto layoutMetrics = EmptyLayoutMetrics;
+          layoutMetrics.frame.origin = {50, 50};
+          layoutMetrics.frame.size = {50, 50};
+          shadowNode.setLayoutMetrics(layoutMetrics);
+        })
+    });
+  
+  auto parentShadowNode = builder.build(element);
+  
+  EXPECT_EQ(
+            LayoutableShadowNode::findNodeAtPoint(parentShadowNode, {50, 50})->getTag(), 2);
+}
+
+

From 23717e48aff3d7fdaea30c9b8dcdd6cfbb7802d5 Mon Sep 17 00:00:00 2001
From: Scott Kyle <skyle@fb.com>
Date: Mon, 21 Sep 2020 17:28:47 -0700
Subject: [PATCH 052/241] Call stopObserving on correct queue

Summary:
Since `dealloc` can be called from any thread, this would result `stopObserving` being called on a different thread/queue than the specified `methodQueue`. We specifically encountered this issue with a module needing the main queue having its `stopObserving` called on a background queue.

Changelog:
[iOS][Fixed] - Call [RCTEventEmitter stopObserving] on specified method queue

Reviewed By: RSNara

Differential Revision: D23821741

fbshipit-source-id: 693c3be6876f863da6dd214a829af2cc13a09c3f
---
 Libraries/NativeAnimation/RCTNativeAnimatedModule.mm      | 1 +
 Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm | 1 +
 Libraries/Network/RCTNetworking.mm                        | 4 +++-
 React/CoreModules/RCTAppState.h                           | 2 +-
 React/CoreModules/RCTAppState.mm                          | 5 -----
 React/CoreModules/RCTDevSettings.mm                       | 1 +
 React/CoreModules/RCTWebSocketModule.mm                   | 2 ++
 React/Modules/RCTEventEmitter.h                           | 4 +++-
 React/Modules/RCTEventEmitter.m                           | 2 +-
 9 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
index 35adf39289aa07..33fe87ad4d4a10 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.mm
@@ -46,6 +46,7 @@ - (instancetype)init
 
 - (void)invalidate
 {
+  [super invalidate];
   [_nodesManager stopAnimationLoop];
   [self.bridge.eventDispatcher removeDispatchObserver:self];
   [self.bridge.uiManager.observerCoordinator removeObserver:self];
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
index 6fc594872f874b..45213380d81d7a 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.mm
@@ -47,6 +47,7 @@ - (instancetype)init
 
 - (void)invalidate
 {
+  [super invalidate];
   [_nodesManager stopAnimationLoop];
   [self.bridge.eventDispatcher removeDispatchObserver:self];
   [self.bridge.uiManager.observerCoordinator removeObserver:self];
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index b857c43a9086e4..c4dbf8a7bf3364 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -168,6 +168,8 @@ - (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^
 
 - (void)invalidate
 {
+  [super invalidate];
+
   for (NSNumber *requestID in _tasksByRequestID) {
     [_tasksByRequestID[requestID] cancel];
   }
@@ -680,7 +682,7 @@ - (RCTNetworkTask *)networkTaskWithRequest:(NSURLRequest *)request completionBlo
     @"timeout": @(query.timeout()),
     @"withCredentials": @(query.withCredentials()),
   };
-  
+
   // TODO: buildRequest returns a cancellation block, but there's currently
   // no way to invoke it, if, for example the request is cancelled while
   // loading a large file to build the request body
diff --git a/React/CoreModules/RCTAppState.h b/React/CoreModules/RCTAppState.h
index 6e0f19c3356f65..0921f70e44723b 100644
--- a/React/CoreModules/RCTAppState.h
+++ b/React/CoreModules/RCTAppState.h
@@ -7,6 +7,6 @@
 
 #import <React/RCTEventEmitter.h>
 
-@interface RCTAppState : RCTEventEmitter <RCTInvalidating>
+@interface RCTAppState : RCTEventEmitter
 
 @end
diff --git a/React/CoreModules/RCTAppState.mm b/React/CoreModules/RCTAppState.mm
index 66a1e72693f2f6..b0dc10bce5ad6d 100644
--- a/React/CoreModules/RCTAppState.mm
+++ b/React/CoreModules/RCTAppState.mm
@@ -99,11 +99,6 @@ - (void)stopObserving
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (void)invalidate
-{
-  [self stopObserving];
-}
-
 #pragma mark - App Notification Methods
 
 - (void)handleMemoryWarning
diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm
index 50d9cd0cde8447..4bf03630201fe0 100644
--- a/React/CoreModules/RCTDevSettings.mm
+++ b/React/CoreModules/RCTDevSettings.mm
@@ -202,6 +202,7 @@ - (dispatch_queue_t)methodQueue
 
 - (void)invalidate
 {
+  [super invalidate];
 #if ENABLE_PACKAGER_CONNECTION
   [[RCTPackagerConnection sharedPackagerConnection] removeHandler:_reloadToken];
 #endif
diff --git a/React/CoreModules/RCTWebSocketModule.mm b/React/CoreModules/RCTWebSocketModule.mm
index e26423d245438b..3bc43d797f65d6 100644
--- a/React/CoreModules/RCTWebSocketModule.mm
+++ b/React/CoreModules/RCTWebSocketModule.mm
@@ -53,6 +53,8 @@ - (NSArray *)supportedEvents
 
 - (void)invalidate
 {
+  [super invalidate];
+
   _contentHandlers = nil;
   for (RCTSRWebSocket *socket in _sockets.allValues) {
     socket.delegate = nil;
diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h
index 700368c599d016..f04d50f02418e4 100644
--- a/React/Modules/RCTEventEmitter.h
+++ b/React/Modules/RCTEventEmitter.h
@@ -12,7 +12,7 @@
  * RCTEventEmitter is an abstract base class to be used for modules that emit
  * events to be observed by JS.
  */
-@interface RCTEventEmitter : NSObject <RCTBridgeModule, RCTJSInvokerModule>
+@interface RCTEventEmitter : NSObject <RCTBridgeModule, RCTJSInvokerModule, RCTInvalidating>
 
 @property (nonatomic, weak) RCTBridge *bridge;
 
@@ -37,6 +37,8 @@
 - (void)startObserving;
 - (void)stopObserving;
 
+- (void)invalidate NS_REQUIRES_SUPER;
+
 - (void)addListener:(NSString *)eventName;
 - (void)removeListeners:(double)count;
 
diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m
index 7717ddbdcac451..6e5a6ff37e7f5d 100644
--- a/React/Modules/RCTEventEmitter.m
+++ b/React/Modules/RCTEventEmitter.m
@@ -78,7 +78,7 @@ - (void)stopObserving
   // Does nothing
 }
 
-- (void)dealloc
+- (void)invalidate
 {
   if (_listenerCount > 0) {
     [self stopObserving];

From acb967e1bbe2f980e7339f5279a1206c089c3774 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Tue, 22 Sep 2020 01:50:39 -0700
Subject: [PATCH 053/241] Pull out construction of Layout from
 TextLayoutManager.measureText into separate function

Summary:
Changelog: [Internal]

Construction of Layout will be needed in `TextLayoutManager.measureLines`, pulling it out into separate function prevents code duplication.

Reviewed By: shergin

Differential Revision: D23782905

fbshipit-source-id: 8ab817559ca154716a190ca1012e809c5fa2fd6e
---
 .../react/views/text/TextLayoutManager.java   | 103 ++++++++++--------
 1 file changed, 60 insertions(+), 43 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index c1143b430830e7..3fa47c3a9d7c66 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -257,51 +257,19 @@ private static Spannable createSpannableFromAttributedString(
     return sb;
   }
 
-  public static long measureText(
-      Context context,
-      ReadableMap attributedString,
-      ReadableMap paragraphAttributes,
+  private static Layout createLayout(
+      Spannable text,
+      BoringLayout.Metrics boring,
       float width,
       YogaMeasureMode widthYogaMeasureMode,
-      float height,
-      YogaMeasureMode heightYogaMeasureMode,
-      ReactTextViewManagerCallback reactTextViewManagerCallback,
-      @Nullable float[] attachmentsPositions) {
-
-    // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
+      boolean includeFontPadding,
+      int textBreakStrategy) {
+    Layout layout;
+    int spanLength = text.length();
+    boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
     TextPaint textPaint = sTextPaintInstance;
-    Spannable text;
-    if (attributedString.hasKey("cacheId")) {
-      int cacheId = attributedString.getInt("cacheId");
-      if (sTagToSpannableCache.containsKey(cacheId)) {
-        text = sTagToSpannableCache.get(cacheId);
-      } else {
-        return 0;
-      }
-    } else {
-      text = getOrCreateSpannableForText(context, attributedString, reactTextViewManagerCallback);
-    }
-
-    int textBreakStrategy =
-        TextAttributeProps.getTextBreakStrategy(
-            paragraphAttributes.getString(TEXT_BREAK_STRATEGY_KEY));
-    boolean includeFontPadding =
-        paragraphAttributes.hasKey(INCLUDE_FONT_PADDING_KEY)
-            ? paragraphAttributes.getBoolean(INCLUDE_FONT_PADDING_KEY)
-            : DEFAULT_INCLUDE_FONT_PADDING;
-
-    if (text == null) {
-      throw new IllegalStateException("Spannable element has not been prepared in onBeforeLayout");
-    }
-
-    BoringLayout.Metrics boring = BoringLayout.isBoring(text, textPaint);
     float desiredWidth = boring == null ? Layout.getDesiredWidth(text, textPaint) : Float.NaN;
 
-    // technically, width should never be negative, but there is currently a bug in
-    boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
-
-    Layout layout;
-    int spanLength = text.length();
     if (boring == null
         && (unconstrainedWidth
             || (!YogaConstants.isUndefined(desiredWidth) && desiredWidth <= width))) {
@@ -367,6 +335,55 @@ public static long measureText(
                 .build();
       }
     }
+    return layout;
+  }
+
+  public static long measureText(
+      Context context,
+      ReadableMap attributedString,
+      ReadableMap paragraphAttributes,
+      float width,
+      YogaMeasureMode widthYogaMeasureMode,
+      float height,
+      YogaMeasureMode heightYogaMeasureMode,
+      ReactTextViewManagerCallback reactTextViewManagerCallback,
+      @Nullable float[] attachmentsPositions) {
+
+    // TODO(5578671): Handle text direction (see View#getTextDirectionHeuristic)
+    TextPaint textPaint = sTextPaintInstance;
+    Spannable text;
+    if (attributedString.hasKey("cacheId")) {
+      int cacheId = attributedString.getInt("cacheId");
+      if (sTagToSpannableCache.containsKey(cacheId)) {
+        text = sTagToSpannableCache.get(cacheId);
+      } else {
+        return 0;
+      }
+    } else {
+      text = getOrCreateSpannableForText(context, attributedString, reactTextViewManagerCallback);
+    }
+
+    int textBreakStrategy =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(TEXT_BREAK_STRATEGY_KEY));
+    boolean includeFontPadding =
+        paragraphAttributes.hasKey(INCLUDE_FONT_PADDING_KEY)
+            ? paragraphAttributes.getBoolean(INCLUDE_FONT_PADDING_KEY)
+            : DEFAULT_INCLUDE_FONT_PADDING;
+
+    if (text == null) {
+      throw new IllegalStateException("Spannable element has not been prepared in onBeforeLayout");
+    }
+
+    BoringLayout.Metrics boring = BoringLayout.isBoring(text, textPaint);
+    float desiredWidth = boring == null ? Layout.getDesiredWidth(text, textPaint) : Float.NaN;
+
+    // technically, width should never be negative, but there is currently a bug in
+    boolean unconstrainedWidth = widthYogaMeasureMode == YogaMeasureMode.UNDEFINED || width < 0;
+
+    Layout layout =
+        createLayout(
+            text, boring, width, widthYogaMeasureMode, includeFontPadding, textBreakStrategy);
 
     int maximumNumberOfLines =
         paragraphAttributes.hasKey(MAXIMUM_NUMBER_OF_LINES_KEY)
@@ -408,9 +425,9 @@ public static long measureText(
     // follows a similar logic than used in pre-fabric (see ReactTextView.onLayout method).
     int attachmentIndex = 0;
     int lastAttachmentFoundInSpan;
-    for (int i = 0; i < spanLength; i = lastAttachmentFoundInSpan) {
+    for (int i = 0; i < text.length(); i = lastAttachmentFoundInSpan) {
       lastAttachmentFoundInSpan =
-          text.nextSpanTransition(i, spanLength, TextInlineViewPlaceholderSpan.class);
+          text.nextSpanTransition(i, text.length(), TextInlineViewPlaceholderSpan.class);
       TextInlineViewPlaceholderSpan[] placeholders =
           text.getSpans(i, lastAttachmentFoundInSpan, TextInlineViewPlaceholderSpan.class);
       for (TextInlineViewPlaceholderSpan placeholder : placeholders) {
@@ -432,7 +449,7 @@ public static long measureText(
           // There's a bug on Samsung devices where calling getPrimaryHorizontal on
           // the last offset in the layout will result in an endless loop. Work around
           // this bug by avoiding getPrimaryHorizontal in that case.
-          if (start == spanLength - 1) {
+          if (start == text.length() - 1) {
             placeholderLeftPosition =
                 isRtlParagraph
                     // Equivalent to `layout.getLineLeft(line)` but `getLineLeft` returns incorrect

From c1af56df71cfbecea224440ac6a2ee2915a4aa51 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Tue, 22 Sep 2020 01:50:39 -0700
Subject: [PATCH 054/241] Wire call from C++ to Java to get lines measurements

Summary: Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23782998

fbshipit-source-id: fa9bda274c024d5bbd3ca24f394b5d76f8c07ad2
---
 .../react/fabric/FabricUIManager.java         |  9 ++++
 .../components/text/ParagraphShadowNode.cpp   |  2 -
 .../textlayoutmanager/TextMeasureCache.cpp    | 34 ++++++++++++++
 .../textlayoutmanager/TextMeasureCache.h      | 10 +++++
 .../textlayoutmanager/TextLayoutManager.cpp   | 44 +++++++++++++++++++
 .../textlayoutmanager/TextLayoutManager.h     |  9 ++++
 6 files changed, 106 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index bf95f6e7da3376..6eb969d9c89f24 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -36,7 +36,9 @@
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.ReactRootView;
+import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeMap;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.ReactContext;
@@ -443,6 +445,13 @@ private MountItem createBatchMountItem(
     return new BatchMountItem(rootTag, items, size, commitNumber);
   }
 
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  private NativeArray measureLines(
+      ReadableMap attributedString, ReadableMap paragraphAttributes, float width, float height) {
+    return (NativeArray) Arguments.createArray();
+  }
+
   @DoNotStrip
   @SuppressWarnings("unused")
   private long measure(
diff --git a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
index 2a7f0421dea480..87745126463ca9 100644
--- a/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
+++ b/ReactCommon/react/renderer/components/text/ParagraphShadowNode.cpp
@@ -169,7 +169,6 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
       content.paragraphAttributes,
       layoutConstraints);
 
-#ifndef ANDROID
   if (getConcreteProps().onTextLayout) {
     auto linesMeasurements = textLayoutManager_->measureLines(
         content.attributedString,
@@ -177,7 +176,6 @@ void ParagraphShadowNode::layout(LayoutContext layoutContext) {
         measurement.size);
     getConcreteEventEmitter().onTextLayout(linesMeasurements);
   }
-#endif
 
   if (content.attachments.empty()) {
     // No attachments to layout.
diff --git a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
index 26b50ffd184972..d3d9845f93c518 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.cpp
@@ -10,6 +10,40 @@
 namespace facebook {
 namespace react {
 
+static Rect rectFromDynamic(folly::dynamic const &data) {
+  Point origin;
+  origin.x = data.getDefault("x", 0).getDouble();
+  origin.y = data.getDefault("y", 0).getDouble();
+  Size size;
+  size.width = data.getDefault("width", 0).getDouble();
+  size.height = data.getDefault("height", 0).getDouble();
+  Rect frame;
+  frame.origin = origin;
+  frame.size = size;
+  return frame;
+}
+
+LineMeasurement::LineMeasurement(
+    std::string text,
+    Rect frame,
+    Float descender,
+    Float capHeight,
+    Float ascender,
+    Float xHeight)
+    : text(text),
+      frame(frame),
+      descender(descender),
+      capHeight(capHeight),
+      ascender(ascender) {}
+
+LineMeasurement::LineMeasurement(folly::dynamic const &data)
+    : text(data.getDefault("text", "").getString()),
+      frame(rectFromDynamic(data)),
+      descender(data.getDefault("descender", 0).getDouble()),
+      capHeight(data.getDefault("capHeight", 0).getDouble()),
+      ascender(data.getDefault("ascender", 0).getDouble()),
+      xHeight(data.getDefault("xHeight", 0).getDouble()) {}
+
 bool LineMeasurement::operator==(LineMeasurement const &rhs) const {
   return std::tie(
              this->text,
diff --git a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
index 34a0a2d870581c..d0e71872810d75 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/TextMeasureCache.h
@@ -24,6 +24,16 @@ struct LineMeasurement {
   Float ascender;
   Float xHeight;
 
+  LineMeasurement(
+      std::string text,
+      Rect frame,
+      Float descender,
+      Float capHeight,
+      Float ascender,
+      Float xHeight);
+
+  LineMeasurement(folly::dynamic const &data);
+
   bool operator==(LineMeasurement const &rhs) const;
 };
 
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
index 3d69b4a84ed1d5..be0201dec74d43 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
@@ -98,6 +98,50 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById(
   return TextMeasurement{size, attachments};
 }
 
+LinesMeasurements TextLayoutManager::measureLines(
+    AttributedString attributedString,
+    ParagraphAttributes paragraphAttributes,
+    Size size) const {
+  const jni::global_ref<jobject> &fabricUIManager =
+      contextContainer_->at<jni::global_ref<jobject>>("FabricUIManager");
+  static auto measureLines =
+      jni::findClassStatic("com/facebook/react/fabric/FabricUIManager")
+          ->getMethod<NativeArray::javaobject(
+              ReadableMap::javaobject,
+              ReadableMap::javaobject,
+              jfloat,
+              jfloat)>("measureLines");
+
+  auto serializedAttributedString = toDynamic(attributedString);
+
+  local_ref<ReadableNativeMap::javaobject> attributedStringRNM =
+      ReadableNativeMap::newObjectCxxArgs(serializedAttributedString);
+  local_ref<ReadableNativeMap::javaobject> paragraphAttributesRNM =
+      ReadableNativeMap::newObjectCxxArgs(toDynamic(paragraphAttributes));
+
+  local_ref<ReadableMap::javaobject> attributedStringRM = make_local(
+      reinterpret_cast<ReadableMap::javaobject>(attributedStringRNM.get()));
+  local_ref<ReadableMap::javaobject> paragraphAttributesRM = make_local(
+      reinterpret_cast<ReadableMap::javaobject>(paragraphAttributesRNM.get()));
+
+  auto array = measureLines(
+      fabricUIManager,
+      attributedStringRM.get(),
+      paragraphAttributesRM.get(),
+      size.width,
+      size.height);
+
+  auto dynamicArray = cthis(array)->consume();
+  LinesMeasurements lineMeasurements;
+  lineMeasurements.reserve(dynamicArray.size());
+
+  for (auto const &data : dynamicArray) {
+    lineMeasurements.push_back(LineMeasurement(data));
+  }
+
+  return lineMeasurements;
+}
+
 TextMeasurement TextLayoutManager::doMeasure(
     AttributedString attributedString,
     ParagraphAttributes paragraphAttributes,
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
index e1ec4b122f9a7e..681c54e22fb793 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.h
@@ -46,6 +46,15 @@ class TextLayoutManager {
       ParagraphAttributes paragraphAttributes,
       LayoutConstraints layoutConstraints) const;
 
+  /*
+   * Measures lines of `attributedString` using native text rendering
+   * infrastructure.
+   */
+  LinesMeasurements measureLines(
+      AttributedString attributedString,
+      ParagraphAttributes paragraphAttributes,
+      Size size) const;
+
   /*
    * Returns an opaque pointer to platform-specific TextLayoutManager.
    * Is used on a native views layer to delegate text rendering to the manager.

From a650696f0d144ab705a617bc48925da8805dc58b Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Tue, 22 Sep 2020 01:50:39 -0700
Subject: [PATCH 055/241] Implement onTextLayout on Text component.

Summary:
Changelog: [Internal]

Add `Text.onTextLayout` implementation to Android's Text component.

Reviewed By: JoshuaGross

Differential Revision: D23782311

fbshipit-source-id: fdb5709aaf68efee0ab895a6661396f92cfc768a
---
 .../main/java/com/facebook/react/fabric/BUCK  |  1 +
 .../react/fabric/FabricUIManager.java         | 10 ++++++--
 .../react/views/text/TextLayoutManager.java   | 24 +++++++++++++++++++
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
index 9ebcd431161f44..a1882a6cdbd5d1 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/BUCK
@@ -39,6 +39,7 @@ rn_android_library(
         react_native_target("java/com/facebook/react/common:common"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_target("java/com/facebook/react/views/view:view"),
+        react_native_target("java/com/facebook/react/views/text:text"),
         react_native_target("java/com/facebook/react/touch:touch"),
     ],
     exported_deps = [
diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
index 6eb969d9c89f24..3e5b6c37aaba5f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/FabricUIManager.java
@@ -36,7 +36,6 @@
 import com.facebook.infer.annotation.ThreadConfined;
 import com.facebook.proguard.annotations.DoNotStrip;
 import com.facebook.react.ReactRootView;
-import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.NativeArray;
 import com.facebook.react.bridge.NativeMap;
@@ -76,6 +75,7 @@
 import com.facebook.react.fabric.mounting.mountitems.UpdateStateMountItem;
 import com.facebook.react.modules.core.ReactChoreographer;
 import com.facebook.react.modules.i18nmanager.I18nUtil;
+import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactRoot;
 import com.facebook.react.uimanager.ReactRootViewTagGenerator;
 import com.facebook.react.uimanager.StateWrapper;
@@ -84,6 +84,7 @@
 import com.facebook.react.uimanager.ViewManagerPropertyUpdater;
 import com.facebook.react.uimanager.ViewManagerRegistry;
 import com.facebook.react.uimanager.events.EventDispatcher;
+import com.facebook.react.views.text.TextLayoutManager;
 import com.facebook.systrace.Systrace;
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -449,7 +450,12 @@ private MountItem createBatchMountItem(
   @SuppressWarnings("unused")
   private NativeArray measureLines(
       ReadableMap attributedString, ReadableMap paragraphAttributes, float width, float height) {
-    return (NativeArray) Arguments.createArray();
+    return (NativeArray)
+        TextLayoutManager.measureLines(
+            mReactApplicationContext,
+            attributedString,
+            paragraphAttributes,
+            PixelUtil.toPixelFromDIP(width));
   }
 
   @DoNotStrip
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index 3fa47c3a9d7c66..92073cd3392124 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -27,6 +27,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
+import com.facebook.react.bridge.WritableArray;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
@@ -519,6 +520,29 @@ public static long measureText(
     return YogaMeasureOutput.make(widthInSP, heightInSP);
   }
 
+  public static WritableArray measureLines(
+      @NonNull Context context,
+      ReadableMap attributedString,
+      ReadableMap paragraphAttributes,
+      float width) {
+    TextPaint textPaint = sTextPaintInstance;
+    Spannable text = getOrCreateSpannableForText(context, attributedString, null);
+    BoringLayout.Metrics boring = BoringLayout.isBoring(text, textPaint);
+
+    int textBreakStrategy =
+        TextAttributeProps.getTextBreakStrategy(
+            paragraphAttributes.getString(TEXT_BREAK_STRATEGY_KEY));
+    boolean includeFontPadding =
+        paragraphAttributes.hasKey(INCLUDE_FONT_PADDING_KEY)
+            ? paragraphAttributes.getBoolean(INCLUDE_FONT_PADDING_KEY)
+            : DEFAULT_INCLUDE_FONT_PADDING;
+
+    Layout layout =
+        createLayout(
+            text, boring, width, YogaMeasureMode.EXACTLY, includeFontPadding, textBreakStrategy);
+    return FontMetricsUtil.getFontMetrics(text, layout, sTextPaintInstance, context);
+  }
+
   // TODO T31905686: This class should be private
   public static class SetSpanOperation {
     protected int start, end;

From 83777cb4fb5dda89c430b7eff9cd1f28d2577831 Mon Sep 17 00:00:00 2001
From: Makar Kotlov <m.kotlov@qlean.ru>
Date: Tue, 22 Sep 2020 06:14:20 -0700
Subject: [PATCH 056/241] Fix Xcode bundler in staging and release (#29477)

Summary:
Revert "feat: improve monorepo support by removing redundant PROJECT_ROOT (https://github.com/facebook/react-native/issues/28354)"

This reverts commit a8e85026cfa60056b1bcbcd39cde789e4d65f9cb.

This commit a8e85026cfa60056b1bcbcd39cde789e4d65f9cb somehow broke the bundler when making a staging or release build in Xcode that results in unresolved files and main.jsbundle nonexistance issue. I figured this out by replacing react-native-xcode.sh from RN v0.63.2 by the one from v0.62.2 where everything works just fine and then reverting the changes line by line. It seems like this pr will fix similar issues stated here https://stackoverflow.com/questions/62806319/main-jsbundle-does-not-exist-this-must-be-a-bug-with-main-jsbundle-issue-afte/62829256#62829256 and here https://github.com/facebook/react-native/issues/29205

## Changelog

[iOS] [Fixed] - fix "main.jsbundle does not exist" issue

Pull Request resolved: https://github.com/facebook/react-native/pull/29477

Test Plan:
With react-native-xcode.sh from RN v0.63.2
![image](https://user-images.githubusercontent.com/32848434/88342113-7ce55d80-cd47-11ea-9dab-bf41ec6d6ab5.png)

With my changes
![image](https://user-images.githubusercontent.com/32848434/88342376-f0876a80-cd47-11ea-9c08-96b892784da1.png)

Reviewed By: sammy-SC

Differential Revision: D23817847

Pulled By: hramos

fbshipit-source-id: 4b729c1231d30e89073b2520aeadee944c84421c
---
 scripts/react-native-xcode.sh | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/scripts/react-native-xcode.sh b/scripts/react-native-xcode.sh
index 98743b168b6183..eeb601653f3b7f 100755
--- a/scripts/react-native-xcode.sh
+++ b/scripts/react-native-xcode.sh
@@ -56,17 +56,11 @@ case "$CONFIGURATION" in
     ;;
 esac
 
-# Setting up a project root was a workaround to enable support for non-standard
-# structures, including monorepos. Today, CLI supports that out of the box
-# and setting custom `PROJECT_ROOT` only makes it confusing. 
-#
-# As a backwards-compatible change, I am leaving "PROJECT_ROOT" support for those
-# who already use it - it is likely a non-breaking removal.
-#
-# For new users, we default to $PWD - not changing things all.
-#
-# For context: https://github.com/facebook/react-native/commit/9ccde378b6e6379df61f9d968be6346ca6be7ead#commitcomment-37914902
-PROJECT_ROOT=${PROJECT_ROOT:-$PWD}
+# Path to react-native folder inside node_modules
+REACT_NATIVE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+# The project should be located next to where react-native is installed
+# in node_modules.
+PROJECT_ROOT=${PROJECT_ROOT:-"$REACT_NATIVE_DIR/../.."}
 
 cd "$PROJECT_ROOT" || exit
 
@@ -109,9 +103,6 @@ if [[ ! -x node && -d ${HOME}/.anyenv/bin ]]; then
   fi
 fi
 
-# Path to react-native folder inside node_modules
-REACT_NATIVE_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-
 # check and assign NODE_BINARY env
 # shellcheck source=/dev/null
 source "$REACT_NATIVE_DIR/scripts/node-binary.sh"

From 891b6b0c14d820d38f0a0b8f5ebf749c5cd14a94 Mon Sep 17 00:00:00 2001
From: chirag-singhal <csinghal208@gmail.com>
Date: Tue, 22 Sep 2020 11:21:51 -0700
Subject: [PATCH 057/241] New Share API Use Cases (#29856)

Summary:
* New use cases for share API in rn-tester

## Changelog
[General] [Changed] - Changed use cases for share API in rn-tester

## Test Plan
* Tested app in both Android and iOS

![Screenshot_2020-09-09-21-20-41-322_com facebook react uiapp](https://user-images.githubusercontent.com/42653703/92624772-83bf3400-f2e5-11ea-820f-a7f3d9a44a11.jpg)

![image](https://user-images.githubusercontent.com/42653703/92624985-c1bc5800-f2e5-11ea-9f30-b88ab786963b.png)

Pull Request resolved: https://github.com/facebook/react-native/pull/29856

Reviewed By: hramos

Differential Revision: D23784222

Pulled By: rickhanlonii

fbshipit-source-id: f311201a49e0a76abb6634232106ed756143da30
---
 .../js/examples/Share/ShareExample.js         | 169 ++++++++----------
 1 file changed, 75 insertions(+), 94 deletions(-)

diff --git a/packages/rn-tester/js/examples/Share/ShareExample.js b/packages/rn-tester/js/examples/Share/ShareExample.js
index ed3268af252fef..3ec9a7d6f5c89f 100644
--- a/packages/rn-tester/js/examples/Share/ShareExample.js
+++ b/packages/rn-tester/js/examples/Share/ShareExample.js
@@ -12,115 +12,96 @@
 
 const React = require('react');
 
-const {
-  StyleSheet,
-  View,
-  Text,
-  TouchableHighlight,
-  Share,
-} = require('react-native');
+const {StyleSheet, View, Text, Button, Share} = require('react-native');
 
-type Props = $ReadOnly<{||}>;
-type State = {|result: string|};
+const shareMessage = () => {
+  Share.share({
+    message: ('Our top priority for React Native is to match the expectations people have for each platform. This is why React Native renders to platform primitives. We value native look-and-feel over cross-platform consistency.' +
+      'For example, the TextInput in React Native renders to a UITextField on iOS. This ensures that integration with password managers and keyboard controls work out of the box. By using platform primitives, React Native apps are also able to stay up-to-date with design and behavior changes from new releases of Android and iOS.': string),
+  });
+};
 
-class ShareMessageExample extends React.Component<Props, State> {
-  _shareMessage: Function;
-  _shareText: Function;
-  _showResult: Function;
-
-  constructor(props) {
-    super(props);
-
-    this._shareMessage = this._shareMessage.bind(this);
-    this._shareText = this._shareText.bind(this);
-    this._showResult = this._showResult.bind(this);
-
-    this.state = {
-      result: '',
-    };
-  }
-
-  render() {
-    return (
-      <View>
-        <TouchableHighlight style={styles.wrapper} onPress={this._shareMessage}>
-          <View style={styles.button}>
-            <Text>Click to share message</Text>
-          </View>
-        </TouchableHighlight>
-        <TouchableHighlight style={styles.wrapper} onPress={this._shareText}>
-          <View style={styles.button}>
-            <Text>Click to share message, URL and title</Text>
-          </View>
-        </TouchableHighlight>
-        <Text>{this.state.result}</Text>
-      </View>
-    );
-  }
-
-  _shareMessage() {
-    Share.share({
-      message:
-        'React Native | A framework for building native apps using React',
-    })
-      .then(this._showResult)
-      .catch(error => this.setState({result: 'error: ' + error.message}));
-  }
+const shareText = () => {
+  Share.share(
+    {
+      title: 'Massive Scale',
+      message: ('Hundreds of screens in the Facebook app are implemented with React Native. The Facebook app is used by billions of people on a huge range of devices. This is why we invest in the most challenging problems at scale.' +
+        'Deploying React Native in our apps lets us identify problems that we wouldn’t see at a smaller scale. For example, Facebook focuses on improving performance across a broad spectrum of devices from the newest iPhone to many older generations of Android devices. This focus informs our architecture projects such as Hermes, Fabric, and TurboModules.': string),
+      url: 'https://reactnative.dev/blog/2020/07/17/react-native-principles',
+    },
+    {
+      subject: 'MUST READ: Massive Scale',
+      dialogTitle: 'Share React Native Blog',
+      excludedActivityTypes: ['com.apple.UIKit.activity.PostToTwitter'],
+      tintColor: 'blue',
+    },
+  );
+};
 
-  _shareText() {
-    Share.share(
-      {
-        message: 'A framework for building native apps using React',
-        url: 'https://reactnative.dev/',
-        title: 'React Native',
-      },
-      {
-        subject: 'A subject to go in the email heading',
-        dialogTitle: 'Share React Native website',
-        excludedActivityTypes: ['com.apple.UIKit.activity.PostToTwitter'],
-        tintColor: 'green',
-      },
-    )
-      .then(this._showResult)
-      .catch(error => this.setState({result: 'error: ' + error.message}));
-  }
+const ShareMessageWithoutTitle = () => {
+  return (
+    <View style={styles.container}>
+      <Text style={styles.title}>Native Experience</Text>
+      <Text>
+        Our top priority for React Native is to match the expectations people
+        have for each platform. This is why React Native renders to platform
+        primitives. We value native look-and-feel over cross-platform
+        consistency. For example, the TextInput in React Native renders to a
+        UITextField on iOS. This ensures that integration with password managers
+        and keyboard controls work out of the box. By using platform primitives,
+        React Native apps are also able to stay up-to-date with design and
+        behavior changes from new releases of Android and iOS.
+      </Text>
+      <Button title="SHARE" onPress={shareMessage} />
+    </View>
+  );
+};
 
-  _showResult(result) {
-    if (result.action === Share.sharedAction) {
-      if (result.activityType) {
-        this.setState({
-          result: 'shared with an activityType: ' + result.activityType,
-        });
-      } else {
-        this.setState({result: 'shared'});
-      }
-    } else if (result.action === Share.dismissedAction) {
-      this.setState({result: 'dismissed'});
-    }
-  }
-}
+const ShareMessageWithTitle = () => {
+  return (
+    <View style={styles.container}>
+      <Text style={styles.title}>Massive Scale</Text>
+      <Text>
+        Hundreds of screens in the Facebook app are implemented with React
+        Native. The Facebook app is used by billions of people on a huge range
+        of devices. This is why we invest in the most challenging problems at
+        scale. Deploying React Native in our apps lets us identify problems that
+        we wouldn’t see at a smaller scale. For example, Facebook focuses on
+        improving performance across a broad spectrum of devices from the newest
+        iPhone to many older generations of Android devices. This focus informs
+        our architecture projects such as Hermes, Fabric, and TurboModules.
+      </Text>
+      <Button title="SHARE" onPress={shareText} />
+    </View>
+  );
+};
 
 const styles = StyleSheet.create({
-  wrapper: {
-    borderRadius: 5,
-    marginBottom: 5,
+  container: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
   },
-  button: {
-    backgroundColor: '#eeeeee',
-    padding: 10,
+  title: {
+    fontSize: 30,
+    margin: 10,
+    textAlign: 'center',
   },
 });
 
-exports.framework = 'React';
 exports.title = 'Share';
-exports.category = 'Basic';
-exports.documentationURL = 'https://reactnative.dev/docs/share';
 exports.description = 'Share data with other Apps.';
 exports.examples = [
   {
-    title: 'Share Text Content',
+    title: 'Share message',
+    render(): React.Node {
+      return <ShareMessageWithoutTitle />;
+    },
+  },
+  {
+    title: 'Share message, URL (iOS) and title (Android)',
     render(): React.Node {
-      return <ShareMessageExample />;
+      return <ShareMessageWithTitle />;
     },
   },
 ];

From 3a6327a5d9ebfd0de56c37009ab7de1d0e6bdf85 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 22 Sep 2020 11:30:04 -0700
Subject: [PATCH 058/241] Open source react-native-modules ESLint rule

Summary:
Open source this ESLint rule so that we can lint our open source NativeModule specs.

Changelog: [Internal]

Reviewed By: shergin, cpojer

Differential Revision: D23791748

fbshipit-source-id: e44444bc87eaa9dc9b7f2b3ed03151798a35e8a5
---
 .eslintrc                                     |  21 +-
 Libraries/Alert/NativeAlertManager.js         |   1 +
 Libraries/Animated/NativeAnimatedModule.js    |   2 +-
 .../Animated/NativeAnimatedTurboModule.js     |   2 +-
 .../NativeStatusBarManagerAndroid.js          |   1 +
 .../StatusBar/NativeStatusBarManagerIOS.js    |   1 +
 Libraries/Core/NativeExceptionsManager.js     |   1 +
 Libraries/Image/NativeImageEditor.js          |   1 +
 .../specs/NativeDialogManagerAndroid.js       |   1 +
 .../NativePermissionsAndroid.js               |   1 +
 .../NativePushNotificationManagerIOS.js       |   3 +-
 Libraries/Share/NativeShareModule.js          |   1 +
 .../samples/NativeSampleTurboModule.js        |   1 +
 packages/eslint-plugin-codegen/BUCK           |  23 +
 .../__tests__/eslint-tester.js                |  22 +
 .../__tests__/react-native-modules-test.js    | 397 +++++++++++++++
 packages/eslint-plugin-codegen/index.js       |  19 +
 packages/eslint-plugin-codegen/package.json   |  11 +
 .../react-native-modules.js                   | 467 ++++++++++++++++++
 19 files changed, 965 insertions(+), 11 deletions(-)
 create mode 100644 packages/eslint-plugin-codegen/BUCK
 create mode 100644 packages/eslint-plugin-codegen/__tests__/eslint-tester.js
 create mode 100644 packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js
 create mode 100644 packages/eslint-plugin-codegen/index.js
 create mode 100644 packages/eslint-plugin-codegen/package.json
 create mode 100644 packages/eslint-plugin-codegen/react-native-modules.js

diff --git a/.eslintrc b/.eslintrc
index 47460cc9582009..2c5a51053d8221 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -5,15 +5,20 @@
     "./packages/eslint-config-react-native-community/index.js"
   ],
 
+  "plugins": [
+    "@react-native/eslint-plugin-codegen"
+  ],
+
   "overrides": [
     {
       "files": [
         "Libraries/**/*.js",
       ],
-      rules: {
-        '@react-native-community/no-haste-imports': 2,
-        '@react-native-community/error-subclass-name': 2,
-        '@react-native-community/platform-colors': 2,
+      "rules": {
+        "@react-native-community/no-haste-imports": 2,
+        "@react-native-community/error-subclass-name": 2,
+        "@react-native-community/platform-colors": 2,
+        "@react-native/codegen/react-native-modules": 2
       }
     },
     {
@@ -40,8 +45,8 @@
       ],
       "env": {
         "jasmine": true,
-        "jest": true,
-      },
-    },
-  ],
+        "jest": true
+      }
+    }
+  ]
 }
diff --git a/Libraries/Alert/NativeAlertManager.js b/Libraries/Alert/NativeAlertManager.js
index 055a742b20340b..e3bfb8211bced6 100644
--- a/Libraries/Alert/NativeAlertManager.js
+++ b/Libraries/Alert/NativeAlertManager.js
@@ -26,6 +26,7 @@ export type Args = {|
 
 export interface Spec extends TurboModule {
   +alertWithArgs: (
+    // eslint-disable-next-line @react-native/codegen/react-native-modules
     args: Args,
     callback: (id: number, value: string) => void,
   ) => void;
diff --git a/Libraries/Animated/NativeAnimatedModule.js b/Libraries/Animated/NativeAnimatedModule.js
index a42e7ba5b12bed..c16597018d1485 100644
--- a/Libraries/Animated/NativeAnimatedModule.js
+++ b/Libraries/Animated/NativeAnimatedModule.js
@@ -30,7 +30,7 @@ export type AnimatingNodeConfig = Object;
 export interface Spec extends TurboModule {
   +startOperationBatch: () => void;
   +finishOperationBatch: () => void;
-
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +createAnimatedNode: (tag: number, config: AnimatedNodeConfig) => void;
   +getValue: (tag: number, saveValueCallback: SaveValueCallback) => void;
   +startListeningToAnimatedNodeValue: (tag: number) => void;
diff --git a/Libraries/Animated/NativeAnimatedTurboModule.js b/Libraries/Animated/NativeAnimatedTurboModule.js
index ac6c50b45069ac..e5d5bcbeebd84f 100644
--- a/Libraries/Animated/NativeAnimatedTurboModule.js
+++ b/Libraries/Animated/NativeAnimatedTurboModule.js
@@ -30,7 +30,7 @@ export type AnimatingNodeConfig = Object;
 export interface Spec extends TurboModule {
   +startOperationBatch: () => void;
   +finishOperationBatch: () => void;
-
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +createAnimatedNode: (tag: number, config: AnimatedNodeConfig) => void;
   +getValue: (tag: number, saveValueCallback: SaveValueCallback) => void;
   +startListeningToAnimatedNodeValue: (tag: number) => void;
diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
index 5b00b2a4c218a6..723ac602abb559 100644
--- a/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
+++ b/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
@@ -26,6 +26,7 @@ export interface Spec extends TurboModule {
    *    - 'default'
    *    - 'dark-content'
    */
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +setStyle: (statusBarStyle?: ?string) => void;
   +setHidden: (hidden: boolean) => void;
 }
diff --git a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
index b5da2851bf2436..86251253640059 100644
--- a/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
+++ b/Libraries/Components/StatusBar/NativeStatusBarManagerIOS.js
@@ -31,6 +31,7 @@ export interface Spec extends TurboModule {
    *    - 'dark-content'
    *    - 'light-content'
    */
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +setStyle: (statusBarStyle?: ?string, animated: boolean) => void;
   /**
    *  - withAnimation can be: 'none' | 'fade' | 'slide'
diff --git a/Libraries/Core/NativeExceptionsManager.js b/Libraries/Core/NativeExceptionsManager.js
index 10b7b77e08e816..28192d72780a75 100644
--- a/Libraries/Core/NativeExceptionsManager.js
+++ b/Libraries/Core/NativeExceptionsManager.js
@@ -47,6 +47,7 @@ export interface Spec extends TurboModule {
     stack: Array<StackFrame>,
     exceptionId: number,
   ) => void;
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +reportException?: (data: ExceptionData) => void;
   +updateExceptionMessage: (
     message: string,
diff --git a/Libraries/Image/NativeImageEditor.js b/Libraries/Image/NativeImageEditor.js
index c6fdc63f7d4812..738483b15842f1 100644
--- a/Libraries/Image/NativeImageEditor.js
+++ b/Libraries/Image/NativeImageEditor.js
@@ -42,6 +42,7 @@ export interface Spec extends TurboModule {
   +getConstants: () => {||};
   +cropImage: (
     uri: string,
+    // eslint-disable-next-line @react-native/codegen/react-native-modules
     cropData: Options,
     successCallback: (uri: string) => void,
     errorCallback: (error: string) => void,
diff --git a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
index fcc476b3419c33..809f488f0a1212 100644
--- a/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
+++ b/Libraries/NativeModules/specs/NativeDialogManagerAndroid.js
@@ -40,6 +40,7 @@ export interface Spec extends TurboModule {
     +buttonNeutral: DialogButtonKey,
   |};
   +showAlert: (
+    // eslint-disable-next-line @react-native/codegen/react-native-modules
     config: DialogOptions,
     onError: (error: string) => void,
     onAction: (action: DialogAction, buttonKey?: DialogButtonKey) => void,
diff --git a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
index 2e834fc725cb42..2b53284da78b98 100644
--- a/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
+++ b/Libraries/PermissionsAndroid/NativePermissionsAndroid.js
@@ -47,6 +47,7 @@ export type PermissionType =
 */
 
 export interface Spec extends TurboModule {
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +checkPermission: (permission: PermissionType) => Promise<boolean>;
   +requestPermission: (permission: PermissionType) => Promise<PermissionStatus>;
   +shouldShowRequestPermissionRationale: (
diff --git a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
index 2e2044262eefaa..941ba0a3c77f99 100644
--- a/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
+++ b/Libraries/PushNotificationIOS/NativePushNotificationManagerIOS.js
@@ -32,7 +32,7 @@ type Notification = {|
 |};
 
 export interface Spec extends TurboModule {
-  +getConstants: () => {...};
+  +getConstants: () => {||};
   +onFinishRemoteNotification: (
     notificationId: string,
     /**
@@ -52,6 +52,7 @@ export interface Spec extends TurboModule {
   |}) => Promise<Permissions>;
   +abandonPermissions: () => void;
   +checkPermissions: (callback: (permissions: Permissions) => void) => void;
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +presentLocalNotification: (notification: Notification) => void;
   +scheduleLocalNotification: (notification: Notification) => void;
   +cancelAllLocalNotifications: () => void;
diff --git a/Libraries/Share/NativeShareModule.js b/Libraries/Share/NativeShareModule.js
index 08d313d76d7d6c..e6d8800725b30e 100644
--- a/Libraries/Share/NativeShareModule.js
+++ b/Libraries/Share/NativeShareModule.js
@@ -17,6 +17,7 @@ export interface Spec extends TurboModule {
   +getConstants: () => {||};
   +share: (
     content: {|title?: string, message?: string|},
+    // eslint-disable-next-line @react-native/codegen/react-native-modules
     dialogTitle?: string,
   ) => Promise<{|action: string|}>;
 }
diff --git a/Libraries/TurboModule/samples/NativeSampleTurboModule.js b/Libraries/TurboModule/samples/NativeSampleTurboModule.js
index f9c4c6ef53e393..5af0c1f77c690e 100644
--- a/Libraries/TurboModule/samples/NativeSampleTurboModule.js
+++ b/Libraries/TurboModule/samples/NativeSampleTurboModule.js
@@ -26,6 +26,7 @@ export interface Spec extends TurboModule {
   +getString: (arg: string) => string;
   +getArray: (arg: Array<any>) => Array<any>;
   +getObject: (arg: Object) => Object;
+  // eslint-disable-next-line @react-native/codegen/react-native-modules
   +getRootTag: (arg: RootTag) => RootTag;
   +getValue: (x: number, y: string, z: Object) => Object;
   +getValueWithCallback: (callback: (value: string) => void) => void;
diff --git a/packages/eslint-plugin-codegen/BUCK b/packages/eslint-plugin-codegen/BUCK
new file mode 100644
index 00000000000000..8fd38289431bdb
--- /dev/null
+++ b/packages/eslint-plugin-codegen/BUCK
@@ -0,0 +1,23 @@
+load("@fbsource//tools/build_defs/third_party:yarn_defs.bzl", "yarn_workspace")
+
+yarn_workspace(
+    name = "yarn-workspace",
+    srcs = glob(
+        ["**/*.js"],
+        exclude = [
+            "**/__fixtures__/**",
+            "**/__flowtests__/**",
+            "**/__mocks__/**",
+            "**/__server_snapshot_tests__/**",
+            "**/__tests__/**",
+            "**/node_modules/**",
+            "**/node_modules/.bin/**",
+            "**/.*",
+            "**/.*/**",
+            "**/.*/.*",
+            "**/*.xcodeproj/**",
+            "**/*.xcworkspace/**",
+        ],
+    ),
+    visibility = ["PUBLIC"],
+)
diff --git a/packages/eslint-plugin-codegen/__tests__/eslint-tester.js b/packages/eslint-plugin-codegen/__tests__/eslint-tester.js
new file mode 100644
index 00000000000000..ea767a705b790f
--- /dev/null
+++ b/packages/eslint-plugin-codegen/__tests__/eslint-tester.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ */
+
+'use strict';
+
+const ESLintTester = require('eslint').RuleTester;
+
+ESLintTester.setDefaultConfig({
+  parser: require.resolve('babel-eslint'),
+  parserOptions: {
+    ecmaVersion: 6,
+    sourceType: 'module',
+  },
+});
+
+module.exports = ESLintTester;
diff --git a/packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js b/packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js
new file mode 100644
index 00000000000000..8d38ab0e1aff81
--- /dev/null
+++ b/packages/eslint-plugin-codegen/__tests__/react-native-modules-test.js
@@ -0,0 +1,397 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react_native
+ * @format
+ */
+
+'use strict';
+
+const ESLintTester = require('./eslint-tester.js');
+
+const rule = require('../react-native-modules');
+
+const NATIVE_MODULES_DIR = __dirname;
+
+const eslintTester = new ESLintTester();
+
+const VALID_SPECS = [
+  // Standard specification will all supported param types.
+  {
+    code: `
+'use strict';
+
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+
+export interface Spec extends TurboModule {
+  func1(): void,
+  func2(a: number, b: string, c: boolean): void,
+  func3(a: Object, b: Array<string>, c: () => void): void,
+  func4(a: ?string): void,
+  func5(a: ?Object, b: ?Array<string>, c: ?() => void): void,
+  func6(a: string[], b: ?number[]): void,
+  func7(): string,
+  func8(): Object,
+  func9(): Promise<string>,
+  func10(): number,
+  func11(): boolean,
+  func12(a: {|x: string|}): void,
+  func13(a: $ReadOnlyArray<Object>): void,
+  func14(): {|
+    x: number,
+    y: string,
+  |},
+  a: number,
+  b: string,
+  c: {a: number, b: string},
+}
+
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+  },
+
+  // With convenience API wrapper
+  {
+    code: `
+'use strict';
+
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+
+export interface Spec extends TurboModule {
+  func1(a: Object): void,
+}
+
+const NativeModule = TurboModuleRegistry.get<Spec>('XYZ');
+const NativeXYZ = {
+  func1(a?: number): void {
+    NativeModule.func1(a || {});
+  },
+};
+export default NativeXYZ;
+`,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+  },
+
+  // Non-spec JS file.
+  {
+    code: `
+'use strict';
+
+import {Platform} from 'react-native';
+
+export default Platform.OS;
+`,
+  },
+];
+
+const INVALID_SPECS = [
+  // Haste module name doesn't start with "Native"
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/XYZ.js`,
+    errors: [
+      {
+        message: rule.errors.invalidHasteName('XYZ'),
+      },
+    ],
+  },
+
+  // Invalid Spec interface name
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Foo extends TurboModule {
+  func1(): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.invalidNativeModuleInterfaceName('Foo'),
+      },
+      {
+        message: rule.errors.specNotDeclaredInFile(),
+      },
+    ],
+    output: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+  },
+
+  // Missing method in Spec
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.missingSpecInterfaceMethod(),
+      },
+    ],
+  },
+
+  // Invalid Spec method return type
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(): XYZ,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedMethodReturnType('XYZ'),
+      },
+    ],
+  },
+
+  // Unsupported Spec property
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  id: Map<string, number>,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedType('Map'),
+      },
+    ],
+  },
+
+  // Unsupported nested Spec property
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  a: {
+    b: number,
+    c: () => number,
+  },
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedType('Function'),
+      },
+    ],
+  },
+
+  // Unsupported Spec method arg type
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+type SomeType = {};
+export interface Spec extends TurboModule {
+  func1(a: SomeType): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedType('SomeType'),
+      },
+    ],
+  },
+
+  // Unsupported Spec method arg type: optional
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(a?: string): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedType('optional string'),
+      },
+    ],
+  },
+
+  // Unsupported Spec method arg type: unsupported nullable
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+type Foo = {};
+export interface Spec extends TurboModule {
+  func1(a: ?Foo): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedType('nullable Foo'),
+      },
+    ],
+  },
+
+  // Unsupported Spec method arg type: generic Function
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(a: Function): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedType('Function'),
+      },
+    ],
+  },
+
+  // Unsupported Spec method arg type: nullable generic Function
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(a: ?Function): void,
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.unsupportedType('nullable Function'),
+      },
+    ],
+  },
+
+  // Spec method object return type must be exact
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(a: string): {},
+}
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.inexactObjectReturnType(),
+      },
+    ],
+  },
+
+  // Untyped NativeModule require
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export default TurboModuleRegistry.get('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.untypedModuleRequire('get'),
+      },
+    ],
+  },
+
+  // Incorrectly typed NativeModule require: 0 types
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export default TurboModuleRegistry.get<>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.incorrectlyTypedModuleRequire('get'),
+      },
+    ],
+  },
+
+  // Incorrectly typed NativeModule require: 1 type, but wrong
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(a: string): {||},
+}
+
+// According to Flow, this also conforms to TurboModule
+type Spec1 = {|
+  getConstants: () => {...}
+|};
+
+export default TurboModuleRegistry.get<Spec1>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.incorrectlyTypedModuleRequire('get'),
+      },
+    ],
+  },
+
+  // Incorrectly typed NativeModule require: > 1 type
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+export interface Spec extends TurboModule {
+  func1(a: string): {||},
+}
+export default TurboModuleRegistry.get<Spec, 'test'>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.incorrectlyTypedModuleRequire('get'),
+      },
+    ],
+  },
+
+  // NativeModule spec not declared in file
+  {
+    code: `
+import {TurboModuleRegistry, type TurboModule} from 'react-native';
+import type {Spec} from 'NativeFoo';
+export default TurboModuleRegistry.get<Spec>('XYZ');
+      `,
+    filename: `${NATIVE_MODULES_DIR}/NativeXYZ.js`,
+    errors: [
+      {
+        message: rule.errors.specNotDeclaredInFile(),
+      },
+    ],
+  },
+];
+
+eslintTester.run('../react-native-modules', rule, {
+  valid: VALID_SPECS,
+  invalid: INVALID_SPECS,
+});
diff --git a/packages/eslint-plugin-codegen/index.js b/packages/eslint-plugin-codegen/index.js
new file mode 100644
index 00000000000000..60a5f864f7ac42
--- /dev/null
+++ b/packages/eslint-plugin-codegen/index.js
@@ -0,0 +1,19 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react_native
+ * @format
+ */
+
+'use strict';
+
+const reactNativeModules = require('./react-native-modules');
+
+module.exports = {
+  rules: {
+    'react-native-modules': reactNativeModules,
+  },
+};
diff --git a/packages/eslint-plugin-codegen/package.json b/packages/eslint-plugin-codegen/package.json
new file mode 100644
index 00000000000000..9d4b2328a91f8a
--- /dev/null
+++ b/packages/eslint-plugin-codegen/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "@react-native/eslint-plugin-codegen",
+  "version": "0.0.1",
+  "description": "ESLint rules to validate NativeModule and Component Specs",
+  "main": "index.js",
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:facebook/react-native.git"
+  },
+  "license": "MIT"
+}
diff --git a/packages/eslint-plugin-codegen/react-native-modules.js b/packages/eslint-plugin-codegen/react-native-modules.js
new file mode 100644
index 00000000000000..fd55aca4db660e
--- /dev/null
+++ b/packages/eslint-plugin-codegen/react-native-modules.js
@@ -0,0 +1,467 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails react_native
+ * @format
+ */
+
+'use strict';
+
+const path = require('path');
+
+const supportedTypes = [
+  'ArrayTypeAnnotation',
+  'BooleanTypeAnnotation',
+  'NumberTypeAnnotation',
+  'StringTypeAnnotation',
+];
+
+const supportedTypeAliases = {
+  BooleanTypeAnnotation: 'boolean',
+  FunctionTypeAnnotation: 'Function',
+  NumberTypeAnnotation: 'number',
+  StringTypeAnnotation: 'string',
+  ObjectTypeAnnotation: 'object',
+};
+
+const supportedGenericTypes = [
+  'Array',
+  'Object',
+  'RootTag',
+  '$ReadOnly',
+  '$ReadOnlyArray',
+];
+
+const supportedNullableTypes = [
+  'ArrayTypeAnnotation',
+  'BooleanTypeAnnotation',
+  'FunctionTypeAnnotation',
+  'NumberTypeAnnotation',
+  'ObjectTypeAnnotation',
+  'StringTypeAnnotation',
+];
+
+const supportedMethodReturnTypes = [
+  'BooleanTypeAnnotation',
+  'NumberTypeAnnotation',
+  'ObjectTypeAnnotation',
+  'StringTypeAnnotation',
+  'VoidTypeAnnotation',
+];
+
+const errors = {
+  invalidNativeModuleInterfaceName(interfaceName) {
+    return (
+      "NativeModule interfaces must be named 'Spec', " +
+      `got '${interfaceName}'.`
+    );
+  },
+  inexactObjectReturnType() {
+    return 'Spec interface method object return type must be exact.';
+  },
+  invalidHasteName(hasteName) {
+    return (
+      'Module name for a NativeModule JS wrapper must start with ' +
+      `'Native', got '${hasteName}' instead.`
+    );
+  },
+  missingSpecInterfaceMethod() {
+    return 'NativeModule Spec interface must define at least one method';
+  },
+  unsupportedMethodReturnType(typeName) {
+    return (
+      `Spec interface method has unsupported return type '${typeName}'. ` +
+      'See https://fburl.com/rn-nativemodules for more details.'
+    );
+  },
+  unsupportedType(typeName) {
+    return (
+      `Unsupported type '${typeName}' for Spec interface. ` +
+      'See https://fburl.com/rn-nativemodules for more details.'
+    );
+  },
+  untypedModuleRequire(requireMethodName) {
+    return (
+      'NativeModule require not type-safe. Please require with the NativeModule interface ' +
+      `'Spec': TurboModuleRegistry.${requireMethodName}<Spec>`
+    );
+  },
+  incorrectlyTypedModuleRequire(requireMethodName) {
+    return (
+      'NativeModule require incorrectly typed. Please require with the NativeModule interface identifier ' +
+      `'Spec', and nothing else: TurboModuleRegistry.${requireMethodName}<Spec>`
+    );
+  },
+  specNotDeclaredInFile() {
+    return "The NativeModule interface 'Spec' wasn't declared in this NativeModule spec file.";
+  },
+};
+
+function interfaceExtendsFrom(node, superInterfaceName) {
+  return (
+    node.type === 'InterfaceDeclaration' &&
+    node.extends[0] &&
+    node.extends[0].id.name === superInterfaceName
+  );
+}
+
+function isSupportedFunctionParam(node) {
+  if (node.type !== 'FunctionTypeParam') {
+    return false;
+  }
+
+  if (node.optional) {
+    return false;
+  }
+
+  return findUnsupportedType(node.typeAnnotation, true) == null;
+}
+
+function findUnsupportedType(typeAnnotation, supportCallbacks) {
+  if (supportedTypes.includes(typeAnnotation.type)) {
+    return null;
+  }
+
+  if (typeAnnotation.type === 'NullableTypeAnnotation') {
+    if (supportedNullableTypes.includes(typeAnnotation.typeAnnotation.type)) {
+      return null;
+    }
+    typeAnnotation = typeAnnotation.typeAnnotation;
+  }
+
+  if (typeAnnotation.type === 'FunctionTypeAnnotation' && supportCallbacks) {
+    return null;
+  }
+
+  if (typeAnnotation.type === 'GenericTypeAnnotation') {
+    if (!supportedGenericTypes.includes(typeAnnotation.id.name)) {
+      return typeAnnotation;
+    }
+    if (
+      !isGenericArrayTypeAnnotation(typeAnnotation) &&
+      typeAnnotation.typeParameters
+    ) {
+      for (const param of typeAnnotation.typeParameters.params) {
+        const unsupported = findUnsupportedType(param, supportCallbacks);
+        if (unsupported != null) {
+          return unsupported;
+        }
+      }
+    }
+    return null;
+  }
+
+  if (typeAnnotation.type === 'ObjectTypeAnnotation') {
+    for (const prop of typeAnnotation.properties) {
+      const unsupported = findUnsupportedType(prop.value, supportCallbacks);
+      if (unsupported != null) {
+        return unsupported;
+      }
+    }
+    return null;
+  }
+
+  return typeAnnotation;
+}
+
+function functionParamTypeName(node) {
+  if (node.type !== 'FunctionTypeParam') {
+    return null;
+  }
+
+  const parts = [];
+  if (node.optional) {
+    parts.push('optional');
+  }
+  parts.push(functionParamTypeAnnotationName(node.typeAnnotation));
+  return parts.join(' ');
+}
+
+function functionParamTypeAnnotationName(typeAnnotation) {
+  const {id, type} = typeAnnotation;
+  if (type === 'GenericTypeAnnotation') {
+    return id.name;
+  }
+
+  const parts = [];
+  if (type === 'NullableTypeAnnotation') {
+    parts.push('nullable');
+    parts.push(functionParamTypeAnnotationName(typeAnnotation.typeAnnotation));
+  } else {
+    parts.push(supportedTypeAliases[type] || type);
+  }
+  return parts.join(' ');
+}
+
+function getTypeName(typeAnnotation) {
+  const {id, type} = typeAnnotation;
+  if (type === 'GenericTypeAnnotation') {
+    return id.name;
+  }
+  return supportedTypeAliases[type];
+}
+
+function checkSupportedSpecProperty(context, node) {
+  if (node.type !== 'FunctionTypeAnnotation') {
+    const unsupportedNode = findUnsupportedType(node, false);
+    if (unsupportedNode != null) {
+      context.report({
+        node: unsupportedNode,
+        message: errors.unsupportedType(
+          functionParamTypeAnnotationName(unsupportedNode),
+        ),
+      });
+      return false;
+    }
+    return true;
+  }
+
+  if (!isSupportedMethodReturnTypeAnnotation(node.returnType)) {
+    context.report({
+      node: node.returnType,
+      message: errors.unsupportedMethodReturnType(getTypeName(node.returnType)),
+    });
+    return false;
+  }
+
+  // Check for exact object return type.
+  if (
+    node.returnType.type === 'ObjectTypeAnnotation' &&
+    !node.returnType.exact
+  ) {
+    context.report({
+      node: node.returnType,
+      message: errors.inexactObjectReturnType(),
+    });
+  }
+
+  for (const param of node.params) {
+    if (!isSupportedFunctionParam(param)) {
+      context.report({
+        node: param.typeAnnotation,
+        message: errors.unsupportedType(functionParamTypeName(param)),
+      });
+      return false;
+    }
+  }
+
+  return true;
+}
+
+function isPromiseTypeAnnotation(typeAnnotation) {
+  return (
+    typeAnnotation.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id &&
+    typeAnnotation.id.name === 'Promise'
+  );
+}
+
+function isGenericArrayTypeAnnotation(typeAnnotation) {
+  return (
+    typeAnnotation.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id &&
+    typeAnnotation.id.name === 'Array'
+  );
+}
+
+function isGenericObjectTypeAnnotation(typeAnnotation) {
+  return (
+    typeAnnotation.type === 'GenericTypeAnnotation' &&
+    typeAnnotation.id &&
+    typeAnnotation.id.name === 'Object'
+  );
+}
+
+function isSupportedMethodReturnTypeAnnotation(typeAnnotation) {
+  const resolvedType =
+    typeAnnotation.type === 'NullableTypeAnnotation'
+      ? typeAnnotation.typeAnnotation
+      : typeAnnotation;
+  return (
+    supportedMethodReturnTypes.includes(resolvedType.type) ||
+    isGenericArrayTypeAnnotation(resolvedType) ||
+    isGenericObjectTypeAnnotation(resolvedType) ||
+    isPromiseTypeAnnotation(resolvedType)
+  );
+}
+
+const VALID_SPEC_NAMES = /^Native\S+$/;
+
+function isModuleRequire(node) {
+  if (node.type !== 'CallExpression') {
+    return false;
+  }
+
+  const callExpression = node;
+
+  if (callExpression.callee.type !== 'MemberExpression') {
+    return false;
+  }
+
+  const memberExpression = callExpression.callee;
+  if (
+    !(
+      memberExpression.object.type === 'Identifier' &&
+      memberExpression.object.name === 'TurboModuleRegistry'
+    )
+  ) {
+    return false;
+  }
+
+  if (
+    !(
+      memberExpression.property.type === 'Identifier' &&
+      (memberExpression.property.name === 'get' ||
+        memberExpression.property.name === 'getEnforcing')
+    )
+  ) {
+    return false;
+  }
+  return true;
+}
+
+function isGeneratedFile(context) {
+  return (
+    context
+      .getSourceCode()
+      .getText()
+      .indexOf('@' + 'generated SignedSource<<') !== -1
+  );
+}
+
+/**
+ * A lint rule to guide best practices in writing type safe React NativeModules.
+ */
+function rule(context) {
+  const filename = context.getFilename();
+
+  if (isGeneratedFile(context)) {
+    return {};
+  }
+
+  const sourceCode = context.getSourceCode().getText();
+  if (!sourceCode.includes('TurboModuleRegistry')) {
+    return {};
+  }
+
+  const specIdentifierUsages = [];
+  const declaredModuleInterfaces = [];
+
+  return {
+    'Program:exit': function() {
+      if (
+        specIdentifierUsages.length > 0 &&
+        declaredModuleInterfaces.length === 0
+      ) {
+        specIdentifierUsages.forEach(specNode => {
+          context.report({
+            node: specNode,
+            message: errors.specNotDeclaredInFile(),
+          });
+        });
+      }
+    },
+    CallExpression(node) {
+      if (!isModuleRequire(node)) {
+        return;
+      }
+
+      /**
+       * Validate that NativeModule requires are typed
+       */
+
+      const {typeArguments} = node;
+
+      if (typeArguments == null) {
+        const methodName = node.callee.property.name;
+        context.report({
+          node,
+          message: errors.untypedModuleRequire(methodName),
+        });
+        return;
+      }
+
+      if (typeArguments.type !== 'TypeParameterInstantiation') {
+        return;
+      }
+
+      const [param] = typeArguments.params;
+
+      /**
+       * Validate that NativeModule requires are correctly typed
+       */
+
+      if (
+        typeArguments.params.length !== 1 ||
+        param.type !== 'GenericTypeAnnotation' ||
+        param.id.name !== 'Spec'
+      ) {
+        const methodName = node.callee.property.name;
+        context.report({
+          node,
+          message: errors.incorrectlyTypedModuleRequire(methodName),
+        });
+        return;
+      }
+
+      specIdentifierUsages.push(param);
+      return true;
+    },
+    InterfaceDeclaration(node) {
+      if (
+        !interfaceExtendsFrom(node, 'DEPRECATED_RCTExport') &&
+        !interfaceExtendsFrom(node, 'TurboModule')
+      ) {
+        return;
+      }
+
+      const basename = path.basename(filename, '.js');
+      if (
+        basename &&
+        basename !== 'RCTExport' &&
+        !VALID_SPEC_NAMES.test(basename)
+      ) {
+        context.report({
+          loc: {start: {line: 0, column: 0}},
+          message: errors.invalidHasteName(basename),
+        });
+      }
+
+      if (node.id.name !== 'Spec') {
+        context.report({
+          node,
+          message: errors.invalidNativeModuleInterfaceName(node.id.name),
+          fix: fixer => fixer.replaceText(node.id, 'Spec'),
+        });
+        return;
+      }
+
+      declaredModuleInterfaces.push(node);
+
+      if (!node.body.properties.length) {
+        context.report({
+          node: node.body,
+          message: errors.missingSpecInterfaceMethod(),
+        });
+        return;
+      }
+
+      let hasUnsupportedProp = false;
+      node.body.properties.forEach(prop => {
+        if (hasUnsupportedProp) {
+          return;
+        }
+        if (!checkSupportedSpecProperty(context, prop.value)) {
+          hasUnsupportedProp = true;
+        }
+      });
+    },
+  };
+}
+
+rule.errors = errors;
+
+module.exports = rule;

From 311d4e9ef080aa429f840236cc23c013c0ae644c Mon Sep 17 00:00:00 2001
From: grabbou <grabbou@gmail.com>
Date: Tue, 22 Sep 2020 14:39:57 -0700
Subject: [PATCH 059/241] feat: enable bitcode (#365)

Summary:
Bitcode is turned on by default in React Native and so, setting it here as well.

Changelog: [iOS] [Changed] - Upgraded JSI with a new HERMES_ENABLE_BITCODE flag

Pull Request resolved: https://github.com/facebook/hermes/pull/365

Reviewed By: tmikov

Differential Revision: D23823228

Pulled By: Huxpro

fbshipit-source-id: d43638818a733f6a87b2f4a1ecadad8ea9c7a419
---
 ReactCommon/jsi/jsi/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ReactCommon/jsi/jsi/CMakeLists.txt b/ReactCommon/jsi/jsi/CMakeLists.txt
index d04af0006af915..121d697fd8e76e 100644
--- a/ReactCommon/jsi/jsi/CMakeLists.txt
+++ b/ReactCommon/jsi/jsi/CMakeLists.txt
@@ -21,6 +21,9 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "MSVC")
   # when they go out of scope due to exceptions.
   list(APPEND jsi_compile_flags "/EHsc")
 endif()
+if (HERMES_ENABLE_BITCODE)
+  list(APPEND jsi_compile_flags "-fembed-bitcode")
+endif ()
 target_compile_options(jsi PUBLIC ${jsi_compile_flags})
 
 install(DIRECTORY "${PROJECT_SOURCE_DIR}/API/jsi/" DESTINATION include

From e125f12c01262c11d70c1015139d5f72c5576042 Mon Sep 17 00:00:00 2001
From: Emily Janzer <janzer@fb.com>
Date: Tue, 22 Sep 2020 14:47:21 -0700
Subject: [PATCH 060/241] Add new ReactMarkers for bridgeless init start/end

Summary: Adding two new ReactMarkers for start and end of bridgeless initialization. Creating new ones instead of reusing existing ones to make it easier to differentiate data from the bridge vs. bridgeless, and also because our existing markers 1) aren't very easy to understand, and 2) don't map cleanly to the new architecture.

Reviewed By: PeteTheHeat

Differential Revision: D23789156

fbshipit-source-id: 2ed10769e08604e591503a2bc9566aeb1d0563ed
---
 .../java/com/facebook/react/bridge/ReactMarkerConstants.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index dd08b9a8eea480..8c5f38d4d89c06 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -108,5 +108,8 @@ public enum ReactMarkerConstants {
   FABRIC_BATCH_EXECUTION_START,
   FABRIC_BATCH_EXECUTION_END,
   FABRIC_UPDATE_UI_MAIN_THREAD_START,
-  FABRIC_UPDATE_UI_MAIN_THREAD_END
+  FABRIC_UPDATE_UI_MAIN_THREAD_END,
+  // New markers used by bridgeless RN below this line
+  REACT_INSTANCE_INIT_START,
+  REACT_INSTANCE_INIT_END
 }

From 246f7469422637acc00f072222082ea5b58503e7 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Wed, 23 Sep 2020 05:58:20 -0700
Subject: [PATCH 061/241] Set useLineSpacingFromFallbacks when measuring text

Summary:
Changelog: [internal]

When paper measures text, it sets `useLineSpacingFromFallbacks` flag on the Layout object. In Fabric this was missing and can cause incorrect layout.

Reviewed By: JoshuaGross

Differential Revision: D23845441

fbshipit-source-id: 538f440cdbbf8df2cba0458837b80db103888113
---
 .../facebook/react/views/text/TextLayoutManager.java  | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index 92073cd3392124..34ad7c4e9af018 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -326,14 +326,19 @@ private static Layout createLayout(
                 0.f,
                 includeFontPadding);
       } else {
-        layout =
+        StaticLayout.Builder builder =
             StaticLayout.Builder.obtain(text, 0, spanLength, textPaint, (int) width)
                 .setAlignment(Layout.Alignment.ALIGN_NORMAL)
                 .setLineSpacing(0.f, 1.f)
                 .setIncludePad(includeFontPadding)
                 .setBreakStrategy(textBreakStrategy)
-                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL)
-                .build();
+                .setHyphenationFrequency(Layout.HYPHENATION_FREQUENCY_NORMAL);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+          builder.setUseLineSpacingFromFallbacks(true);
+        }
+
+        layout = builder.build();
       }
     }
     return layout;

From 6e08f84719c47985e80123c72686d7a1c89b72ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eloy=20Dur=C3=A1n?= <eloy.de.enige@gmail.com>
Date: Wed, 23 Sep 2020 08:15:12 -0700
Subject: [PATCH 062/241] Make React-Core compatible with Swift modules
 (#29995)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Related to https://github.com/facebook/react-native/issues/29633

Support Swift based libraries using Xcode 12’s build system.

## Changelog

[iOS] [Fixed] - Support Swift based libraries using Xcode 12’s build system.

Pull Request resolved: https://github.com/facebook/react-native/pull/29995

Test Plan:
* Building RNTester still works
* Swift based pod tested in https://github.com/mrousavy/react-native-blurhash/issues/58

Reviewed By: fkgozali

Differential Revision: D23824438

Pulled By: appden

fbshipit-source-id: 418caf9808cb6326e3d6efdc8b37131a5705e7f6
---
 React-Core.podspec              | 2 +-
 packages/rn-tester/Podfile.lock | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/React-Core.podspec b/React-Core.podspec
index 7a004607739d7f..7079adab55bb27 100644
--- a/React-Core.podspec
+++ b/React-Core.podspec
@@ -48,7 +48,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
   s.library                = "stdc++"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\"" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\"", "DEFINES_MODULE" => "YES" }
   s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
   s.default_subspec        = "Default"
 
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 35a1f000fa751e..feb55d5dbc64aa 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -505,7 +505,7 @@ SPEC CHECKSUMS:
   RCTTypeSafety: 84db212a990ce622a28f1bcb1ac68c658e722373
   React: cafb3c2321f7df55ce90dbf29d513799a79e4418
   React-callinvoker: 0dada022d38b73e6e15b33e2a96476153f79bbf6
-  React-Core: d377a770bb13aa5120a6ce553f75f0e1cbc1aafe
+  React-Core: fbbfaa3cbb1ca720fd74ef938214b5943da1aa5d
   React-CoreModules: f38b671f8df4c1c744ed69f00264539a7c4024b4
   React-cxxreact: de6de17eac6bbaa4f9fad46b66e7f0c4aaaf863d
   React-jsi: 652ad7cb7ff8c87e0e9fb11e9ebcbbc70cdfe865

From 6d355c0abd6e09f69cd30f43c976183fafa136d2 Mon Sep 17 00:00:00 2001
From: Luna Wei <luwe@fb.com>
Date: Wed, 23 Sep 2020 15:46:58 -0700
Subject: [PATCH 063/241] Sort logger alphabetically

Summary:
Rearranging to alphabetically sort, no functionality changes

Changelog: [Internal]

Reviewed By: rubennorte, motiz88

Differential Revision: D23836997

fbshipit-source-id: 00232b88379e44920ecb74fa6ff43f36d941d93b
---
 .../Utilities/createPerformanceLogger.js      | 192 +++++++++---------
 1 file changed, 96 insertions(+), 96 deletions(-)

diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 195c1b30807c7a..28e0c5ab149b36 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -37,20 +37,20 @@ export interface IPerformanceLogger {
     startExtras?: Extras,
     endExtras?: Extras,
   ): void;
-  startTimespan(key: string, extras?: Extras): void;
-  stopTimespan(key: string, extras?: Extras): void;
   clear(): void;
   clearCompleted(): void;
   currentTimestamp(): number;
-  getTimespans(): {[key: string]: Timespan, ...};
-  hasTimespan(key: string): boolean;
-  setExtra(key: string, value: ExtraValue): void;
   getExtras(): {[key: string]: ExtraValue, ...};
-  removeExtra(key: string): ExtraValue | void;
-  markPoint(key: string, timestamp?: number, extras?: Extras): void;
   getPoints(): {[key: string]: number, ...};
   getPointExtras(): {[key: string]: Extras, ...};
+  getTimespans(): {[key: string]: Timespan, ...};
+  hasTimespan(key: string): boolean;
   logEverything(): void;
+  markPoint(key: string, timestamp?: number, extras?: Extras): void;
+  removeExtra(key: string): ExtraValue | void;
+  setExtra(key: string, value: ExtraValue): void;
+  startTimespan(key: string, extras?: Extras): void;
+  stopTimespan(key: string, extras?: Extras): void;
 }
 
 const _cookies: {[key: string]: number, ...} = {};
@@ -89,61 +89,6 @@ class PerformanceLogger implements IPerformanceLogger {
     };
   }
 
-  startTimespan(key: string, extras?: Extras) {
-    if (this._timespans[key]) {
-      if (PRINT_TO_CONSOLE && __DEV__) {
-        infoLog(
-          'PerformanceLogger: Attempting to start a timespan that already exists ',
-          key,
-        );
-      }
-      return;
-    }
-
-    this._timespans[key] = {
-      startTime: performanceNow(),
-      startExtras: extras,
-    };
-    _cookies[key] = Systrace.beginAsyncEvent(key);
-    if (PRINT_TO_CONSOLE) {
-      infoLog('PerformanceLogger.js', 'start: ' + key);
-    }
-  }
-
-  stopTimespan(key: string, extras?: Extras) {
-    const timespan = this._timespans[key];
-    if (!timespan || timespan.startTime == null) {
-      if (PRINT_TO_CONSOLE && __DEV__) {
-        infoLog(
-          'PerformanceLogger: Attempting to end a timespan that has not started ',
-          key,
-        );
-      }
-      return;
-    }
-    if (timespan.endTime != null) {
-      if (PRINT_TO_CONSOLE && __DEV__) {
-        infoLog(
-          'PerformanceLogger: Attempting to end a timespan that has already ended ',
-          key,
-        );
-      }
-      return;
-    }
-
-    timespan.endExtras = extras;
-    timespan.endTime = performanceNow();
-    timespan.totalTime = timespan.endTime - (timespan.startTime || 0);
-    if (PRINT_TO_CONSOLE) {
-      infoLog('PerformanceLogger.js', 'end: ' + key);
-    }
-
-    if (_cookies[key] != null) {
-      Systrace.endAsyncEvent(key, _cookies[key]);
-      delete _cookies[key];
-    }
-  }
-
   clear() {
     this._timespans = {};
     this._extras = {};
@@ -170,6 +115,18 @@ class PerformanceLogger implements IPerformanceLogger {
     return performanceNow();
   }
 
+  getExtras() {
+    return this._extras;
+  }
+
+  getPoints() {
+    return this._points;
+  }
+
+  getPointExtras() {
+    return this._pointExtras;
+  }
+
   getTimespans() {
     return this._timespans;
   }
@@ -178,27 +135,23 @@ class PerformanceLogger implements IPerformanceLogger {
     return !!this._timespans[key];
   }
 
-  setExtra(key: string, value: ExtraValue) {
-    if (this._extras.hasOwnProperty(key)) {
-      if (PRINT_TO_CONSOLE && __DEV__) {
-        infoLog(
-          'PerformanceLogger: Attempting to set an extra that already exists ',
-          {key, currentValue: this._extras[key], attemptedValue: value},
-        );
+  logEverything() {
+    if (PRINT_TO_CONSOLE) {
+      // log timespans
+      for (const key in this._timespans) {
+        if (this._timespans[key].totalTime != null) {
+          infoLog(key + ': ' + this._timespans[key].totalTime + 'ms');
+        }
       }
-      return;
-    }
-    this._extras[key] = value;
-  }
 
-  getExtras() {
-    return this._extras;
-  }
+      // log extras
+      infoLog(this._extras);
 
-  removeExtra(key: string): ExtraValue | void {
-    const value = this._extras[key];
-    delete this._extras[key];
-    return value;
+      // log points
+      for (const key in this._points) {
+        infoLog(key + ': ' + this._points[key] + 'ms');
+      }
+    }
   }
 
   markPoint(key: string, timestamp?: number, extras?: Extras) {
@@ -217,30 +170,77 @@ class PerformanceLogger implements IPerformanceLogger {
     }
   }
 
-  getPoints() {
-    return this._points;
+  removeExtra(key: string): ExtraValue | void {
+    const value = this._extras[key];
+    delete this._extras[key];
+    return value;
   }
 
-  getPointExtras() {
-    return this._pointExtras;
+  setExtra(key: string, value: ExtraValue) {
+    if (this._extras.hasOwnProperty(key)) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to set an extra that already exists ',
+          {key, currentValue: this._extras[key], attemptedValue: value},
+        );
+      }
+      return;
+    }
+    this._extras[key] = value;
   }
 
-  logEverything() {
-    if (PRINT_TO_CONSOLE) {
-      // log timespans
-      for (const key in this._timespans) {
-        if (this._timespans[key].totalTime != null) {
-          infoLog(key + ': ' + this._timespans[key].totalTime + 'ms');
-        }
+  startTimespan(key: string, extras?: Extras) {
+    if (this._timespans[key]) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to start a timespan that already exists ',
+          key,
+        );
       }
+      return;
+    }
 
-      // log extras
-      infoLog(this._extras);
+    this._timespans[key] = {
+      startTime: performanceNow(),
+      startExtras: extras,
+    };
+    _cookies[key] = Systrace.beginAsyncEvent(key);
+    if (PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'start: ' + key);
+    }
+  }
 
-      // log points
-      for (const key in this._points) {
-        infoLog(key + ': ' + this._points[key] + 'ms');
+  stopTimespan(key: string, extras?: Extras) {
+    const timespan = this._timespans[key];
+    if (!timespan || timespan.startTime == null) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to end a timespan that has not started ',
+          key,
+        );
+      }
+      return;
+    }
+    if (timespan.endTime != null) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: Attempting to end a timespan that has already ended ',
+          key,
+        );
       }
+      return;
+    }
+
+    timespan.endExtras = extras;
+    timespan.endTime = performanceNow();
+    timespan.totalTime = timespan.endTime - (timespan.startTime || 0);
+    if (PRINT_TO_CONSOLE) {
+      infoLog('PerformanceLogger.js', 'end: ' + key);
+    }
+
+    if (_cookies[key] != null) {
+      Systrace.endAsyncEvent(key, _cookies[key]);
+      delete _cookies[key];
     }
   }
 }

From aebb97b9c64a8d84cf852ae8efc5ef28b36da610 Mon Sep 17 00:00:00 2001
From: Luna Wei <luwe@fb.com>
Date: Wed, 23 Sep 2020 15:46:58 -0700
Subject: [PATCH 064/241] Add close() to IPerformanceLogger

Summary:
To represent a final state where a logger should no longer be used

Changelog: [Internal] - To represent a final state where a logger should no longer be used

Reviewed By: rubennorte

Differential Revision: D23845307

fbshipit-source-id: 4b2bfda4f7425ba6bc8e5e1233d9baea60dd8667
---
 .../__tests__/PerformanceLogger-test.js       | 34 ++++++++++++++
 .../Utilities/createPerformanceLogger.js      | 47 +++++++++++++++++++
 2 files changed, 81 insertions(+)

diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index a762157a1654dd..45837855b6b5a9 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -28,6 +28,40 @@ describe('PerformanceLogger', () => {
   beforeEach(() => {
     GlobalPerformanceLogger.clear();
   });
+  describe('close() ', () => {
+    let perfLogger;
+    beforeEach(() => {
+      perfLogger = createPerformanceLogger();
+    });
+
+    it('does not markPoint', () => {
+      perfLogger.close();
+      perfLogger.markPoint(POINT, POINT_TIMESTAMP);
+      expect(perfLogger.getPoints()).toEqual({});
+    });
+    it('does not startTimespan', () => {
+      perfLogger.close();
+      perfLogger.startTimespan(TIMESPAN_1);
+      expect(perfLogger.getTimespans()).toEqual({});
+    });
+    it('does not setExtra', () => {
+      perfLogger.close();
+      perfLogger.setExtra('extra', 'an extra value');
+      expect(perfLogger.getTimespans()).toEqual({});
+    });
+
+    it('does not stopTimespan', () => {
+      perfLogger.startTimespan(TIMESPAN_1);
+      perfLogger.close();
+      let timespan = perfLogger.getTimespans()[TIMESPAN_1];
+      expect(timespan.endTime).toBeUndefined();
+      expect(timespan.totalTime).toBeUndefined();
+      perfLogger.stopTimespan(TIMESPAN_1);
+      timespan = perfLogger.getTimespans()[TIMESPAN_1];
+      expect(timespan.endTime).toBeUndefined();
+      expect(timespan.totalTime).toBeUndefined();
+    });
+  });
 
   it('starts & stops a timespan', () => {
     let perfLogger = createPerformanceLogger();
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 28e0c5ab149b36..e94b8bd3a00059 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -39,12 +39,14 @@ export interface IPerformanceLogger {
   ): void;
   clear(): void;
   clearCompleted(): void;
+  close(): void;
   currentTimestamp(): number;
   getExtras(): {[key: string]: ExtraValue, ...};
   getPoints(): {[key: string]: number, ...};
   getPointExtras(): {[key: string]: Extras, ...};
   getTimespans(): {[key: string]: Timespan, ...};
   hasTimespan(key: string): boolean;
+  isClosed(): boolean;
   logEverything(): void;
   markPoint(key: string, timestamp?: number, extras?: Extras): void;
   removeExtra(key: string): ExtraValue | void;
@@ -62,6 +64,7 @@ class PerformanceLogger implements IPerformanceLogger {
   _extras: {[key: string]: ExtraValue} = {};
   _points: {[key: string]: number} = {};
   _pointExtras: {[key: string]: Extras, ...} = {};
+  _closed: boolean = false;
 
   addTimespan(
     key: string,
@@ -70,6 +73,12 @@ class PerformanceLogger implements IPerformanceLogger {
     startExtras?: Extras,
     endExtras?: Extras,
   ) {
+    if (this._closed) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog('PerformanceLogger: addTimespan - has closed ignoring: ', key);
+      }
+      return;
+    }
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -111,6 +120,10 @@ class PerformanceLogger implements IPerformanceLogger {
     }
   }
 
+  close() {
+    this._closed = true;
+  }
+
   currentTimestamp() {
     return performanceNow();
   }
@@ -135,6 +148,10 @@ class PerformanceLogger implements IPerformanceLogger {
     return !!this._timespans[key];
   }
 
+  isClosed() {
+    return this._closed;
+  }
+
   logEverything() {
     if (PRINT_TO_CONSOLE) {
       // log timespans
@@ -155,6 +172,12 @@ class PerformanceLogger implements IPerformanceLogger {
   }
 
   markPoint(key: string, timestamp?: number, extras?: Extras) {
+    if (this._closed) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog('PerformanceLogger: markPoint - has closed ignoring: ', key);
+      }
+      return;
+    }
     if (this._points[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -177,6 +200,13 @@ class PerformanceLogger implements IPerformanceLogger {
   }
 
   setExtra(key: string, value: ExtraValue) {
+    if (this._closed) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog('PerformanceLogger: setExtra - has closed ignoring: ', key);
+      }
+      return;
+    }
+
     if (this._extras.hasOwnProperty(key)) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -190,6 +220,16 @@ class PerformanceLogger implements IPerformanceLogger {
   }
 
   startTimespan(key: string, extras?: Extras) {
+    if (this._closed) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog(
+          'PerformanceLogger: startTimespan - has closed ignoring: ',
+          key,
+        );
+      }
+      return;
+    }
+
     if (this._timespans[key]) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
@@ -211,6 +251,13 @@ class PerformanceLogger implements IPerformanceLogger {
   }
 
   stopTimespan(key: string, extras?: Extras) {
+    if (this._closed) {
+      if (PRINT_TO_CONSOLE && __DEV__) {
+        infoLog('PerformanceLogger: stopTimespan - has closed ignoring: ', key);
+      }
+      return;
+    }
+
     const timespan = this._timespans[key];
     if (!timespan || timespan.startTime == null) {
       if (PRINT_TO_CONSOLE && __DEV__) {

From c3ab2a2541056ec9394f4f5e95a224ce265a0f8c Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Wed, 23 Sep 2020 16:50:34 -0700
Subject: [PATCH 065/241] RNTester Android: Add stub C++ for TurboModule
 provider (#30014)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/30014

This is the base setup to compile C++ as part of RNTester app. There is no dependencies on ReactAndroidNdk lib yet, just a bunch of ndkBuild setup in Gradle. Note: this is using Gradle's `nkdBuild` support instead of calling `ndk-build` manually like in ReactAndroid/build.gradle.

Reference: https://google.github.io/android-gradle-dsl/current/com.android.build.gradle.internal.dsl.ExternalNativeNdkBuildOptions.html

Note that `ANDROID_NDK` env var is honored to pick the right NDK version.

For now, this is gated behind `USE_CODEGEN` env variable.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D23887058

fbshipit-source-id: 7a962649461d15af46999a15b900464543e5b05c
---
 .gitignore                                    |  1 +
 .../android/generator/build.gradle            | 19 ------------
 packages/rn-tester/android/app/build.gradle   | 29 +++++++++++++++++++
 .../android/app/src/main/jni/Android.mk       | 29 +++++++++++++++++++
 .../main/jni/RNTesterAppModuleProvider.cpp    | 18 ++++++++++++
 .../src/main/jni/RNTesterAppModuleProvider.h  | 19 ++++++++++++
 6 files changed, 96 insertions(+), 19 deletions(-)
 delete mode 100644 packages/react-native-codegen/android/generator/build.gradle
 create mode 100644 packages/rn-tester/android/app/src/main/jni/Android.mk
 create mode 100644 packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
 create mode 100644 packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h

diff --git a/.gitignore b/.gitignore
index 6e14c3fc7561c3..382e8aec6fa49f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,7 @@ project.xcworkspace
 /build/
 /packages/react-native-codegen/android/build/
 /packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build
+/packages/rn-tester/android/app/.cxx/
 /packages/rn-tester/android/app/build/
 /packages/rn-tester/android/app/gradle/
 /packages/rn-tester/android/app/gradlew
diff --git a/packages/react-native-codegen/android/generator/build.gradle b/packages/react-native-codegen/android/generator/build.gradle
deleted file mode 100644
index 1ba58144a415db..00000000000000
--- a/packages/react-native-codegen/android/generator/build.gradle
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-plugins {
-    id 'java'
-    id 'application'
-}
-
-dependencies {
-    implementation 'com.squareup:javapoet:1.13.0'
-}
-
-application {
-    mainClassName = 'com.facebook.react.codegen.JavaGeneratorMain'
-}
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index 38b128c87a23ef..04d36897dc593b 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -85,6 +85,7 @@ project.ext.react = [
     hermesCommand: "$rootDir/node_modules/hermes-engine/%OS-BIN%/hermesc",
     enableHermesForVariant: { def v -> v.name.contains("hermes") },
     jsRootDir: "$rootDir/RNTester",
+    enableCodegen: (System.getenv('USE_CODEGEN') ?: '0').toBoolean(),
     enableFabric: (System.getenv('USE_FABRIC') ?: '0').toBoolean(),
 ]
 
@@ -106,6 +107,11 @@ def enableSeparateBuildPerCPUArchitecture = true
  */
 def enableProguardInReleaseBuilds = true
 
+/**
+ * Build and enable codegen-related output in RN Tester app.
+ */
+def enableCodegen = project.ext.react.enableCodegen
+
 /**
  * Build and enable Fabric in RN Tester app.
  */
@@ -179,6 +185,29 @@ android {
     }
 }
 
+if (enableCodegen) {
+    android {
+        defaultConfig {
+            externalNativeBuild {
+                ndkBuild {
+                    abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a"
+                    arguments "APP_PLATFORM=android-16",
+                            "APP_STL=c++_shared",
+                            "NDK_TOOLCHAIN_VERSION=clang"
+                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+                    cppFlags "-std=c++1y"
+                    targets "rntester_appmodules"
+                }
+            }
+        }
+        externalNativeBuild {
+            ndkBuild {
+                path "$projectDir/src/main/jni/Android.mk"
+            }
+        }
+    }
+}
+
 configurations {
   hermesDebugImplementation {}
   hermesReleaseImplementation {}
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
new file mode 100644
index 00000000000000..c5c26f6e1da7e9
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -0,0 +1,29 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := rntester_appmodules
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+
+# TODO
+# LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core libreactnativejni
+
+# TODO
+# LOCAL_STATIC_LIBRARIES := libjsi
+
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"ReactNative\"
+
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_SHARED_LIBRARY)
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
new file mode 100644
index 00000000000000..7a6e281f1020a2
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RNTesterAppModuleProvider.h"
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr<void> RNTesterAppModuleProvider(const std::string moduleName) {
+  return nullptr;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h
new file mode 100644
index 00000000000000..50a7e16fd96463
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <memory>
+#include <string>
+
+namespace facebook {
+namespace react {
+
+std::shared_ptr<void> RNTesterAppModuleProvider(const std::string moduleName);
+
+} // namespace react
+} // namespace facebook

From 43abf23bffeda51aace62741f0a197a823a482ac Mon Sep 17 00:00:00 2001
From: chirag-singhal <csinghal208@gmail.com>
Date: Wed, 23 Sep 2020 19:49:55 -0700
Subject: [PATCH 066/241] New Button Component Use Cases (#29848)

Summary:
* New use cases for button component in rn-tester
 * E2E tests for the button component

## Changelog
[General] [Changed] - Changed use cases for button component in rn-tester

## Test Plan
![image](https://user-images.githubusercontent.com/42653703/92123053-ced6d400-ee19-11ea-8f10-c5e8529c85ca.png)
After -
![image](https://user-images.githubusercontent.com/42653703/92625569-70609880-f2e6-11ea-9fb9-f7327d842a34.png)
Before -
![image](https://user-images.githubusercontent.com/42653703/92625555-6a6ab780-f2e6-11ea-90d1-8c54ebc60062.png)

Pull Request resolved: https://github.com/facebook/react-native/pull/29848

Reviewed By: hramos

Differential Revision: D23649694

Pulled By: rickhanlonii

fbshipit-source-id: 3590eca08ea58c771596ad731f74eb233b1a40d8
---
 .../rn-tester/e2e/__tests__/Button-test.js    |  69 +++++++--
 .../rn-tester/js/components/RNTesterTheme.js  |   9 +-
 .../js/examples/Button/ButtonExample.js       | 141 ++++++++++++------
 3 files changed, 158 insertions(+), 61 deletions(-)

diff --git a/packages/rn-tester/e2e/__tests__/Button-test.js b/packages/rn-tester/e2e/__tests__/Button-test.js
index 53588b168a525a..1b67f2a5871209 100644
--- a/packages/rn-tester/e2e/__tests__/Button-test.js
+++ b/packages/rn-tester/e2e/__tests__/Button-test.js
@@ -23,36 +23,75 @@ describe('Button', () => {
     );
   });
 
-  it('Simple button should be tappable', async () => {
-    await openExampleWithTitle('Simple Button');
-    await element(by.id('simple_button')).tap();
-    await expect(element(by.text('Simple has been pressed!'))).toBeVisible();
+  it('Default Styling button should be tappable', async () => {
+    await openExampleWithTitle('Default Styling');
+    await element(by.id('button_default_styling')).tap();
+    await expect(
+      element(by.text('Your application has been submitted!')),
+    ).toBeVisible();
     await element(by.text('OK')).tap();
   });
 
-  it('Adjusted color button should be tappable', async () => {
-    await openExampleWithTitle('Adjusted color');
-    await element(by.id('purple_button')).tap();
-    await expect(element(by.text('Purple has been pressed!'))).toBeVisible();
+  it('Red color button should be tappable', async () => {
+    await openExampleWithTitle('Color');
+    await element(by.id('cancel_button')).tap();
+    await expect(
+      element(by.text('Your application has been cancelled!')),
+    ).toBeVisible();
     await element(by.text('OK')).tap();
   });
 
   it("Two buttons with JustifyContent:'space-between' should be tappable", async () => {
-    await openExampleWithTitle('Fit to text layout');
-    await element(by.id('left_button')).tap();
-    await expect(element(by.text('Left has been pressed!'))).toBeVisible();
+    await openExampleWithTitle('Two Buttons');
+    await element(by.id('two_cancel_button')).tap();
+    await expect(
+      element(by.text('Your application has been cancelled!')),
+    ).toBeVisible();
+    await element(by.text('OK')).tap();
+
+    await element(by.id('two_submit_button')).tap();
+    await expect(
+      element(by.text('Your application has been submitted!')),
+    ).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
+
+  it("Three buttons with JustifyContent:'space-between' should be tappable", async () => {
+    await openExampleWithTitle('Three Buttons');
+    await element(by.id('three_cancel_button')).tap();
+    await expect(
+      element(by.text('Your application has been cancelled!')),
+    ).toBeVisible();
     await element(by.text('OK')).tap();
 
-    await element(by.id('right_button')).tap();
-    await expect(element(by.text('Right has been pressed!'))).toBeVisible();
+    await openExampleWithTitle('Three Buttons');
+    await element(by.id('three_save_button')).tap();
+    await expect(
+      element(by.text('Your application has been saved!')),
+    ).toBeVisible();
+    await element(by.text('OK')).tap();
+
+    await element(by.id('three_submit_button')).tap();
+    await expect(
+      element(by.text('Your application has been submitted!')),
+    ).toBeVisible();
     await element(by.text('OK')).tap();
   });
 
   it('Disabled button should not interact', async () => {
-    await openExampleWithTitle('Disabled Button');
+    await openExampleWithTitle('Disabled');
     await element(by.id('disabled_button')).tap();
     await expect(
-      element(by.text('Disabled has been pressed!')),
+      element(by.text('Your application has been submitted!')),
     ).toBeNotVisible();
   });
+
+  it('AccessibilityLabel button should be tappable', async () => {
+    await openExampleWithTitle('AccessibilityLabel');
+    await element(by.id('accessibilityLabel_button')).tap();
+    await expect(
+      element(by.text('Your application has been submitted!')),
+    ).toBeVisible();
+    await element(by.text('OK')).tap();
+  });
 });
diff --git a/packages/rn-tester/js/components/RNTesterTheme.js b/packages/rn-tester/js/components/RNTesterTheme.js
index 5727f64da5ce80..4a9371296321a8 100644
--- a/packages/rn-tester/js/components/RNTesterTheme.js
+++ b/packages/rn-tester/js/components/RNTesterTheme.js
@@ -33,7 +33,8 @@ export type RNTesterTheme = {
   SeparatorColor: ColorValue,
   OpaqueSeparatorColor: ColorValue,
   LinkColor: ColorValue,
-  SystemPurpleColor: ColorValue,
+  SystemRedColor: ColorValue,
+  SystemGreenColor: ColorValue,
   ToolbarColor: ColorValue,
   BackgroundColor: ColorValue,
   BorderColor: ColorValue,
@@ -59,7 +60,8 @@ export const RNTesterLightTheme = {
   SeparatorColor: '#3c3c4349',
   OpaqueSeparatorColor: '#c6c6c8ff',
   LinkColor: '#007affff',
-  SystemPurpleColor: '#af52deff',
+  SystemRedColor: '#ff3b30ff',
+  SystemGreenColor: '#34c759ff',
   ToolbarColor: '#e9eaedff',
   BackgroundColor: '#f3f8ffff',
   BorderColor: '#005dffff',
@@ -84,7 +86,8 @@ export const RNTesterDarkTheme = {
   SeparatorColor: '#54545899',
   OpaqueSeparatorColor: '#38383aff',
   LinkColor: '#0984ffff',
-  SystemPurpleColor: '#bf5af2ff',
+  SystemRedColor: '#ff375fff',
+  SystemGreenColor: '#30d158ff',
   ToolbarColor: '#3c3c43ff',
   BackgroundColor: '#0c0700ff',
   BorderColor: '#005dffff',
diff --git a/packages/rn-tester/js/examples/Button/ButtonExample.js b/packages/rn-tester/js/examples/Button/ButtonExample.js
index 00e8110f6dc2fe..c15a451589539d 100644
--- a/packages/rn-tester/js/examples/Button/ButtonExample.js
+++ b/packages/rn-tester/js/examples/Button/ButtonExample.js
@@ -13,10 +13,10 @@
 const React = require('react');
 
 const {Alert, Button, View, StyleSheet} = require('react-native');
-import {RNTesterThemeContext} from '../../components/RNTesterTheme';
+const {RNTesterThemeContext} = require('../../components/RNTesterTheme');
 
 function onButtonPress(buttonName) {
-  Alert.alert(`${buttonName} has been pressed!`);
+  Alert.alert(`Your application has been ${buttonName}!`);
 }
 
 exports.displayName = 'ButtonExample';
@@ -28,21 +28,33 @@ exports.description = 'Simple React Native button component.';
 
 exports.examples = [
   {
-    title: 'Simple Button',
-    description: ('The title and onPress handler are required. It is ' +
-      'recommended to set accessibilityLabel to help make your app usable by ' +
-      'everyone.': string),
+    title: 'Button with default styling',
+    render: function(): React.Node {
+      return (
+        <Button
+          onPress={() => onButtonPress('submitted')}
+          testID="button_default_styling"
+          title="Submit Application"
+          accessibilityLabel="Press to submit your application!"
+        />
+      );
+    },
+  },
+  {
+    title: 'Button with color="red"',
+    description: ('Note: On iOS, the color prop controls the color of the text. On ' +
+      'Android, the color adjusts the background color of the button.': string),
     render: function(): React.Node {
       return (
         <RNTesterThemeContext.Consumer>
           {theme => {
             return (
               <Button
-                onPress={() => onButtonPress('Simple')}
-                testID="simple_button"
-                color={theme.LinkColor}
-                title="Press Me"
-                accessibilityLabel="See an informative alert"
+                onPress={() => onButtonPress('cancelled')}
+                testID="cancel_button"
+                color={theme.SystemRedColor}
+                title="Cancel Application"
+                accessibilityLabel="Press to cancel your application!"
               />
             );
           }}
@@ -51,22 +63,30 @@ exports.examples = [
     },
   },
   {
-    title: 'Adjusted color',
-    description: ('Adjusts the color in a way that looks standard on each ' +
-      'platform. On iOS, the color prop controls the color of the text. On ' +
-      'Android, the color adjusts the background color of the button.': string),
+    title: 'Two Buttons with Flexbox layout',
+    description: ('Two buttons wrapped inside view with justifyContent: spaceBetween,' +
+      'This layout strategy lets the title define the width of the button': string),
     render: function(): React.Node {
       return (
         <RNTesterThemeContext.Consumer>
           {theme => {
             return (
-              <Button
-                onPress={() => onButtonPress('Purple')}
-                testID="purple_button"
-                color={theme.SystemPurpleColor}
-                title="Press Purple"
-                accessibilityLabel="Learn more about purple"
-              />
+              <View style={styles.container}>
+                <Button
+                  onPress={() => onButtonPress('cancelled')}
+                  testID="two_cancel_button"
+                  color={theme.SystemRedColor}
+                  title="Cancel"
+                  accessibilityLabel="Press to cancel your application!"
+                />
+                <Button
+                  onPress={() => onButtonPress('submitted')}
+                  testID="two_submit_button"
+                  color={theme.SystemGreenColor}
+                  title="Submit"
+                  accessibilityLabel="Press to submit your application!"
+                />
+              </View>
             );
           }}
         </RNTesterThemeContext.Consumer>
@@ -74,9 +94,7 @@ exports.examples = [
     },
   },
   {
-    title: 'Fit to text layout',
-    description: ('This layout strategy lets the title define the width of ' +
-      'the button': string),
+    title: 'Three Buttons with Flexbox layout',
     render: function(): React.Node {
       return (
         <RNTesterThemeContext.Consumer>
@@ -84,18 +102,25 @@ exports.examples = [
             return (
               <View style={styles.container}>
                 <Button
-                  onPress={() => onButtonPress('Left')}
-                  testID="left_button"
+                  onPress={() => onButtonPress('cancelled')}
+                  testID="three_cancel_button"
+                  color={theme.SystemRedColor}
+                  title="Cancel"
+                  accessibilityLabel="Press to cancel your application!"
+                />
+                <Button
+                  onPress={() => onButtonPress('saved')}
+                  testID="three_save_button"
                   color={theme.LinkColor}
-                  title="This looks great!"
-                  accessibilityLabel="This sounds great!"
+                  title="Save For Later"
+                  accessibilityLabel="Press to save your application!"
                 />
                 <Button
-                  onPress={() => onButtonPress('Right')}
-                  testID="right_button"
-                  color={theme.SystemPurpleColor}
-                  title="Ok!"
-                  accessibilityLabel="Ok, Great!"
+                  onPress={() => onButtonPress('submitted')}
+                  testID="three_submit_button"
+                  color={theme.SystemGreenColor}
+                  title="Submit"
+                  accessibilityLabel="Press to submit your application!"
                 />
               </View>
             );
@@ -105,17 +130,47 @@ exports.examples = [
     },
   },
   {
-    title: 'Disabled Button',
-    description: 'All interactions for the component are disabled.',
+    title: 'Button with disabled={true}',
+    description:
+      'By passing disabled={true} all interactions for the button are disabled.',
     render: function(): React.Node {
       return (
-        <Button
-          disabled
-          onPress={() => onButtonPress('Disabled')}
-          testID="disabled_button"
-          title="I Am Disabled"
-          accessibilityLabel="See an informative alert"
-        />
+        <RNTesterThemeContext.Consumer>
+          {theme => {
+            return (
+              <Button
+                disabled
+                onPress={() => onButtonPress('submitted')}
+                color={theme.LinkColor}
+                testID="disabled_button"
+                title="Submit Application"
+                accessibilityLabel="Press to submit your application!"
+              />
+            );
+          }}
+        </RNTesterThemeContext.Consumer>
+      );
+    },
+  },
+  {
+    title: 'Button with accessibilityLabel="label"',
+    description: ('Note: This prop changes the text that a screen ' +
+      'reader announces (there are no visual differences).': string),
+    render: function(): React.Node {
+      return (
+        <RNTesterThemeContext.Consumer>
+          {theme => {
+            return (
+              <Button
+                onPress={() => onButtonPress('submitted')}
+                testID="accessibilityLabel_button"
+                color={theme.LinkColor}
+                title="Submit Application"
+                accessibilityLabel="Press to submit your application!"
+              />
+            );
+          }}
+        </RNTesterThemeContext.Consumer>
       );
     },
   },

From 99db9f2a42f6897de5e93f35ef664e45ab034553 Mon Sep 17 00:00:00 2001
From: Ankit Tiwari <ankitt255@gmail.com>
Date: Wed, 23 Sep 2020 19:55:33 -0700
Subject: [PATCH 067/241] Minor Code Improvements in RNTester (#29868)

Summary:
* Update single-letter variable names to be more descriptive
* Remove event listener on component unmount
* Add flow types
* Refactor RNTesterNavbar to use descriptive component names

Pull Request resolved: https://github.com/facebook/react-native/pull/29868

Reviewed By: hramos

Differential Revision: D23598579

Pulled By: rickhanlonii

fbshipit-source-id: c5cfc61d7b2fcb2942bf149d0a8ba0b58b0192e6
---
 packages/rn-tester/js/RNTesterAppShared.js    |  13 +-
 .../js/components/RNTesterBookmark.js         |  38 ----
 .../js/components/RNTesterDocumentationURL.js |  10 +-
 .../rn-tester/js/components/RNTesterNavbar.js | 173 ++++++++++--------
 .../rn-tester/js/utils/testerStateUtils.js    |  24 ++-
 5 files changed, 127 insertions(+), 131 deletions(-)
 delete mode 100644 packages/rn-tester/js/components/RNTesterBookmark.js

diff --git a/packages/rn-tester/js/RNTesterAppShared.js b/packages/rn-tester/js/RNTesterAppShared.js
index 5d82b93e3e5dd7..ee0c73677cfbc5 100644
--- a/packages/rn-tester/js/RNTesterAppShared.js
+++ b/packages/rn-tester/js/RNTesterAppShared.js
@@ -139,13 +139,22 @@ const RNTesterApp = (): React.Node => {
 
   // Setup hardware back button press listener
   React.useEffect(() => {
-    BackHandler.addEventListener('hardwareBackPress', () => {
+    const handleHardwareBackPress = () => {
       if (openExample) {
         handleBackPress();
         return true;
       }
       return false;
-    });
+    };
+
+    BackHandler.addEventListener('hardwareBackPress', handleHardwareBackPress);
+
+    return () => {
+      BackHandler.removeEventListener(
+        'hardwareBackPress',
+        handleHardwareBackPress,
+      );
+    };
   }, [openExample, handleBackPress]);
 
   const handleExampleCardPress = React.useCallback(
diff --git a/packages/rn-tester/js/components/RNTesterBookmark.js b/packages/rn-tester/js/components/RNTesterBookmark.js
deleted file mode 100644
index 62142bd8ad7026..00000000000000
--- a/packages/rn-tester/js/components/RNTesterBookmark.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-import * as React from 'react';
-import type {RNTesterExample} from '../types/RNTesterTypes';
-
-export type RNTesterBookmark = {
-  Components: {...},
-  Api: {...},
-  AddApi: (apiName: string, api: RNTesterExample) => mixed,
-  AddComponent: (componentName: string, component: RNTesterExample) => mixed,
-  RemoveApi: (apiName: string) => mixed,
-  RemoveComponent: (componentName: string) => mixed,
-  checkBookmark: (title: string, key: string) => mixed,
-};
-
-export const bookmarks: RNTesterBookmark = {
-  Components: {},
-  Api: {},
-  AddComponent: () => {},
-  RemoveComponent: () => {},
-  AddApi: () => {},
-  RemoveApi: () => {},
-  checkBookmark: () => {},
-};
-
-export const RNTesterBookmarkContext: React.Context<RNTesterBookmark> = React.createContext(
-  bookmarks,
-);
diff --git a/packages/rn-tester/js/components/RNTesterDocumentationURL.js b/packages/rn-tester/js/components/RNTesterDocumentationURL.js
index 8d6d8423591e81..0a8b20823fb860 100644
--- a/packages/rn-tester/js/components/RNTesterDocumentationURL.js
+++ b/packages/rn-tester/js/components/RNTesterDocumentationURL.js
@@ -5,15 +5,20 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
+ * @flow
  */
 
 'use strict';
 
-import React from 'react';
+import * as React from 'react';
 import {Image, StyleSheet, TouchableOpacity} from 'react-native';
 import openURLInBrowser from 'react-native/Libraries/Core/Devtools/openURLInBrowser';
 
-const RNTesterDocumentationURL = ({documentationURL}) => (
+type Props = $ReadOnly<{|
+  documentationURL: string,
+|}>;
+
+const RNTesterDocumentationURL = ({documentationURL}: Props): React.Node => (
   <TouchableOpacity
     style={styles.container}
     onPress={() => openURLInBrowser(documentationURL)}>
@@ -28,7 +33,6 @@ export default RNTesterDocumentationURL;
 
 const styles = StyleSheet.create({
   container: {
-    textDecorationLine: 'underline',
     position: 'absolute',
     bottom: 0,
     right: -15,
diff --git a/packages/rn-tester/js/components/RNTesterNavbar.js b/packages/rn-tester/js/components/RNTesterNavbar.js
index 1be08517c8b69d..24d703c00e4028 100644
--- a/packages/rn-tester/js/components/RNTesterNavbar.js
+++ b/packages/rn-tester/js/components/RNTesterNavbar.js
@@ -13,6 +13,86 @@ import {Text, View, StyleSheet, Image, Pressable} from 'react-native';
 
 import {RNTesterThemeContext} from './RNTesterTheme';
 
+const BookmarkTab = ({handleNavBarPress, isBookmarkActive, theme}) => (
+  <View style={styles.centerBox}>
+    <Image
+      style={styles.centralBoxCutout}
+      source={require('./../assets/bottom-nav-center-box.png')}
+    />
+    <View style={styles.floatContainer}>
+      <Pressable
+        testID="bookmarks-tab"
+        onPress={() => handleNavBarPress({screen: 'bookmarks'})}>
+        <View
+          style={[styles.floatingButton, {backgroundColor: theme.BorderColor}]}>
+          <Image
+            style={styles.bookmarkIcon}
+            source={
+              isBookmarkActive
+                ? require('../assets/bottom-nav-bookmark-fill.png')
+                : require('../assets/bottom-nav-bookmark-outline.png')
+            }
+          />
+        </View>
+      </Pressable>
+    </View>
+  </View>
+);
+
+const NavbarButton = ({
+  testID,
+  theme,
+  isActive,
+  activeImage,
+  inactiveImage,
+  label,
+  handlePress,
+  iconStyle,
+}) => (
+  <Pressable
+    testID={testID}
+    onPress={handlePress}
+    style={[styles.navButton, {backgroundColor: theme.BackgroundColor}]}>
+    <View
+      style={[styles.pressableContent, isActive ? styles.activeBar : null]}
+      collapsable={false}>
+      <Image
+        style={iconStyle}
+        source={isActive ? activeImage : inactiveImage}
+      />
+      <Text style={isActive ? styles.activeText : styles.inactiveText}>
+        {label}
+      </Text>
+    </View>
+  </Pressable>
+);
+
+const ComponentTab = ({isComponentActive, handleNavBarPress, theme}) => (
+  <NavbarButton
+    testID="components-tab"
+    label="Components"
+    handlePress={() => handleNavBarPress({screen: 'components'})}
+    activeImage={require('./../assets/bottom-nav-components-icon-active.png')}
+    inactiveImage={require('./../assets/bottom-nav-components-icon-inactive.png')}
+    isActive={isComponentActive}
+    theme={theme}
+    iconStyle={styles.componentIcon}
+  />
+);
+
+const APITab = ({isAPIActive, handleNavBarPress, theme}) => (
+  <NavbarButton
+    testID="apis-tab"
+    label="APIs"
+    handlePress={() => handleNavBarPress({screen: 'apis'})}
+    activeImage={require('./../assets/bottom-nav-apis-icon-active.png')}
+    inactiveImage={require('./../assets/bottom-nav-apis-icon-inactive.png')}
+    isActive={isAPIActive}
+    theme={theme}
+    iconStyle={styles.apiIcon}
+  />
+);
+
 type Props = $ReadOnly<{|
   handleNavBarPress: (data: {screen: string}) => void,
   screen: string,
@@ -33,84 +113,21 @@ const RNTesterNavbar = ({
   return (
     <View>
       <View style={styles.buttonContainer}>
-        <Pressable
-          testID="components-tab"
-          onPress={() => handleNavBarPress({screen: 'components'})}
-          style={[styles.navButton, {backgroundColor: theme.BackgroundColor}]}>
-          <View
-            style={[
-              styles.pressableContent,
-              isComponentActive ? styles.activeBar : null,
-            ]}
-            collapsable={false}>
-            <Image
-              style={styles.componentIcon}
-              source={
-                isComponentActive
-                  ? require('./../assets/bottom-nav-components-icon-active.png')
-                  : require('./../assets/bottom-nav-components-icon-inactive.png')
-              }
-            />
-            <Text
-              style={
-                isComponentActive ? styles.activeText : styles.inactiveText
-              }>
-              Components
-            </Text>
-          </View>
-        </Pressable>
-
-        <View style={styles.centerBox}>
-          <Image
-            style={styles.centralBoxCutout}
-            source={require('./../assets/bottom-nav-center-box.png')}
-          />
-
-          <View style={styles.floatContainer}>
-            <Pressable
-              testID="bookmarks-tab"
-              onPress={() => handleNavBarPress({screen: 'bookmarks'})}>
-              <View
-                style={[
-                  styles.floatingButton,
-                  {backgroundColor: theme.BorderColor},
-                ]}>
-                <Image
-                  style={styles.bookmarkIcon}
-                  source={
-                    isBookmarkActive
-                      ? require('../assets/bottom-nav-bookmark-fill.png')
-                      : require('../assets/bottom-nav-bookmark-outline.png')
-                  }
-                />
-              </View>
-            </Pressable>
-          </View>
-        </View>
-
-        <Pressable
-          testID="apis-tab"
-          onPress={() => handleNavBarPress({screen: 'apis'})}
-          style={[styles.navButton, {backgroundColor: theme.BackgroundColor}]}>
-          <View
-            style={[
-              styles.pressableContent,
-              isAPIActive ? styles.activeBar : null,
-            ]}
-            collapsable={false}>
-            <Image
-              style={styles.apiIcon}
-              source={
-                isAPIActive
-                  ? require('./../assets/bottom-nav-apis-icon-active.png')
-                  : require('./../assets/bottom-nav-apis-icon-inactive.png')
-              }
-            />
-            <Text style={isAPIActive ? styles.activeText : styles.inactiveText}>
-              APIs
-            </Text>
-          </View>
-        </Pressable>
+        <ComponentTab
+          isComponentActive={isComponentActive}
+          handleNavBarPress={handleNavBarPress}
+          theme={theme}
+        />
+        <BookmarkTab
+          isBookmarkActive={isBookmarkActive}
+          handleNavBarPress={handleNavBarPress}
+          theme={theme}
+        />
+        <APITab
+          isAPIActive={isAPIActive}
+          handleNavBarPress={handleNavBarPress}
+          theme={theme}
+        />
       </View>
     </View>
   );
diff --git a/packages/rn-tester/js/utils/testerStateUtils.js b/packages/rn-tester/js/utils/testerStateUtils.js
index 3286155b24a680..3dc729e25210e3 100644
--- a/packages/rn-tester/js/utils/testerStateUtils.js
+++ b/packages/rn-tester/js/utils/testerStateUtils.js
@@ -58,29 +58,33 @@ export const getExamplesListWithBookmarksAndRecentlyUsed = ({
     return null;
   }
 
-  const components = RNTesterList.ComponentExamples.map(c => ({
-    ...c,
-    isBookmarked: bookmarks.components.includes(c.key),
+  const components = RNTesterList.ComponentExamples.map(componentExample => ({
+    ...componentExample,
+    isBookmarked: bookmarks.components.includes(componentExample.key),
     exampleType: Screens.COMPONENTS,
   }));
 
   const recentlyUsedComponents = recentlyUsed.components
-    .map(k => components.find(c => c.key === k))
+    .map(recentComponentKey =>
+      components.find(component => component.key === recentComponentKey),
+    )
     .filter(Boolean);
 
-  const bookmarkedComponents = components.filter(c => c.isBookmarked);
+  const bookmarkedComponents = components.filter(
+    component => component.isBookmarked,
+  );
 
-  const apis = RNTesterList.APIExamples.map(c => ({
-    ...c,
-    isBookmarked: bookmarks.apis.includes(c.key),
+  const apis = RNTesterList.APIExamples.map(apiExample => ({
+    ...apiExample,
+    isBookmarked: bookmarks.apis.includes(apiExample.key),
     exampleType: Screens.APIS,
   }));
 
   const recentlyUsedAPIs = recentlyUsed.apis
-    .map(k => apis.find(c => c.key === k))
+    .map(recentAPIKey => apis.find(apiEample => apiEample.key === recentAPIKey))
     .filter(Boolean);
 
-  const bookmarkedAPIs = apis.filter(c => c.isBookmarked);
+  const bookmarkedAPIs = apis.filter(apiEample => apiEample.isBookmarked);
 
   const examplesList: ExamplesList = {
     [Screens.COMPONENTS]: [

From 64ac01dbbe36a9433c4c9dd5f8314bf3b90b2e54 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 24 Sep 2020 01:00:49 -0700
Subject: [PATCH 068/241] Prevent change of delegate in RCTUITextView

Summary:
Changelog: [internal]

# Problem

`[RCTUITextView setDelegate]` is a public method and if something changes the delegate, appropriate events won't be called on the component (onTextChange, onSelectionChange and the others).

# Solution

Prevent setting of delegate from outside of the class. Ideally we would want to hide `setDelegate` altogether but that would require a rewrite of `RCTUITextView`.

Reviewed By: JoshuaGross, shergin

Differential Revision: D23813095

fbshipit-source-id: 8b76ac86727d262d0f9b81adfc8e75157847284c
---
 Libraries/Text/TextInput/Multiline/RCTUITextView.m | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index 88d3183f4df345..a949f1d73b103f 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -60,6 +60,15 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
+- (void)setDelegate:(id<UITextViewDelegate>)delegate {
+  // Delegate is set inside `[RCTBackedTextViewDelegateAdapter initWithTextView]` and
+  // it cannot be changed from outside.
+  if (super.delegate) {
+    return;
+  }
+  [super setDelegate:delegate];
+}
+
 #pragma mark - Accessibility
 
 - (void)setIsAccessibilityElement:(BOOL)isAccessibilityElement

From c907202d2b5986744d69efeb7c5e4f40ed6df631 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 24 Sep 2020 01:01:03 -0700
Subject: [PATCH 069/241] Fix touch handling in bridged paper components

Summary:
Changelog: [internal]

If view was bridged from Paper, hit testing would return Paper view which doesn't have reference to Fabric's event emitter.
To fix this, if the bridged view is returned from hit testing, it is swapped with interop view which has reference to event emitter.

Reviewed By: shergin

Differential Revision: D23840054

fbshipit-source-id: d4aa4ee8da4e1da80d2e2b69b79ed82d726f04e3
---
 .../RCTLegacyViewManagerInteropComponentView.mm       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm
index 8c9a97ce6aa2ab..3262418b17832c 100644
--- a/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/LegacyViewManagerInterop/RCTLegacyViewManagerInteropComponentView.mm
@@ -37,6 +37,17 @@ - (instancetype)initWithFrame:(CGRect)frame
   return self;
 }
 
+- (UIView *)hitTest:(CGPoint)point withEvent:(UIEvent *)event
+{
+  UIView *result = [super hitTest:point withEvent:event];
+
+  if (result == _adapter.paperView) {
+    return self;
+  }
+
+  return result;
+}
+
 + (NSMutableSet<NSString *> *)supportedViewManagers
 {
   static NSMutableSet<NSString *> *supported = [NSMutableSet setWithObjects:@"Picker",

From 77c16578bf0a143134bf9dc9f0f0cb171c9b5c8b Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Thu, 24 Sep 2020 09:41:50 -0700
Subject: [PATCH 070/241] TurboModule Android: add dependency on ReactAndroid
 codegen output to RNTester

Summary:
This adds shared libraries dependencies to RNTester so that it can call `ReactAndroidSpec_ReactAndroidSpec_ModuleProvider()` C++ lookup function. That function is generated by the react-native-codegen during build time. This does not make RNTester use TurboModule yet, just the necessary setup to link the C++ libs together.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23901952

fbshipit-source-id: fd5ee0ca266609207962adc5ceaf814956052eec
---
 packages/rn-tester/android/app/build.gradle   | 12 +++-
 .../android/app/src/main/jni/Android.mk       | 63 +++++++++++++++----
 .../main/jni/RNTesterAppModuleProvider.cpp    |  6 +-
 .../src/main/jni/RNTesterAppModuleProvider.h  |  4 +-
 .../main/jni/RNTesterTurboModuleDelegate.cpp  | 18 ++++++
 5 files changed, 88 insertions(+), 15 deletions(-)
 create mode 100644 packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp

diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index 04d36897dc593b..fca59e9f336387 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -186,6 +186,8 @@ android {
 }
 
 if (enableCodegen) {
+    def reactAndroidProjectDir = project(':ReactAndroid').projectDir;
+    def reactAndroidBuildDir = project(':ReactAndroid').buildDir;
     android {
         defaultConfig {
             externalNativeBuild {
@@ -193,7 +195,15 @@ if (enableCodegen) {
                     abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a"
                     arguments "APP_PLATFORM=android-16",
                             "APP_STL=c++_shared",
-                            "NDK_TOOLCHAIN_VERSION=clang"
+                            "NDK_TOOLCHAIN_VERSION=clang",
+                            // The following paths assume building React Native from source.
+                            // TODO: Find a better way without pointing to ReactAndroid/build dir.
+                            "REACT_ANDROID_SRC_DIR=$reactAndroidProjectDir/src/main",
+                            "REACT_COMMON_DIR=$rootDir/ReactCommon",
+                            "REACT_GENERATED_SRC_DIR=$reactAndroidBuildDir/generated/source",
+                            "REACT_NDK_EXPORT_DIR=$reactAndroidBuildDir/tmp/buildReactNdkLib/local",
+                            "FIRST_PARTY_NDK_DIR=$reactAndroidProjectDir/src/main/jni/first-party",
+                            "THIRD_PARTY_NDK_DIR=$reactAndroidBuildDir/third-party-ndk"
                     cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
                     cppFlags "-std=c++1y"
                     targets "rntester_appmodules"
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index c5c26f6e1da7e9..c293cb24e8ef8b 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -5,25 +5,66 @@
 
 LOCAL_PATH := $(call my-dir)
 
-include $(CLEAR_VARS)
+#############################################
+# Prebuilt libraries off ReactAndroid build #
+#############################################
 
-LOCAL_MODULE := rntester_appmodules
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_nativemodule_core
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_core.so
+# TODO: These needs to be synced with the other Android.mk files -- not efficient.
+# Note: By doing this, it delegates all header includes lookup to this .so.
+LOCAL_EXPORT_C_INCLUDES := \
+  $(FIRST_PARTY_NDK_DIR)/fbjni/headers \
+  $(REACT_ANDROID_SRC_DIR)/jni \
+  $(REACT_COMMON_DIR)/callinvoker \
+  $(REACT_COMMON_DIR)/jsi \
+  $(REACT_COMMON_DIR)/react/nativemodule/core \
+  $(REACT_COMMON_DIR)/react/nativemodule/core/platform/android \
+  $(REACT_GENERATED_SRC_DIR)/codegen/jni \
+  $(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \
+  $(THIRD_PARTY_NDK_DIR)/double-conversion \
+  $(THIRD_PARTY_NDK_DIR)/folly \
+  $(THIRD_PARTY_NDK_DIR)/glog/exported
+# Note: Sync with folly/Android.mk.
+FOLLY_FLAGS := \
+  -DFOLLY_NO_CONFIG=1 \
+  -DFOLLY_HAVE_CLOCK_GETTIME=1 \
+  -DFOLLY_HAVE_MEMRCHR=1 \
+  -DFOLLY_USE_LIBCPP=1 \
+  -DFOLLY_MOBILE=1 \
+  -DFOLLY_HAVE_XSI_STRERROR_R=1
+LOCAL_CFLAGS += $(FOLLY_FLAGS)
+LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
+include $(PREBUILT_SHARED_LIBRARY)
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_nativemodule_manager
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_manager.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/turbomodule/core/jni
+include $(PREBUILT_SHARED_LIBRARY)
 
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_codegen_reactandroidspec
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_codegen_reactandroidspec.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_GENERATED_SRC_DIR)/codegen/jni
+include $(PREBUILT_SHARED_LIBRARY)
 
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-# TODO
-# LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core libreactnativejni
 
-# TODO
-# LOCAL_STATIC_LIBRARIES := libjsi
+####################################
+# RNTester app specific definition #
+####################################
 
+include $(CLEAR_VARS)
+LOCAL_MODULE := rntester_appmodules
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core libreact_nativemodule_manager libreact_codegen_reactandroidspec
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
-
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
-
 include $(BUILD_SHARED_LIBRARY)
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
index 7a6e281f1020a2..076da3a0f279ef 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
@@ -7,11 +7,13 @@
 
 #include "RNTesterAppModuleProvider.h"
 
+#include <ReactAndroidSpec.h>
+
 namespace facebook {
 namespace react {
 
-std::shared_ptr<void> RNTesterAppModuleProvider(const std::string moduleName) {
-  return nullptr;
+std::shared_ptr<TurboModule> RNTesterAppModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
+  return ReactAndroidSpec_ModuleProvider(moduleName, params);
 }
 
 } // namespace react
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h
index 50a7e16fd96463..1bdc8477ed5ac9 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.h
@@ -10,10 +10,12 @@
 #include <memory>
 #include <string>
 
+#include <ReactCommon/JavaTurboModule.h>
+
 namespace facebook {
 namespace react {
 
-std::shared_ptr<void> RNTesterAppModuleProvider(const std::string moduleName);
+std::shared_ptr<TurboModule> RNTesterAppModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params);
 
 } // namespace react
 } // namespace facebook
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp
new file mode 100644
index 00000000000000..3d9aef61937c83
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp
@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fbjni/fbjni.h>
+
+#include <ReactCommon/TurboModuleManagerDelegate.h>
+
+namespace facebook {
+namespace react {
+
+// TODO: Implement the app specific TurboModuleDelegate subclass.
+
+} // namespace react
+} // namespace facebook

From 371430d7eb5b7a07326f6f5872deb84ffc0d1686 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 24 Sep 2020 09:43:52 -0700
Subject: [PATCH 071/241] Fix rounding in Slider component

Summary:
Changelog: [Internal]

There was a typo in condition. We need to be comparing step prop and not value. The same condition is implemented in Paper.

Reviewed By: JoshuaGross

Differential Revision: D23903493

fbshipit-source-id: 37506d0fac63f624332041602489ab1cf378bfcc
---
 .../Mounting/ComponentViews/Slider/RCTSliderComponentView.mm    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
index abc29605cf4582..26375050f8edff 100644
--- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
@@ -300,7 +300,7 @@ - (void)onChange:(UISlider *)sender withContinuous:(BOOL)continuous
 
   const auto &props = *std::static_pointer_cast<const SliderProps>(_props);
 
-  if (props.step > 0 && value <= (props.maximumValue - props.minimumValue)) {
+  if (props.step > 0 && props.step <= (props.maximumValue - props.minimumValue)) {
     value = MAX(
         props.minimumValue,
         MIN(props.maximumValue, props.minimumValue + round((value - props.minimumValue) / props.step) * props.step));

From 663b5a878be9faafd13b41c222a1bc2ac7bb3a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Chmiela?=
 <sjchmiela@users.noreply.github.com>
Date: Thu, 24 Sep 2020 10:33:55 -0700
Subject: [PATCH 072/241] Do not override decoders to RCTImageLoader (#29711)

Summary:
I (actually, [we](https://github.com/expo/expo/issues/9858)) noticed GIFs are no longer animating in Expo client after [enabling TurboModules](https://github.com/expo/expo/pull/9687).

## Changelog

[iOS] [Fixed] - Fix `RCTImageLoader` not using decoders provided.

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

Pull Request resolved: https://github.com/facebook/react-native/pull/29711

Test Plan:
![cat](https://user-images.githubusercontent.com/1151041/90775800-90112c00-e2f9-11ea-95cd-ab95a97068f4.gif)

The cat is moving! Before applying this commit `RCTGIFDecoder` provided in the initalizer is removed from the `_decoders` array in the

```objc
_decoders = [_bridge modulesConformingToProtocol:protocol(RCTImageDataDecoder)];
```

Also, compare

https://github.com/facebook/react-native/blob/8f306cd66a8bc6054ee13701f02329ab5817b69a/Libraries/Image/RCTImageLoader.mm#L243-L250

and

https://github.com/facebook/react-native/blob/8f306cd66a8bc6054ee13701f02329ab5817b69a/Libraries/Image/RCTImageLoader.mm#L177-L184

This PR makes `_decoders` behave the same as `_loaders`.

Reviewed By: PeteTheHeat

Differential Revision: D23908238

Pulled By: fkgozali

fbshipit-source-id: 1d7a6e0d180277f23d8c28916734713bc1833b8b
---
 Libraries/Image/RCTImageLoader.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Image/RCTImageLoader.mm b/Libraries/Image/RCTImageLoader.mm
index 875c6c58dd2b04..0ea5a4a0c988f9 100644
--- a/Libraries/Image/RCTImageLoader.mm
+++ b/Libraries/Image/RCTImageLoader.mm
@@ -247,7 +247,7 @@ - (void)setImageCache:(id<RCTImageCache>)cache
       _decoders = [_bridge modulesConformingToProtocol:@protocol(RCTImageDataDecoder)];
     }
 
-    _decoders = [[_bridge modulesConformingToProtocol:@protocol(RCTImageDataDecoder)] sortedArrayUsingComparator:^NSComparisonResult(id<RCTImageDataDecoder> a, id<RCTImageDataDecoder> b) {
+    _decoders = [_decoders sortedArrayUsingComparator:^NSComparisonResult(id<RCTImageDataDecoder> a, id<RCTImageDataDecoder> b) {
       float priorityA = [a respondsToSelector:@selector(decoderPriority)] ? [a decoderPriority] : 0;
       float priorityB = [b respondsToSelector:@selector(decoderPriority)] ? [b decoderPriority] : 0;
       if (priorityA > priorityB) {

From d5f76226111bc71d45f20b9d0c849006cc6aca1c Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 24 Sep 2020 10:36:21 -0700
Subject: [PATCH 073/241] Fix rounding issue when setting padding

Summary:
Changelog: [Internal]

Padding needs to be rounded down (floor function), not rounded to the closest natural number.
Otherwise the content of the view might not fit.

Reviewed By: JoshuaGross

Differential Revision: D23905145

fbshipit-source-id: e84d70155b207144b98646dd0c4fea7a8c4bd876
---
 .../main/java/com/facebook/react/fabric/jni/Binding.cpp   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
index 390166bfd7f716..134c1c5de27daf 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/jni/Binding.cpp
@@ -442,10 +442,10 @@ local_ref<JMountItem::javaobject> createUpdatePaddingMountItem(
   auto pointScaleFactor = layoutMetrics.pointScaleFactor;
   auto contentInsets = layoutMetrics.contentInsets;
 
-  int left = round(contentInsets.left * pointScaleFactor);
-  int top = round(contentInsets.top * pointScaleFactor);
-  int right = round(contentInsets.right * pointScaleFactor);
-  int bottom = round(contentInsets.bottom * pointScaleFactor);
+  int left = floor(contentInsets.left * pointScaleFactor);
+  int top = floor(contentInsets.top * pointScaleFactor);
+  int right = floor(contentInsets.right * pointScaleFactor);
+  int bottom = floor(contentInsets.bottom * pointScaleFactor);
 
   return updatePaddingInstruction(
       javaUIManager, newChildShadowView.tag, left, top, right, bottom);

From 9f00752a97db3fe0b03cb412c5357eeebc3e2b16 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 24 Sep 2020 11:57:06 -0700
Subject: [PATCH 074/241] LayoutAnimations: force props to update when
 executing "final" mutations

Summary:
When an animation is completed or a conflicting animation is detected, force props, state, layout, etc to update.

Currently, when a final animation mutation is queued, some attributes can be updated but not others, causing unexpected visual glitches at least on Android.

Some of these are arguably component bugs, but it's easier to just flush all attributes by tricking the platforms into updating all attributes. This will also prevent us from having to track down more of these bugs, potentially.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23886519

fbshipit-source-id: 8e5081bbe3b7843c16c0f283fa07fdec0e211aa8
---
 .../renderer/animations/LayoutAnimationDriver.cpp     |  9 +++++++--
 .../animations/LayoutAnimationKeyFrameManager.cpp     | 11 ++++++++++-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
index c9f5b13ab0c200..d6b46c68a01207 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationDriver.cpp
@@ -203,10 +203,15 @@ void LayoutAnimationDriver::animationMutationsForFrame(
 
           // Copy so that if something else mutates the inflight animations, it
           // won't change this mutation after this point.
+          ShadowView oldShadowView{};
+          if (finalMutationForKeyFrame.type !=
+              ShadowViewMutation::Type::Update) {
+            oldShadowView = finalMutationForKeyFrame.oldChildShadowView;
+          }
           mutationsList.push_back(
               ShadowViewMutation{finalMutationForKeyFrame.type,
                                  finalMutationForKeyFrame.parentShadowView,
-                                 finalMutationForKeyFrame.oldChildShadowView,
+                                 oldShadowView,
                                  finalMutationForKeyFrame.newChildShadowView,
                                  finalMutationForKeyFrame.index});
         } else {
@@ -217,7 +222,7 @@ void LayoutAnimationDriver::animationMutationsForFrame(
           mutationsList.push_back(
               ShadowViewMutation{ShadowViewMutation::Type::Update,
                                  keyframe.parentView,
-                                 keyframe.viewStart,
+                                 {},
                                  keyframe.viewEnd,
                                  -1});
         }
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
index 08fbe459d7a633..4264be5d3c613b 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -1212,7 +1212,16 @@ LayoutAnimationKeyFrameManager::pullTransaction(
         auto &keyFrame = std::get<0>(conflictingKeyframeTuple);
         if (keyFrame.finalMutationForKeyFrame.hasValue()) {
           auto &mutation = *keyFrame.finalMutationForKeyFrame;
-          finalConflictingMutations.push_back(mutation);
+          if (mutation.type == ShadowViewMutation::Type::Update) {
+            finalConflictingMutations.push_back(
+                ShadowViewMutation::UpdateMutation(
+                    mutation.parentShadowView,
+                    {},
+                    mutation.newChildShadowView,
+                    mutation.index));
+          } else {
+            finalConflictingMutations.push_back(mutation);
+          }
         }
       }
 

From abff021261bdb9febb40dbd21eb08eab33ec9cfe Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Thu, 24 Sep 2020 15:21:39 -0700
Subject: [PATCH 075/241] TurboModule Android: compile codegen C++ output into
 librntester_appmodules.so

Summary:
The react-native-codegen provides Android.mk in the Android C++ output, but for RNTester (or hosting apps), we should just compile the codegen output with the rest of the app-specific C++ files. This is to simplify the build configuration, and also to not add too many additional .so libs to the APK.

With this commit, `RNTesterAppModuleProvider.cpp` should be "complete" for RNTester use-case. This TurboModule lookup function is the one described in https://github.com/react-native-community/discussions-and-proposals/issues/273.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23913149

fbshipit-source-id: d1ca136787b87a0e8e6504318e1f0a78efef46ea
---
 packages/rn-tester/android/app/build.gradle                | 1 +
 packages/rn-tester/android/app/src/main/jni/Android.mk     | 7 ++++---
 .../android/app/src/main/jni/RNTesterAppModuleProvider.cpp | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index fca59e9f336387..dbf6b8a38b0329 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -198,6 +198,7 @@ if (enableCodegen) {
                             "NDK_TOOLCHAIN_VERSION=clang",
                             // The following paths assume building React Native from source.
                             // TODO: Find a better way without pointing to ReactAndroid/build dir.
+                            "GENERATED_SRC_DIR=$buildDir/generated/source",
                             "REACT_ANDROID_SRC_DIR=$reactAndroidProjectDir/src/main",
                             "REACT_COMMON_DIR=$rootDir/ReactCommon",
                             "REACT_GENERATED_SRC_DIR=$reactAndroidBuildDir/generated/source",
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index c293cb24e8ef8b..36783dc2e52bda 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -60,9 +60,10 @@ include $(PREBUILT_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := rntester_appmodules
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
-LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp)
-LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+# Note: Build the react-native-codegen output along with other app-specific C++ files.
+LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core libreact_nativemodule_manager libreact_codegen_reactandroidspec
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
index 076da3a0f279ef..d16c9e6dee85d1 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
@@ -7,12 +7,17 @@
 
 #include "RNTesterAppModuleProvider.h"
 
+#include <PackagesRnTesterAndroidAppSpec.h>
 #include <ReactAndroidSpec.h>
 
 namespace facebook {
 namespace react {
 
 std::shared_ptr<TurboModule> RNTesterAppModuleProvider(const std::string moduleName, const JavaTurboModule::InitParams &params) {
+  auto module = PackagesRnTesterAndroidAppSpec_ModuleProvider(moduleName, params);
+  if (module != nullptr) {
+    return module;
+  }
   return ReactAndroidSpec_ModuleProvider(moduleName, params);
 }
 

From c2447d3f764275ef04a0f5c17956b834ee8b046d Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@fb.com>
Date: Fri, 25 Sep 2020 05:31:53 -0700
Subject: [PATCH 076/241] Follow-up for fixing xiaomi NullPointer crash

Summary:
This is a follow-up for fixing the xiaomi NullPointer crash (D23331828 (https://github.com/facebook/react-native/commit/07a597ad185c8c31ac38bdd4d022b0b880d02859) D23451929 (https://github.com/facebook/react-native/commit/b5b4a7041027fd767850a564b5d80fa4a98ba2a2)):

1, Clean up previous temporary fix in js.

2, Cover all cases including caretHidden is set and isn't set, in previous fix if caretHidden isn't set then fix won't be executed.

Changelog: [Internal]

Reviewed By: makovkastar

Differential Revision: D23816541

fbshipit-source-id: a7543f6767430abb74141a747b08391986662958
---
 .../textinput/ReactTextInputManager.java      | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index 9b18a940d217e4..a8894676574b81 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -477,21 +477,17 @@ public void setCursorColor(ReactEditText view, @Nullable Integer color) {
     }
   }
 
+  private static boolean shouldHideCursorForEmailTextInput() {
+    String manufacturer = Build.MANUFACTURER.toLowerCase();
+    return (Build.VERSION.SDK_INT == Build.VERSION_CODES.Q && manufacturer.contains("xiaomi"));
+  }
+
   @ReactProp(name = "caretHidden", defaultBoolean = false)
   public void setCaretHidden(ReactEditText view, boolean caretHidden) {
-    // Set cursor's visibility to False to fix a crash on some Xiaomi devices with Android Q. This
-    // crash happens when focusing on a email EditText, during which a prompt will be triggered but
-    // the system fail to locate it properly. Here is an example post discussing about this
-    // issue: https://github.com/facebook/react-native/issues/27204
-    String manufacturer = Build.MANUFACTURER.toLowerCase();
-    if ((view.getInputType() == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
-            || view.getInputType() == InputType.TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS)
-        && Build.VERSION.SDK_INT == Build.VERSION_CODES.Q
-        && manufacturer.contains("xiaomi")) {
-      view.setCursorVisible(false);
+    if (view.getStagedInputType() == InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS
+        && shouldHideCursorForEmailTextInput()) {
       return;
     }
-
     view.setCursorVisible(!caretHidden);
   }
 
@@ -763,6 +759,15 @@ public void setKeyboardType(ReactEditText view, @Nullable String keyboardType) {
       flagsToSet = INPUT_TYPE_KEYBOARD_DECIMAL_PAD;
     } else if (KEYBOARD_TYPE_EMAIL_ADDRESS.equalsIgnoreCase(keyboardType)) {
       flagsToSet = InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS | InputType.TYPE_CLASS_TEXT;
+
+      // Set cursor's visibility to False to fix a crash on some Xiaomi devices with Android Q. This
+      // crash happens when focusing on a email EditText, during which a prompt will be triggered
+      // but
+      // the system fail to locate it properly. Here is an example post discussing about this
+      // issue: https://github.com/facebook/react-native/issues/27204
+      if (shouldHideCursorForEmailTextInput()) {
+        view.setCursorVisible(false);
+      }
     } else if (KEYBOARD_TYPE_PHONE_PAD.equalsIgnoreCase(keyboardType)) {
       flagsToSet = InputType.TYPE_CLASS_PHONE;
     } else if (KEYBOARD_TYPE_VISIBLE_PASSWORD.equalsIgnoreCase(keyboardType)) {

From c015f485c21057505cfb701a725d782d0b2fa220 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Fri, 25 Sep 2020 11:34:54 -0700
Subject: [PATCH 077/241] Workaround for Date Picker in iOS14

Summary:
iOS14 has introduced new styles for date picker. The default new calendar style breaks the old spinner type style.

This is a workaround to keep the spinner style as a default, until the calendar style is properly supported. According to [this github comment](https://github.com/react-native-community/datetimepicker/issues/285) it works well.

This will fix DatePicker for both Fabric and Paper, since Fabric uses the interop layer to render it.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23935328

fbshipit-source-id: 1a7fadba274e0537f0ac4ced60e23e7c809d57dc
---
 React/Views/RCTDatePicker.m | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/React/Views/RCTDatePicker.m b/React/Views/RCTDatePicker.m
index 1a921c556a0918..3ba934d152c4c9 100644
--- a/React/Views/RCTDatePicker.m
+++ b/React/Views/RCTDatePicker.m
@@ -24,6 +24,10 @@ - (instancetype)initWithFrame:(CGRect)frame
   if ((self = [super initWithFrame:frame])) {
     [self addTarget:self action:@selector(didChange) forControlEvents:UIControlEventValueChanged];
     _reactMinuteInterval = 1;
+
+    if (@available(iOS 14, *)) {
+      self.preferredDatePickerStyle = UIDatePickerStyleWheels;
+    }
   }
   return self;
 }

From e2fd9d4f22cda85c995c38875fc3a2a20a198c4a Mon Sep 17 00:00:00 2001
From: Paige Sun <paigesun@fb.com>
Date: Fri, 25 Sep 2020 15:53:40 -0700
Subject: [PATCH 078/241] Group accessible views using the view hierarchy

Summary: In iOS when a parent UIView returns YES on [shouldGroupAccessibilityChildren](https://developer.apple.com/documentation/objectivec/nsobject/1615143-shouldgroupaccessibilitychildren), VoiceOver groups together the accessible children of the parent view, regardless of their position on screen. In iOS this defaults to NO.

Reviewed By: sammy-SC

Differential Revision: D23844265

fbshipit-source-id: eb99bf0873ccfd9fb196f8f7b6eafe055f6ae810
---
 .../Mounting/ComponentViews/View/RCTViewComponentView.mm     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 5e3b33d9a00ba5..428d8bc630e1b0 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -569,6 +569,11 @@ - (NSString *)accessibilityValue
 
 #pragma mark - Accessibility Events
 
+- (BOOL)shouldGroupAccessibilityChildren
+{
+  return YES;
+}
+
 - (NSArray<UIAccessibilityCustomAction *> *)accessibilityCustomActions
 {
   auto const &accessibilityActions = _props->accessibilityActions;

From 920bd2c199be6838aa0d106590a899b327f750d3 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Fri, 25 Sep 2020 17:25:58 -0700
Subject: [PATCH 079/241] Fabric: Fixed crash in `colorComponentsFromColor()`

Summary:
This fixes a recently introduced crash in `colorComponentsFromColor()` (iOS implementation) caused by dereferencing a null pointer.

The fix is just a copy of a code fragment from a previous implementation.

Reviewed By: fkgozali

Differential Revision: D23944812

fbshipit-source-id: 977135dd75c4375affddfd75183e4890618ae819
---
 ReactCommon/react/renderer/graphics/platform/ios/Color.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp b/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
index 0b114759cb1aa0..c1023384cac7bd 100644
--- a/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
+++ b/ReactCommon/react/renderer/graphics/platform/ios/Color.cpp
@@ -21,6 +21,12 @@ SharedColor colorFromComponents(ColorComponents components) {
 }
 
 ColorComponents colorComponentsFromColor(SharedColor sharedColor) {
+  if (!sharedColor) {
+    // Empty color object can be considered as `clear` (black, fully
+    // transparent) color.
+    return ColorComponents{0, 0, 0, 0};
+  }
+
   float ratio = 256;
   Color color = *sharedColor;
   return ColorComponents{(float)((color >> 16) & 0xff) / ratio,

From 1438543a2fe274b6c21fc744e8ddeabd2261bdbf Mon Sep 17 00:00:00 2001
From: "Michael Yoon (LAX)" <mikeyoon@fb.com>
Date: Fri, 25 Sep 2020 19:04:29 -0700
Subject: [PATCH 080/241] round up layoutWidth for Android 11 in
 ReactTextShadowNode

Summary:
in Android 11, there's an issue where Text content is being clipped. The root cause appears to be a breaking change in how Android 11 is measuring text. rounding up the layoutWidth calculation mitigates the issue.

Changelog: [Internal]

Reviewed By: JoshuaGross

Differential Revision: D23944772

fbshipit-source-id: 1639259da1c2c507c6bfc80fed377577316febac
---
 .../com/facebook/react/views/text/ReactTextShadowNode.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
index ac84caae1e07d9..5dbd0796e53363 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java
@@ -144,6 +144,9 @@ public long measure(
             }
           }
 
+          if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.Q) {
+            layoutWidth = (float) Math.ceil(layoutWidth);
+          }
           float layoutHeight = height;
           if (heightMode != YogaMeasureMode.EXACTLY) {
             layoutHeight = layout.getLineBottom(lineCount - 1);

From 14042fb76fee3573529d590ec6f8ad216aa0b820 Mon Sep 17 00:00:00 2001
From: Rob Walker <rob@papertrail.io>
Date: Fri, 25 Sep 2020 19:19:51 -0700
Subject: [PATCH 081/241] Don't crash when promise task is cancelled before its
 resolved (#29969)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
This pull request fixes a potential `TypeError` in TaskQueue.js, that happens if a promise is added to the task queue, which is cancelled between the promise starting and resolving.

The exact error this resolves is
```js
TypeError: TaskQueue: Error resolving Promise in task gen1: Cannot set property ‘popable’ of undefined
      167 |           queueStackSize: this._queueStack.length,
      168 |         });
    > 169 |       this._queueStack[stackIdx].popable = true;
          |                                              ^
      170 |       this.hasTasksToProcess() && this._onMoreTasks();
      171 |     })
      172 |     .catch(ex => {
      at Libraries/Interaction/TaskQueue.js:169:46
```

This specific error was also reported in https://github.com/facebook/react-native/issues/16321

## Changelog

[General] [Fixed] - Prevent TypeError in TaskQueue when cancelling a started but not resolved promise.

Pull Request resolved: https://github.com/facebook/react-native/pull/29969

Test Plan:
The added test demonstrates the error, if run without the fixed applied to TaskQueue.js.
This is a race condition error, so is difficult to replicate!

Reviewed By: yungsters

Differential Revision: D23785972

Pulled By: appden

fbshipit-source-id: ddb8d06b37d296ee934ff39815cf5c9026d73871
---
 Libraries/Interaction/TaskQueue.js               |  3 ++-
 .../Interaction/__tests__/TaskQueue-test.js      | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Libraries/Interaction/TaskQueue.js b/Libraries/Interaction/TaskQueue.js
index 965953f64fb8d0..3fad71ae0a0d7c 100644
--- a/Libraries/Interaction/TaskQueue.js
+++ b/Libraries/Interaction/TaskQueue.js
@@ -156,6 +156,7 @@ class TaskQueue {
     // happens once it is fully processed.
     this._queueStack.push({tasks: [], popable: false});
     const stackIdx = this._queueStack.length - 1;
+    const stackItem = this._queueStack[stackIdx];
     DEBUG && infoLog('TaskQueue: push new queue: ', {stackIdx});
     DEBUG && infoLog('TaskQueue: exec gen task ' + task.name);
     task
@@ -166,7 +167,7 @@ class TaskQueue {
             stackIdx,
             queueStackSize: this._queueStack.length,
           });
-        this._queueStack[stackIdx].popable = true;
+        stackItem.popable = true;
         this.hasTasksToProcess() && this._onMoreTasks();
       })
       .catch(ex => {
diff --git a/Libraries/Interaction/__tests__/TaskQueue-test.js b/Libraries/Interaction/__tests__/TaskQueue-test.js
index 5055fa2dde853b..aeed06ca0aeae6 100644
--- a/Libraries/Interaction/__tests__/TaskQueue-test.js
+++ b/Libraries/Interaction/__tests__/TaskQueue-test.js
@@ -150,4 +150,20 @@ describe('TaskQueue', () => {
     expect(task1).not.toBeCalled();
     expect(taskQueue.hasTasksToProcess()).toBe(false);
   });
+
+  it('should not crash when task is cancelled between being started and resolved', () => {
+    const task1 = jest.fn(() => {
+      return new Promise(resolve => {
+        setTimeout(() => {
+          resolve();
+        }, 1);
+      });
+    });
+
+    taskQueue.enqueue({gen: task1, name: 'gen1'});
+    taskQueue.processNext();
+    taskQueue.cancelTasks([task1]);
+
+    jest.runAllTimers();
+  });
 });

From 45a4a67965b09fcf7d7b6ccb98cb7d37812244ea Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 25 Sep 2020 22:12:29 -0700
Subject: [PATCH 082/241] Android: consolidate various prebuilt C++ .so
 configuration into Android-prebuilt.mk

Summary:
To make it easier for hosting app or other lib to get access to the ReactAndroidNdk .so outputs, let's define common targets in a dedicated Android-prebuilt.mk. Hosting app's Android.mk just need to include the mk path.

Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D23938538

fbshipit-source-id: 850d690326d134212d5f040c6fa54ab50c53cb87
---
 ReactAndroid/Android-prebuilt.mk              | 94 +++++++++++++++++++
 packages/rn-tester/android/app/build.gradle   |  9 +-
 .../android/app/src/main/jni/Android.mk       | 57 +----------
 3 files changed, 99 insertions(+), 61 deletions(-)
 create mode 100644 ReactAndroid/Android-prebuilt.mk

diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
new file mode 100644
index 00000000000000..338d8def835e22
--- /dev/null
+++ b/ReactAndroid/Android-prebuilt.mk
@@ -0,0 +1,94 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+# This configuration provides access to most common React Native prebuilt .so files
+# to avoid recompiling each of the libraries outside of ReactAndroid NDK compilation.
+# Hosting app's/library's Android.mk can include this Android-prebuilt.mk file to
+# get access to those .so to depend on.
+# NOTES:
+# * Currently, it assumes building React Native from source.
+# * Not every .so is listed here (yet).
+# * Static libs are not covered here (yet).
+
+LOCAL_PATH := $(call my-dir)
+
+REACT_ANDROID_DIR := $(LOCAL_PATH)
+# TODO: Find a better way without pointing to ReactAndroid/build dir.
+REACT_ANDROID_BUILD_DIR := $(REACT_ANDROID_DIR)/build
+
+FIRST_PARTY_NDK_DIR := $(REACT_ANDROID_DIR)/src/main/jni/first-party
+THIRD_PARTY_NDK_DIR := $(REACT_ANDROID_BUILD_DIR)/third-party-ndk
+REACT_ANDROID_SRC_DIR := $(REACT_ANDROID_DIR)/src/main
+REACT_COMMON_DIR := $(REACT_ANDROID_DIR)/../ReactCommon
+REACT_GENERATED_SRC_DIR := $(REACT_ANDROID_BUILD_DIR)/generated/source
+# Note: this only have .so, not .a
+REACT_NDK_EXPORT_DIR := $(REACT_ANDROID_BUILD_DIR)/react-ndk/exported
+
+# fb
+include $(CLEAR_VARS)
+LOCAL_MODULE := fb
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfb.so
+LOCAL_EXPORT_C_INCLUDES := $(FIRST_PARTY_NDK_DIR)/fb/include
+include $(PREBUILT_SHARED_LIBRARY)
+
+# folly_json
+include $(CLEAR_VARS)
+LOCAL_MODULE := folly_json
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_json.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \
+  $(THIRD_PARTY_NDK_DIR)/double-conversion \
+  $(THIRD_PARTY_NDK_DIR)/folly \
+  $(THIRD_PARTY_NDK_DIR)/glog/exported
+# Note: Sync with folly/Android.mk.
+FOLLY_FLAGS := \
+  -DFOLLY_NO_CONFIG=1 \
+  -DFOLLY_HAVE_CLOCK_GETTIME=1 \
+  -DFOLLY_HAVE_MEMRCHR=1 \
+  -DFOLLY_USE_LIBCPP=1 \
+  -DFOLLY_MOBILE=1 \
+  -DFOLLY_HAVE_XSI_STRERROR_R=1
+LOCAL_CFLAGS += $(FOLLY_FLAGS)
+LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
+include $(PREBUILT_SHARED_LIBRARY)
+
+# folly_futures
+include $(CLEAR_VARS)
+LOCAL_MODULE := folly_futures
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libfolly_futures.so
+LOCAL_SHARED_LIBRARIES := liblibfolly_json
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_nativemodule_core
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_nativemodule_core
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_core.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_ANDROID_SRC_DIR)/jni \
+  $(REACT_COMMON_DIR)/callinvoker \
+  $(REACT_COMMON_DIR)/jsi \
+  $(REACT_COMMON_DIR)/react/nativemodule/core \
+  $(REACT_COMMON_DIR)/react/nativemodule/core/platform/android
+LOCAL_SHARED_LIBRARIES := libfolly_json
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_nativemodule_manager
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_nativemodule_manager
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_manager.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/turbomodule/core/jni
+include $(PREBUILT_SHARED_LIBRARY)
+
+# react_codegen_reactandroidspec
+include $(CLEAR_VARS)
+LOCAL_MODULE := react_codegen_reactandroidspec
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_codegen_reactandroidspec.so
+LOCAL_EXPORT_C_INCLUDES := \
+  $(REACT_GENERATED_SRC_DIR)/codegen/jni
+include $(PREBUILT_SHARED_LIBRARY)
+
+# fbjni
+include $(FIRST_PARTY_NDK_DIR)/fbjni/Android.mk
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index dbf6b8a38b0329..feea8e53d0d53d 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -187,7 +187,6 @@ android {
 
 if (enableCodegen) {
     def reactAndroidProjectDir = project(':ReactAndroid').projectDir;
-    def reactAndroidBuildDir = project(':ReactAndroid').buildDir;
     android {
         defaultConfig {
             externalNativeBuild {
@@ -197,14 +196,8 @@ if (enableCodegen) {
                             "APP_STL=c++_shared",
                             "NDK_TOOLCHAIN_VERSION=clang",
                             // The following paths assume building React Native from source.
-                            // TODO: Find a better way without pointing to ReactAndroid/build dir.
                             "GENERATED_SRC_DIR=$buildDir/generated/source",
-                            "REACT_ANDROID_SRC_DIR=$reactAndroidProjectDir/src/main",
-                            "REACT_COMMON_DIR=$rootDir/ReactCommon",
-                            "REACT_GENERATED_SRC_DIR=$reactAndroidBuildDir/generated/source",
-                            "REACT_NDK_EXPORT_DIR=$reactAndroidBuildDir/tmp/buildReactNdkLib/local",
-                            "FIRST_PARTY_NDK_DIR=$reactAndroidProjectDir/src/main/jni/first-party",
-                            "THIRD_PARTY_NDK_DIR=$reactAndroidBuildDir/third-party-ndk"
+                            "REACT_ANDROID_DIR=$reactAndroidProjectDir"
                     cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
                     cppFlags "-std=c++1y"
                     targets "rntester_appmodules"
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index 36783dc2e52bda..176de4fd6759e7 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -3,60 +3,11 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-LOCAL_PATH := $(call my-dir)
+THIS_DIR := $(call my-dir)
 
-#############################################
-# Prebuilt libraries off ReactAndroid build #
-#############################################
+include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
 
-include $(CLEAR_VARS)
-LOCAL_MODULE := react_nativemodule_core
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_core.so
-# TODO: These needs to be synced with the other Android.mk files -- not efficient.
-# Note: By doing this, it delegates all header includes lookup to this .so.
-LOCAL_EXPORT_C_INCLUDES := \
-  $(FIRST_PARTY_NDK_DIR)/fbjni/headers \
-  $(REACT_ANDROID_SRC_DIR)/jni \
-  $(REACT_COMMON_DIR)/callinvoker \
-  $(REACT_COMMON_DIR)/jsi \
-  $(REACT_COMMON_DIR)/react/nativemodule/core \
-  $(REACT_COMMON_DIR)/react/nativemodule/core/platform/android \
-  $(REACT_GENERATED_SRC_DIR)/codegen/jni \
-  $(THIRD_PARTY_NDK_DIR)/boost/boost_1_63_0 \
-  $(THIRD_PARTY_NDK_DIR)/double-conversion \
-  $(THIRD_PARTY_NDK_DIR)/folly \
-  $(THIRD_PARTY_NDK_DIR)/glog/exported
-# Note: Sync with folly/Android.mk.
-FOLLY_FLAGS := \
-  -DFOLLY_NO_CONFIG=1 \
-  -DFOLLY_HAVE_CLOCK_GETTIME=1 \
-  -DFOLLY_HAVE_MEMRCHR=1 \
-  -DFOLLY_USE_LIBCPP=1 \
-  -DFOLLY_MOBILE=1 \
-  -DFOLLY_HAVE_XSI_STRERROR_R=1
-LOCAL_CFLAGS += $(FOLLY_FLAGS)
-LOCAL_EXPORT_CPPFLAGS := $(FOLLY_FLAGS)
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := react_nativemodule_manager
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_manager.so
-LOCAL_EXPORT_C_INCLUDES := \
-  $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/turbomodule/core/jni
-include $(PREBUILT_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE := react_codegen_reactandroidspec
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_codegen_reactandroidspec.so
-LOCAL_EXPORT_C_INCLUDES := \
-  $(REACT_GENERATED_SRC_DIR)/codegen/jni
-include $(PREBUILT_SHARED_LIBRARY)
-
-
-
-####################################
-# RNTester app specific definition #
-####################################
+LOCAL_PATH := $(THIS_DIR)
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := rntester_appmodules
@@ -64,7 +15,7 @@ LOCAL_MODULE := rntester_appmodules
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SHARED_LIBRARIES := libreact_nativemodule_core libreact_nativemodule_manager libreact_codegen_reactandroidspec
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libreact_nativemodule_manager libreact_codegen_reactandroidspec
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall

From 4072b1865a9742d5eb81bc6d4831a185796f95c7 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 25 Sep 2020 22:12:29 -0700
Subject: [PATCH 083/241] TurboModule Android: rename
 libreact_nativemodule_manager to libturbomodulejsijni

Summary:
TurboModule Java files are still using the old lib name: `turbomodulejsijni`, so let's keep it that way for now.

Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D23946945

fbshipit-source-id: ff095ff51dca532c82e67e1c75e9a4e9be392d61
---
 ReactAndroid/Android-prebuilt.mk                            | 6 +++---
 .../java/com/facebook/react/turbomodule/core/jni/Android.mk | 3 ++-
 packages/rn-tester/android/app/src/main/jni/Android.mk      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
index 338d8def835e22..4a4fb45ee1ff5b 100644
--- a/ReactAndroid/Android-prebuilt.mk
+++ b/ReactAndroid/Android-prebuilt.mk
@@ -74,10 +74,10 @@ LOCAL_EXPORT_C_INCLUDES := \
 LOCAL_SHARED_LIBRARIES := libfolly_json
 include $(PREBUILT_SHARED_LIBRARY)
 
-# react_nativemodule_manager
+# turbomodulejsijni
 include $(CLEAR_VARS)
-LOCAL_MODULE := react_nativemodule_manager
-LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libreact_nativemodule_manager.so
+LOCAL_MODULE := turbomodulejsijni
+LOCAL_SRC_FILES := $(REACT_NDK_EXPORT_DIR)/$(TARGET_ARCH_ABI)/libturbomodulejsijni.so
 LOCAL_EXPORT_C_INCLUDES := \
   $(REACT_ANDROID_SRC_DIR)/java/com/facebook/react/turbomodule/core/jni
 include $(PREBUILT_SHARED_LIBRARY)
diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
index ba788dafca2713..955cc86a8b10de 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
+++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/Android.mk
@@ -39,7 +39,8 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 # Name of this module.
-LOCAL_MODULE := react_nativemodule_manager
+# TODO: rename to react_nativemodule_manager
+LOCAL_MODULE := turbomodulejsijni
 
 # Header search path for all source files in this module.
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/ReactCommon
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index 176de4fd6759e7..2029b87348dd24 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -15,7 +15,7 @@ LOCAL_MODULE := rntester_appmodules
 LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
-LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libreact_nativemodule_manager libreact_codegen_reactandroidspec
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libturbomodulejsijni libreact_codegen_reactandroidspec
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall

From 9dbab5fb7b0422bad0f703431034f3387d274a46 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 25 Sep 2020 22:12:29 -0700
Subject: [PATCH 084/241] TurboModule Android: Implement
 TurboModuleManagerDelegate specific to RNTester

Summary:
This provides the RNTester specific impl of the manager delegate. The class is responsible to provide module lookup during runtime for TurboModule, and the C++ impl is using the codegen-generated lookup functions from :ReactAndroid and :packages:rn-tester:android:app Gradle targets.

Note: RNTester still needs to explicitly enable TurboModule and instantiate this manager before it can activate TurboModule.

Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D23938537

fbshipit-source-id: 7957847ecc58fef8d9a276d9d3d477ecec36a700
---
 .../RNTesterTurboModuleManagerDelegate.java   | 33 +++++++++++++++
 .../android/app/src/main/jni/OnLoad.cpp       | 17 ++++++++
 .../main/jni/RNTesterTurboModuleDelegate.cpp  | 18 --------
 .../RNTesterTurboModuleManagerDelegate.cpp    | 40 ++++++++++++++++++
 .../jni/RNTesterTurboModuleManagerDelegate.h  | 42 +++++++++++++++++++
 5 files changed, 132 insertions(+), 18 deletions(-)
 create mode 100644 packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
 create mode 100644 packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
 delete mode 100644 packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp
 create mode 100644 packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.cpp
 create mode 100644 packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.h

diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
new file mode 100644
index 00000000000000..0baf04bc1d7da5
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.react.uiapp;
+
+import androidx.annotation.VisibleForTesting;
+import com.facebook.jni.HybridData;
+import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.turbomodule.core.ReactPackageTurboModuleManagerDelegate;
+import com.facebook.soloader.SoLoader;
+import java.util.List;
+
+/** This class is responsible for creating all the TurboModules for the RNTester app. */
+public class RNTesterTurboModuleManagerDelegate extends ReactPackageTurboModuleManagerDelegate {
+  static {
+    SoLoader.loadLibrary("rntester_appmodules");
+  }
+
+  protected native HybridData initHybrid();
+
+  @VisibleForTesting
+  native boolean canCreateTurboModule(String moduleName);
+
+  public RNTesterTurboModuleManagerDelegate(
+      ReactApplicationContext context, List<ReactPackage> packages) {
+    super(context, packages);
+  }
+}
diff --git a/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
new file mode 100644
index 00000000000000..f4ed589bcbd37d
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/jni/OnLoad.cpp
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <fbjni/fbjni.h>
+
+#include "RNTesterTurboModuleManagerDelegate.h"
+
+JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
+  return facebook::jni::initialize(vm, [] {
+    // TODO: dvacca ramanpreet unify this with the way "ComponentDescriptorFactory" is defined in Fabric
+    facebook::react::RNTesterTurboModuleManagerDelegate::registerNatives();
+  });
+}
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp
deleted file mode 100644
index 3d9aef61937c83..00000000000000
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleDelegate.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#include <fbjni/fbjni.h>
-
-#include <ReactCommon/TurboModuleManagerDelegate.h>
-
-namespace facebook {
-namespace react {
-
-// TODO: Implement the app specific TurboModuleDelegate subclass.
-
-} // namespace react
-} // namespace facebook
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.cpp
new file mode 100644
index 00000000000000..e6ca3d0ecd0ac2
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "RNTesterTurboModuleManagerDelegate.h"
+
+#include "RNTesterAppModuleProvider.h"
+
+namespace facebook {
+namespace react {
+
+jni::local_ref<RNTesterTurboModuleManagerDelegate::jhybriddata> RNTesterTurboModuleManagerDelegate::initHybrid(jni::alias_ref<jhybridobject>) {
+  return makeCxxInstance();
+}
+
+void RNTesterTurboModuleManagerDelegate::registerNatives() {
+  registerHybrid({
+    makeNativeMethod("initHybrid", RNTesterTurboModuleManagerDelegate::initHybrid),
+    makeNativeMethod("canCreateTurboModule", RNTesterTurboModuleManagerDelegate::canCreateTurboModule),
+  });
+}
+
+std::shared_ptr<TurboModule> RNTesterTurboModuleManagerDelegate::getTurboModule(const std::string name, const std::shared_ptr<CallInvoker> jsInvoker) {
+  // Not implemented yet: provide pure-C++ NativeModules here.
+  return nullptr;
+}
+
+std::shared_ptr<TurboModule> RNTesterTurboModuleManagerDelegate::getTurboModule(const std::string name, const JavaTurboModule::InitParams &params) {
+  return RNTesterAppModuleProvider(name, params);
+}
+
+bool RNTesterTurboModuleManagerDelegate::canCreateTurboModule(std::string name) {
+  return getTurboModule(name, nullptr) != nullptr || getTurboModule(name, {.moduleName = name}) != nullptr;
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.h b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.h
new file mode 100644
index 00000000000000..8091b73569c1e1
--- /dev/null
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterTurboModuleManagerDelegate.h
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include <memory>
+#include <string>
+
+#include <ReactCommon/TurboModuleManagerDelegate.h>
+#include <fbjni/fbjni.h>
+
+namespace facebook {
+namespace react {
+
+class RNTesterTurboModuleManagerDelegate : public jni::HybridClass<RNTesterTurboModuleManagerDelegate, TurboModuleManagerDelegate> {
+public:
+  static constexpr auto kJavaDescriptor =
+      "Lcom/facebook/react/uiapp/RNTesterTurboModuleManagerDelegate;";
+
+  static jni::local_ref<jhybriddata> initHybrid(jni::alias_ref<jhybridobject>);
+
+  static void registerNatives();
+
+  std::shared_ptr<TurboModule> getTurboModule(const std::string name, const std::shared_ptr<CallInvoker> jsInvoker) override;
+  std::shared_ptr<TurboModule> getTurboModule(const std::string name, const JavaTurboModule::InitParams &params) override;
+
+  /**
+   * Test-only method. Allows user to verify whether a TurboModule can be created
+   * by instances of this class.
+   */
+  bool canCreateTurboModule(std::string name);
+
+private:
+  friend HybridBase;
+  using HybridBase::HybridBase;
+
+};
+
+} // namespace react
+} // namespace facebook

From 8d4b5efac703909eb5641fc85c47291a044d7079 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Fri, 25 Sep 2020 22:12:29 -0700
Subject: [PATCH 085/241] TurboModule Android: allow RNTester to activate
 TurboModule system

Summary:
If built with `USE_CODEGEN=1` flag set, RNTester now activates the TurboModule system, also using various codegen output from the previous commits.

Note that this is very early integration, and not thoroughly tested yet.

To verify:

```
console.warn('TM enabled?', global.__turboModuleProxy != null);
```

{F337454276}

Changelog: [Internal]

Reviewed By: yungsters

Differential Revision: D23946944

fbshipit-source-id: 5838aeb9ded07b1cc0fcb069535d1c6fb3725973
---
 packages/rn-tester/android/app/build.gradle   |   1 +
 .../react/uiapp/RNTesterActivity.java         |   4 +-
 .../react/uiapp/RNTesterApplication.java      | 125 ++++++++++++------
 .../main/jni/RNTesterAppModuleProvider.cpp    |  48 +++++++
 4 files changed, 131 insertions(+), 47 deletions(-)

diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index feea8e53d0d53d..2e70e9014a3d9b 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -154,6 +154,7 @@ android {
         testBuildType System.getProperty('testBuildType', 'debug')  // This will later be used to control the test apk build type
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         buildConfigField("boolean", "ENABLE_FABRIC", "$enableFabric")
+        buildConfigField("boolean", "ENABLE_TURBOMODULE", "$enableCodegen") // If using codegen, assume using TurboModule
     }
     signingConfigs {
         release {
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
index d7a315ca26dae4..4cbb384cded703 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterActivity.java
@@ -7,8 +7,6 @@
 
 package com.facebook.react.uiapp;
 
-import static com.facebook.react.uiapp.RNTesterApplication.IS_FABRIC_ENABLED;
-
 import android.content.res.Configuration;
 import android.os.Bundle;
 import androidx.annotation.Nullable;
@@ -31,7 +29,7 @@ public RNTesterActivityDelegate(ReactActivity activity, String mainComponentName
     @Override
     protected ReactRootView createRootView() {
       ReactRootView reactRootView = new ReactRootView(getContext());
-      reactRootView.setIsFabric(IS_FABRIC_ENABLED);
+      reactRootView.setIsFabric(BuildConfig.ENABLE_FABRIC);
       return reactRootView;
     }
 
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index e9a946ee224f75..c191ecaec94d9d 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -7,16 +7,14 @@
 
 package com.facebook.react.uiapp;
 
-import static com.facebook.react.uiapp.BuildConfig.ENABLE_FABRIC;
-
 import android.app.Application;
 import android.content.Context;
 import androidx.annotation.Nullable;
-import com.facebook.react.BuildConfig;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.bridge.JSIModule;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.JSIModuleSpec;
@@ -24,11 +22,13 @@
 import com.facebook.react.bridge.JavaScriptContextHolder;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
+import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.fabric.ComponentFactory;
 import com.facebook.react.fabric.CoreComponentsRegistry;
 import com.facebook.react.fabric.FabricJSIModuleProvider;
 import com.facebook.react.fabric.ReactNativeConfig;
 import com.facebook.react.shell.MainReactPackage;
+import com.facebook.react.turbomodule.core.TurboModuleManager;
 import com.facebook.react.views.text.ReactFontManager;
 import com.facebook.soloader.SoLoader;
 import java.lang.reflect.InvocationTargetException;
@@ -38,8 +38,6 @@
 
 public class RNTesterApplication extends Application implements ReactApplication {
 
-  static final boolean IS_FABRIC_ENABLED = ENABLE_FABRIC;
-
   private final ReactNativeHost mReactNativeHost =
       new ReactNativeHost(this) {
         @Override
@@ -65,7 +63,7 @@ public List<ReactPackage> getPackages() {
         @Nullable
         @Override
         protected JSIModulePackage getJSIModulePackage() {
-          if (!IS_FABRIC_ENABLED) {
+          if (!BuildConfig.ENABLE_FABRIC && !ReactFeatureFlags.useTurboModules) {
             return null;
           }
 
@@ -75,44 +73,81 @@ public List<JSIModuleSpec> getJSIModules(
                 final ReactApplicationContext reactApplicationContext,
                 final JavaScriptContextHolder jsContext) {
               List<JSIModuleSpec> specs = new ArrayList<>();
-              specs.add(
-                  new JSIModuleSpec() {
-                    @Override
-                    public JSIModuleType getJSIModuleType() {
-                      return JSIModuleType.UIManager;
-                    }
-
-                    @Override
-                    public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                      ComponentFactory ComponentFactory = new ComponentFactory();
-                      CoreComponentsRegistry.register(ComponentFactory);
-                      return new FabricJSIModuleProvider(
-                          reactApplicationContext,
-                          ComponentFactory,
-                          // TODO: T71362667 add ReactNativeConfig's support in RNTester
-                          new ReactNativeConfig() {
-                            @Override
-                            public boolean getBool(String s) {
-                              return true;
-                            }
-
-                            @Override
-                            public int getInt64(String s) {
-                              return 0;
-                            }
-
-                            @Override
-                            public String getString(String s) {
-                              return "";
-                            }
-
-                            @Override
-                            public double getDouble(String s) {
-                              return 0;
-                            }
-                          });
-                    }
-                  });
+
+              // Install the new native module system.
+              if (ReactFeatureFlags.useTurboModules) {
+                specs.add(
+                    new JSIModuleSpec() {
+                      @Override
+                      public JSIModuleType getJSIModuleType() {
+                        return JSIModuleType.TurboModuleManager;
+                      }
+
+                      @Override
+                      public JSIModuleProvider getJSIModuleProvider() {
+                        return new JSIModuleProvider() {
+                          @Override
+                          public JSIModule get() {
+                            ReactInstanceManager reactInstanceManager = getReactInstanceManager();
+                            List<ReactPackage> packages = reactInstanceManager.getPackages();
+
+                            return new TurboModuleManager(
+                                jsContext,
+                                new RNTesterTurboModuleManagerDelegate(
+                                    reactApplicationContext, packages),
+                                reactApplicationContext
+                                    .getCatalystInstance()
+                                    .getJSCallInvokerHolder(),
+                                reactApplicationContext
+                                    .getCatalystInstance()
+                                    .getNativeCallInvokerHolder());
+                          }
+                        };
+                      }
+                    });
+              }
+
+              // Install the new renderer.
+              if (BuildConfig.ENABLE_FABRIC) {
+                specs.add(
+                    new JSIModuleSpec() {
+                      @Override
+                      public JSIModuleType getJSIModuleType() {
+                        return JSIModuleType.UIManager;
+                      }
+
+                      @Override
+                      public JSIModuleProvider<UIManager> getJSIModuleProvider() {
+                        ComponentFactory ComponentFactory = new ComponentFactory();
+                        CoreComponentsRegistry.register(ComponentFactory);
+                        return new FabricJSIModuleProvider(
+                            reactApplicationContext,
+                            ComponentFactory,
+                            // TODO: T71362667 add ReactNativeConfig's support in RNTester
+                            new ReactNativeConfig() {
+                              @Override
+                              public boolean getBool(String s) {
+                                return false;
+                              }
+
+                              @Override
+                              public int getInt64(String s) {
+                                return 0;
+                              }
+
+                              @Override
+                              public String getString(String s) {
+                                return "";
+                              }
+
+                              @Override
+                              public double getDouble(String s) {
+                                return 0;
+                              }
+                            });
+                      }
+                    });
+              }
 
               return specs;
             }
@@ -122,6 +157,8 @@ public double getDouble(String s) {
 
   @Override
   public void onCreate() {
+    // Set `USE_CODEGEN` env var when building RNTester to enable TurboModule.
+    ReactFeatureFlags.useTurboModules = BuildConfig.ENABLE_TURBOMODULE;
     ReactFontManager.getInstance().addCustomFont(this, "Rubik", R.font.rubik);
     super.onCreate();
     SoLoader.init(this, /* native exopackage */ false);
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
index d16c9e6dee85d1..493d8267e3cf03 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
@@ -18,6 +18,54 @@ std::shared_ptr<TurboModule> RNTesterAppModuleProvider(const std::string moduleN
   if (module != nullptr) {
     return module;
   }
+
+  // TODO: fix up the ReactAndroidSpec_ModuleProvider() to avoid the Android prefix.
+  if (moduleName == "DatePicker") {
+    return std::make_shared<NativeDatePickerAndroidSpecJSI>(params);
+  }
+  if (moduleName == "DialogManager") {
+    return std::make_shared<NativeDialogManagerAndroidSpecJSI>(params);
+  }
+  if (moduleName == "ImageLoader") {
+    return std::make_shared<NativeImageLoaderAndroidSpecJSI>(params);
+  }
+  if (moduleName == "Networking") {
+    return std::make_shared<NativeNetworkingAndroidSpecJSI>(params);
+  }
+  if (moduleName == "Permissions") {
+    return std::make_shared<NativePermissionsAndroidSpecJSI>(params);
+  }
+  if (moduleName == "PlatformConstants") {
+    return std::make_shared<NativePlatformConstantsAndroidSpecJSI>(params);
+  }
+  if (moduleName == "StatusBarManager") {
+    return std::make_shared<NativeStatusBarManagerAndroidSpecJSI>(params);
+  }
+  if (moduleName == "Toast") {
+    return std::make_shared<NativeToastAndroidSpecJSI>(params);
+  }
+
+  // TODO: handle some special case naming.
+  if (moduleName == "IntentAndroid") {
+    return std::make_shared<NativeLinkingSpecJSI>(params);
+  }
+
+  // TODO: Animated module has special cases.
+  if ("NativeAnimatedModule" == moduleName) {
+    return std::make_shared<NativeAnimatedModuleSpecJSI>(params);
+  }
+  if ("NativeAnimatedTurboModule" == moduleName) {
+    return std::make_shared<NativeAnimatedTurboModuleSpecJSI>(params);
+  }
+
+  // TODO: handle multiple names for one spec.
+  if ("AsyncLocalStorage" == moduleName) {
+    return std::make_shared<NativeAsyncStorageSpecJSI>(params);
+  }
+  if ("AsyncSQLiteDBStorage" == moduleName) {
+    return std::make_shared<NativeAsyncStorageSpecJSI>(params);
+  }
+
   return ReactAndroidSpec_ModuleProvider(moduleName, params);
 }
 

From e599d6c5d338c1b4d1a0d988e0d9ff83c179fb54 Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Fri, 25 Sep 2020 23:38:30 -0700
Subject: [PATCH 086/241] Fix passing react native path in Podfile template
 (#29285)

Summary:
Since https://github.com/react-native-community/cli/commit/e949e234b03fb65f8e4ed2706dfaa745aa59a14f#diff-d1800049b92343288bcbc1c484575058 the RN cli script returns an object with `:reactNativePath` instead of just JSON. Not super familiar with how objects / JSON works in ruby but using this syntax instead works.

## Changelog

[Fixed] [iOS] - Fix passing react native path in Podfile template

Pull Request resolved: https://github.com/facebook/react-native/pull/29285

Test Plan: Tested in a project inside a monorepo using the latest version of RN CLI that the proper react-native path is now passed.

Reviewed By: fkgozali

Differential Revision: D23941162

Pulled By: hramos

fbshipit-source-id: 0115412ec6d6bca101612d760dfc00cf89d97f1e
---
 template/ios/Podfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/ios/Podfile b/template/ios/Podfile
index 73726efe1d9d8f..6701249e83ac20 100644
--- a/template/ios/Podfile
+++ b/template/ios/Podfile
@@ -6,7 +6,7 @@ platform :ios, '10.0'
 target 'HelloWorld' do
   config = use_native_modules!
 
-  use_react_native!(:path => config["reactNativePath"])
+  use_react_native!(:path => config[:reactNativePath])
 
   target 'HelloWorldTests' do
     inherit! :complete

From 27378b7f10ddfa73e8de0aaea1f6fea82894d601 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sat, 26 Sep 2020 17:21:50 -0700
Subject: [PATCH 087/241] Animated: Early detection of division by zero in
 AnimatedDivision

Summary:
Same as D20969087 (https://github.com/facebook/react-native/commit/be7867375580ed391bb10c50b768d998087e848d) but a bit more sophisticated.

We currently see a lot of errors happens because of division by zero in AnimatedDivision module. We already have a check for that in the module but it happens during the animation tick where the context of execution is already lost and it's hard to find why exactly it happens.
Adding an additional check to the constructor should trigger an error right inside render function which should make the error actionable.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: fkgozali

Differential Revision: D23908993

fbshipit-source-id: d21be9a72ec04fe4ff0740777d9ff49cf1bcde73
---
 Libraries/Animated/nodes/AnimatedDivision.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Animated/nodes/AnimatedDivision.js b/Libraries/Animated/nodes/AnimatedDivision.js
index 437b013b525c8f..fad47ae87d1242 100644
--- a/Libraries/Animated/nodes/AnimatedDivision.js
+++ b/Libraries/Animated/nodes/AnimatedDivision.js
@@ -24,7 +24,7 @@ class AnimatedDivision extends AnimatedWithChildren {
 
   constructor(a: AnimatedNode | number, b: AnimatedNode | number) {
     super();
-    if (b === 0) {
+    if (b === 0 || (b instanceof AnimatedNode && b.__getValue() === 0)) {
       console.error('Detected potential division by zero in AnimatedDivision');
     }
     this._a = typeof a === 'number' ? new AnimatedValue(a) : a;

From 308f9a131af23b98ff2ce9ffd72f43dc015f116e Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sat, 26 Sep 2020 22:00:15 -0700
Subject: [PATCH 088/241] Fabric: Failing early in case if a argument of
 `-[RCTComponentViewFactory registerComponentViewClass:]` is nil

Summary:
Subject.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: JoshuaGross

Differential Revision: D23914517

fbshipit-source-id: 1c909e7d21b12326881990ecf855e814bf957f3c
---
 React/Fabric/Mounting/RCTComponentViewFactory.mm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/React/Fabric/Mounting/RCTComponentViewFactory.mm b/React/Fabric/Mounting/RCTComponentViewFactory.mm
index 88489f2b3cd900..1c857b440c9d95 100644
--- a/React/Fabric/Mounting/RCTComponentViewFactory.mm
+++ b/React/Fabric/Mounting/RCTComponentViewFactory.mm
@@ -117,6 +117,7 @@ - (RCTComponentViewClassDescriptor)_componentViewClassDescriptorFromClass:(Class
 
 - (void)registerComponentViewClass:(Class<RCTComponentViewProtocol>)componentViewClass
 {
+  RCTAssert(componentViewClass, @"RCTComponentViewFactory: Provided `componentViewClass` is `nil`.");
   std::unique_lock<better::shared_mutex> lock(_mutex);
 
   auto componentDescriptorProvider = [componentViewClass componentDescriptorProvider];

From 0b96ada9acd18eadf9455a5cfef7da39a3dc8648 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sat, 26 Sep 2020 22:00:15 -0700
Subject: [PATCH 089/241] Fabric: Adding `#pragma once` to `ImageTelemetry.h`

Summary:
Without this thing some stuff does not compile.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: fkgozali

Differential Revision: D23948622

fbshipit-source-id: f066ada183c0fd6a7b5eec542395d44bbbfe80a3
---
 ReactCommon/react/renderer/imagemanager/ImageTelemetry.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
index b85ea7afad8a11..312d19b19e9862 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
+++ b/ReactCommon/react/renderer/imagemanager/ImageTelemetry.h
@@ -5,6 +5,8 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#pragma once
+
 #include <react/renderer/core/ReactPrimitives.h>
 #include <react/utils/Telemetry.h>
 

From 863dd2df234718e0430679b3c061c228fd8da797 Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@fb.com>
Date: Mon, 28 Sep 2020 03:07:57 -0700
Subject: [PATCH 090/241] Make blocking people work in Dating Settings

Summary:
Blocking people didn't work in Dating Settings without the Bridge.

Changelog: [Internal]

Reviewed By: ejanzer

Differential Revision: D23904867

fbshipit-source-id: 4a68b9d99fcc812f6616783a06dc047a3bc64491
---
 .../com/facebook/react/modules/dialog/DialogModule.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
index e3a25072156aa6..664b359a27b63b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/dialog/DialogModule.java
@@ -129,7 +129,8 @@ public AlertFragmentListener(Callback callback) {
     @Override
     public void onClick(DialogInterface dialog, int which) {
       if (!mCallbackConsumed) {
-        if (getReactApplicationContext().hasActiveCatalystInstance()) {
+        if (getReactApplicationContext().isBridgeless()
+            || getReactApplicationContext().hasActiveCatalystInstance()) {
           mCallback.invoke(ACTION_BUTTON_CLICKED, which);
           mCallbackConsumed = true;
         }
@@ -139,7 +140,8 @@ public void onClick(DialogInterface dialog, int which) {
     @Override
     public void onDismiss(DialogInterface dialog) {
       if (!mCallbackConsumed) {
-        if (getReactApplicationContext().hasActiveCatalystInstance()) {
+        if (getReactApplicationContext().isBridgeless()
+            || getReactApplicationContext().hasActiveCatalystInstance()) {
           mCallback.invoke(ACTION_DISMISSED);
           mCallbackConsumed = true;
         }

From e5006b3436e376cc5781566c65060b489e91338c Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Mon, 28 Sep 2020 03:13:06 -0700
Subject: [PATCH 091/241] Fix slider's initial value

Summary:
Changelog: [Internal]

value needs to be set after minimum and maximum, otherwise it gets pinned to previous minimum/maximum.

Default minimum is 0 and maximum is 1. If we set value to 20 and maximum to 50, previously the value would get pinned to 1 (maximum value).

See [Apple Docs](https://developer.apple.com/documentation/uikit/uislider/1621346-value?language=objc) for more.

Reviewed By: JoshuaGross

Differential Revision: D23903545

fbshipit-source-id: 8e9dd49ced79d43b9591c7d24de59b9eaff5bdfd
---
 .../ComponentViews/Slider/RCTSliderComponentView.mm  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
index 26375050f8edff..af62366caa3be3 100644
--- a/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Slider/RCTSliderComponentView.mm
@@ -110,12 +110,6 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   const auto &oldSliderProps = *std::static_pointer_cast<const SliderProps>(_props);
   const auto &newSliderProps = *std::static_pointer_cast<const SliderProps>(props);
 
-  // `value`
-  if (oldSliderProps.value != newSliderProps.value) {
-    _sliderView.value = newSliderProps.value;
-    _previousValue = newSliderProps.value;
-  }
-
   // `minimumValue`
   if (oldSliderProps.minimumValue != newSliderProps.minimumValue) {
     _sliderView.minimumValue = newSliderProps.minimumValue;
@@ -126,6 +120,12 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     _sliderView.maximumValue = newSliderProps.maximumValue;
   }
 
+  // `value`
+  if (oldSliderProps.value != newSliderProps.value) {
+    _sliderView.value = newSliderProps.value;
+    _previousValue = newSliderProps.value;
+  }
+
   // `disabled`
   if (oldSliderProps.disabled != newSliderProps.disabled) {
     _sliderView.enabled = !newSliderProps.disabled;

From 2c896d35782cd04c873aefadc947447cc30a7f60 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Mon, 28 Sep 2020 04:18:49 -0700
Subject: [PATCH 092/241] Do not attach root view until size is available

Summary:
Changelog: [internal]

# Why is text laid out twice in Fabric?

Layout constraints (min and max size) change during startup of Fabric surface.
1. `Scheduler::startSurface` is called with max size being {inf, inf}.
2. `Scheduler::constraintSurfaceLayout` is called with max size equal to viewport.

These are two operations that don't happen one after the other and on Android, CompleteRoot is called from JS before second operation is called. This triggers layout with max size {inf, inf} and later when second operation is called. Layout happens again now with correct size.

# Fix
Make sure `Scheduler::startSurface` is called with proper values and not {inf, inf}.

Reviewed By: JoshuaGross, yungsters

Differential Revision: D23866735

fbshipit-source-id: b16307543cc75c689d0c1f0a16aa581458f7417d
---
 .../src/main/java/com/facebook/react/ReactRootView.java         | 2 --
 1 file changed, 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 2af6a23fbd977d..c21bffc720a519 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -382,8 +382,6 @@ public void startReactApplication(
 
       mReactInstanceManager.createReactContextInBackground();
 
-      attachToReactInstanceManager();
-
     } finally {
       Systrace.endSection(TRACE_TAG_REACT_JAVA_BRIDGE);
     }

From 35b8f76c9e7cc1660b7c32b95f9bd5509e600de7 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Mon, 28 Sep 2020 10:43:02 -0700
Subject: [PATCH 093/241] RNTester: Add TextInput example to RTL tester

Summary:
Add a TextInput to RTL screen in RNTester, to test RTL languages with TextInput.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D23914627

fbshipit-source-id: 84c62efe7034c0dfa2ef21be3f085880292c3930
---
 .../rn-tester/js/examples/RTL/RTLExample.js   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/packages/rn-tester/js/examples/RTL/RTLExample.js b/packages/rn-tester/js/examples/RTL/RTLExample.js
index d6b1c1827edbc3..d93995a0388b21 100644
--- a/packages/rn-tester/js/examples/RTL/RTLExample.js
+++ b/packages/rn-tester/js/examples/RTL/RTLExample.js
@@ -21,6 +21,7 @@ const {
   Platform,
   StyleSheet,
   Text,
+  TextInput,
   TouchableWithoutFeedback,
   Switch,
   View,
@@ -86,6 +87,18 @@ const TextAlignmentExample = withRTLState(({isRTL, setRTL, ...props}) => {
   );
 });
 
+const TextInputExample = withRTLState(({isRTL, setRTL, ...props}) => {
+  return (
+    <View>
+      <RTLToggler setRTL={setRTL} isRTL={isRTL} />
+      <View style={directionStyle(isRTL)}>
+        <Text style={props.style}>LRT or RTL TextInput.</Text>
+        <TextInput style={props.style} />
+      </View>
+    </View>
+  );
+});
+
 const IconsExample = withRTLState(({isRTL, setRTL}) => {
   return (
     <View>
@@ -682,6 +695,13 @@ exports.examples = [
       );
     },
   },
+  {
+    title: "Using textAlign: 'right' for TextInput",
+    description: ('Flip TextInput direction to RTL': string),
+    render: function(): React.Element<any> {
+      return <TextInputExample style={[styles.textAlignRight]} />;
+    },
+  },
   {
     title: 'Working With Icons',
     render: function(): React.Element<any> {

From b85b4f46af422b2b942f3ecb3c61cb562bfebc02 Mon Sep 17 00:00:00 2001
From: Luna Wei <luwe@fb.com>
Date: Mon, 28 Sep 2020 10:51:54 -0700
Subject: [PATCH 094/241] Update PerformanceLogger to nullable timespans,
 points, extras

Summary: Changelog: [Internal][Fixed] - When we close performance loggers (D23845307 (https://github.com/facebook/react-native/commit/aebb97b9c64a8d84cf852ae8efc5ef28b36da610)) we cannot rely that a timespan/point/extra will be in perf logger. Update types to reflect that.

Reviewed By: rubennorte

Differential Revision: D23907741

fbshipit-source-id: 63673aa69cd8c76253e4fee3463e37c86265cf7b
---
 Libraries/Inspector/PerformanceOverlay.js     |  2 +-
 .../__tests__/PerformanceLogger-test.js       | 12 ++++----
 .../Utilities/createPerformanceLogger.js      | 30 ++++++++++---------
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/Libraries/Inspector/PerformanceOverlay.js b/Libraries/Inspector/PerformanceOverlay.js
index a7307bda9174a6..128abb43099330 100644
--- a/Libraries/Inspector/PerformanceOverlay.js
+++ b/Libraries/Inspector/PerformanceOverlay.js
@@ -22,7 +22,7 @@ class PerformanceOverlay extends React.Component<{...}> {
     const items = [];
 
     for (const key in perfLogs) {
-      if (perfLogs[key].totalTime) {
+      if (perfLogs[key]?.totalTime) {
         const unit = key === 'BundleSize' ? 'b' : 'ms';
         items.push(
           <View style={styles.row} key={key}>
diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index 45837855b6b5a9..d26cbede535bef 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -54,12 +54,12 @@ describe('PerformanceLogger', () => {
       perfLogger.startTimespan(TIMESPAN_1);
       perfLogger.close();
       let timespan = perfLogger.getTimespans()[TIMESPAN_1];
-      expect(timespan.endTime).toBeUndefined();
-      expect(timespan.totalTime).toBeUndefined();
+      expect(timespan?.endTime).toBeUndefined();
+      expect(timespan?.totalTime).toBeUndefined();
       perfLogger.stopTimespan(TIMESPAN_1);
       timespan = perfLogger.getTimespans()[TIMESPAN_1];
-      expect(timespan.endTime).toBeUndefined();
-      expect(timespan.totalTime).toBeUndefined();
+      expect(timespan?.endTime).toBeUndefined();
+      expect(timespan?.totalTime).toBeUndefined();
     });
   });
 
@@ -208,10 +208,10 @@ describe('PerformanceLogger', () => {
     let perfLogger = createPerformanceLogger();
     perfLogger.startTimespan(TIMESPAN_1, POINT_ANNOTATION_1);
     perfLogger.stopTimespan(TIMESPAN_1, POINT_ANNOTATION_2);
-    expect(perfLogger.getTimespans()[TIMESPAN_1].startExtras).toEqual(
+    expect(perfLogger.getTimespans()[TIMESPAN_1]?.startExtras).toEqual(
       POINT_ANNOTATION_1,
     );
-    expect(perfLogger.getTimespans()[TIMESPAN_1].endExtras).toEqual(
+    expect(perfLogger.getTimespans()[TIMESPAN_1]?.endExtras).toEqual(
       POINT_ANNOTATION_2,
     );
   });
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index e94b8bd3a00059..2e8753f9ec0877 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -41,15 +41,15 @@ export interface IPerformanceLogger {
   clearCompleted(): void;
   close(): void;
   currentTimestamp(): number;
-  getExtras(): {[key: string]: ExtraValue, ...};
-  getPoints(): {[key: string]: number, ...};
-  getPointExtras(): {[key: string]: Extras, ...};
-  getTimespans(): {[key: string]: Timespan, ...};
+  getExtras(): {[key: string]: ?ExtraValue, ...};
+  getPoints(): {[key: string]: ?number, ...};
+  getPointExtras(): {[key: string]: ?Extras, ...};
+  getTimespans(): {[key: string]: ?Timespan, ...};
   hasTimespan(key: string): boolean;
   isClosed(): boolean;
   logEverything(): void;
   markPoint(key: string, timestamp?: number, extras?: Extras): void;
-  removeExtra(key: string): ExtraValue | void;
+  removeExtra(key: string): ?ExtraValue;
   setExtra(key: string, value: ExtraValue): void;
   startTimespan(key: string, extras?: Extras): void;
   stopTimespan(key: string, extras?: Extras): void;
@@ -60,10 +60,10 @@ const _cookies: {[key: string]: number, ...} = {};
 const PRINT_TO_CONSOLE: false = false; // Type as false to prevent accidentally committing `true`;
 
 class PerformanceLogger implements IPerformanceLogger {
-  _timespans: {[key: string]: Timespan} = {};
-  _extras: {[key: string]: ExtraValue} = {};
-  _points: {[key: string]: number} = {};
-  _pointExtras: {[key: string]: Extras, ...} = {};
+  _timespans: {[key: string]: ?Timespan} = {};
+  _extras: {[key: string]: ?ExtraValue} = {};
+  _points: {[key: string]: ?number} = {};
+  _pointExtras: {[key: string]: ?Extras, ...} = {};
   _closed: boolean = false;
 
   addTimespan(
@@ -109,7 +109,7 @@ class PerformanceLogger implements IPerformanceLogger {
 
   clearCompleted() {
     for (const key in this._timespans) {
-      if (this._timespans[key].totalTime != null) {
+      if (this._timespans[key]?.totalTime != null) {
         delete this._timespans[key];
       }
     }
@@ -156,7 +156,7 @@ class PerformanceLogger implements IPerformanceLogger {
     if (PRINT_TO_CONSOLE) {
       // log timespans
       for (const key in this._timespans) {
-        if (this._timespans[key].totalTime != null) {
+        if (this._timespans[key]?.totalTime != null) {
           infoLog(key + ': ' + this._timespans[key].totalTime + 'ms');
         }
       }
@@ -166,7 +166,9 @@ class PerformanceLogger implements IPerformanceLogger {
 
       // log points
       for (const key in this._points) {
-        infoLog(key + ': ' + this._points[key] + 'ms');
+        if (this._points[key] != null) {
+          infoLog(key + ': ' + this._points[key] + 'ms');
+        }
       }
     }
   }
@@ -178,7 +180,7 @@ class PerformanceLogger implements IPerformanceLogger {
       }
       return;
     }
-    if (this._points[key]) {
+    if (this._points[key] != null) {
       if (PRINT_TO_CONSOLE && __DEV__) {
         infoLog(
           'PerformanceLogger: Attempting to mark a point that has been already logged ',
@@ -193,7 +195,7 @@ class PerformanceLogger implements IPerformanceLogger {
     }
   }
 
-  removeExtra(key: string): ExtraValue | void {
+  removeExtra(key: string): ?ExtraValue {
     const value = this._extras[key];
     delete this._extras[key];
     return value;

From 0a0d2c990d6b666c962ca3a513f5fdb74eb79e0a Mon Sep 17 00:00:00 2001
From: Martin Ortega <martega@fb.com>
Date: Mon, 28 Sep 2020 12:33:57 -0700
Subject: [PATCH 095/241] Make the Instagram app compile again

Summary:
Wrap iOS 14 SDK code in a `#if/#endif` so that the Instagram app compiles again

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23948336

fbshipit-source-id: 67e6ee48d1951ae405c12b4ad39cf8c9817df627
---
 React/Views/RCTDatePicker.m | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/React/Views/RCTDatePicker.m b/React/Views/RCTDatePicker.m
index 3ba934d152c4c9..9fee82b3cfffc2 100644
--- a/React/Views/RCTDatePicker.m
+++ b/React/Views/RCTDatePicker.m
@@ -7,9 +7,20 @@
 
 #import "RCTDatePicker.h"
 
+#import <Availability.h>
+#import <AvailabilityInternal.h>
+
 #import "RCTUtils.h"
 #import "UIView+React.h"
 
+#ifndef __IPHONE_14_0
+  #define __IPHONE_14_0 140000
+#endif // __IPHONE_14_0
+
+#ifndef RCT_IOS_14_0_SDK_OR_LATER
+  #define RCT_IOS_14_0_SDK_OR_LATER (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0)
+#endif // RCT_IOS_14_0_SDK_OR_LATER
+
 @interface RCTDatePicker ()
 
 @property (nonatomic, copy) RCTBubblingEventBlock onChange;
@@ -25,9 +36,11 @@ - (instancetype)initWithFrame:(CGRect)frame
     [self addTarget:self action:@selector(didChange) forControlEvents:UIControlEventValueChanged];
     _reactMinuteInterval = 1;
 
+#if RCT_IOS_14_0_SDK_OR_LATER
     if (@available(iOS 14, *)) {
       self.preferredDatePickerStyle = UIDatePickerStyleWheels;
     }
+#endif // RCT_IOS_14_0_SDK_OR_LATER
   }
   return self;
 }

From 9da4d87798b8811795838f84739f9e98c2099ff8 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Mon, 28 Sep 2020 17:21:14 -0700
Subject: [PATCH 096/241] Pressability: Support Lazy Hook Initialization

Summary:
Changes `usePressability` so that it accepts a nullable `config` argument.

This makes it possible for a component to use `usePressability` and lazily allocate the `config` and subsequent instance of `Pressability`. This can be useful for components that are commonly allocated but seldom pressed because it lets many usages of `usePressability` avoid allocating many extraneous objects.

Changelog:
[Internal]

Reviewed By: kacieb

Differential Revision: D23708206

fbshipit-source-id: 4a5063067131ce8c957fb16c49a2045e8c0b19fa
---
 Libraries/Components/Pressable/Pressable.js | 14 +++++++-----
 Libraries/Pressability/usePressability.js   | 25 ++++++++++++++-------
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/Libraries/Components/Pressable/Pressable.js b/Libraries/Components/Pressable/Pressable.js
index 48ebd055768f00..a6692c92bd425f 100644
--- a/Libraries/Components/Pressable/Pressable.js
+++ b/Libraries/Components/Pressable/Pressable.js
@@ -170,6 +170,14 @@ function Pressable(props: Props, forwardedRef): React.Node {
 
   const hitSlop = normalizeRect(props.hitSlop);
 
+  const restPropsWithDefaults: React.ElementConfig<typeof View> = {
+    ...restProps,
+    ...android_rippleConfig?.viewProps,
+    accessible: accessible !== false,
+    focusable: focusable !== false,
+    hitSlop,
+  };
+
   const config = useMemo(
     () => ({
       disabled,
@@ -219,12 +227,8 @@ function Pressable(props: Props, forwardedRef): React.Node {
 
   return (
     <View
-      {...restProps}
+      {...restPropsWithDefaults}
       {...eventHandlers}
-      {...android_rippleConfig?.viewProps}
-      accessible={accessible !== false}
-      focusable={focusable !== false}
-      hitSlop={hitSlop}
       ref={viewRef}
       style={typeof style === 'function' ? style({pressed}) : style}
       collapsable={false}>
diff --git a/Libraries/Pressability/usePressability.js b/Libraries/Pressability/usePressability.js
index 3538524239387b..9ed4cc22197437 100644
--- a/Libraries/Pressability/usePressability.js
+++ b/Libraries/Pressability/usePressability.js
@@ -16,11 +16,16 @@ import Pressability, {
 } from './Pressability';
 import {useEffect, useRef} from 'react';
 
+/**
+ * Creates a persistent instance of `Pressability` that automatically configures
+ * itself and resets. Accepts null `config` to support lazy initialization. Once
+ * initialized, will not un-initialize until the component has been unmounted.
+ */
 export default function usePressability(
-  config: PressabilityConfig,
-): EventHandlers {
+  config: ?PressabilityConfig,
+): ?EventHandlers {
   const pressabilityRef = useRef<?Pressability>(null);
-  if (pressabilityRef.current == null) {
+  if (config != null && pressabilityRef.current == null) {
     pressabilityRef.current = new Pressability(config);
   }
   const pressability = pressabilityRef.current;
@@ -28,16 +33,20 @@ export default function usePressability(
   // On the initial mount, this is a no-op. On updates, `pressability` will be
   // re-configured to use the new configuration.
   useEffect(() => {
-    pressability.configure(config);
+    if (config != null && pressability != null) {
+      pressability.configure(config);
+    }
   }, [config, pressability]);
 
   // On unmount, reset pending state and timers inside `pressability`. This is
   // a separate effect because we do not want to reset when `config` changes.
   useEffect(() => {
-    return () => {
-      pressability.reset();
-    };
+    if (pressability != null) {
+      return () => {
+        pressability.reset();
+      };
+    }
   }, [pressability]);
 
-  return pressability.getEventHandlers();
+  return pressability == null ? null : pressability.getEventHandlers();
 }

From 06ce64356594a921cd9ae4f71c15dd56dd0e53a3 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Mon, 28 Sep 2020 17:21:14 -0700
Subject: [PATCH 097/241] Text: Cleanup Native Component Configuration

Summary:
Cleans up the native component configuration for `RCTText` and `RCTVirtualText`.

This //does// lead to a breaking change because `Text.viewConfig` will no longer exist. However, I think this is acceptable because `viewConfig` has already long stopped being an exported prop on other core components (e.g. `View`).

Changelog:
[General][Removed] - `Text.viewConfig` is no longer exported.

Reviewed By: shergin

Differential Revision: D23708205

fbshipit-source-id: 1ad0b0772735834d9162a65d9434a9bbbd142416
---
 Libraries/Text/Text.js                | 75 +++++----------------------
 Libraries/Text/TextNativeComponent.js | 68 ++++++++++++++++++++++++
 2 files changed, 81 insertions(+), 62 deletions(-)
 create mode 100644 Libraries/Text/TextNativeComponent.js

diff --git a/Libraries/Text/Text.js b/Libraries/Text/Text.js
index 7d34417875ece5..681922ea13fdde 100644
--- a/Libraries/Text/Text.js
+++ b/Libraries/Text/Text.js
@@ -10,14 +10,13 @@
 
 'use strict';
 
+import {NativeText, NativeVirtualText} from './TextNativeComponent';
+
 const DeprecatedTextPropTypes = require('../DeprecatedPropTypes/DeprecatedTextPropTypes');
 const React = require('react');
-const ReactNativeViewAttributes = require('../Components/View/ReactNativeViewAttributes');
 const TextAncestor = require('./TextAncestor');
 const Touchable = require('../Components/Touchable/Touchable');
-const UIManager = require('../ReactNative/UIManager');
 
-const createReactNativeComponentClass = require('../Renderer/shims/createReactNativeComponentClass');
 const nullthrows = require('nullthrows');
 const processColor = require('../StyleSheet/processColor');
 
@@ -27,7 +26,7 @@ import type {PressRetentionOffset, TextProps} from './TextProps';
 
 type ResponseHandlers = $ReadOnly<{|
   onStartShouldSetResponder: () => boolean,
-  onResponderGrant: (event: PressEvent, dispatchID: string) => void,
+  onResponderGrant: (event: PressEvent) => void,
   onResponderMove: (event: PressEvent) => void,
   onResponderRelease: (event: PressEvent) => void,
   onResponderTerminate: (event: PressEvent) => void,
@@ -36,7 +35,7 @@ type ResponseHandlers = $ReadOnly<{|
 
 type Props = $ReadOnly<{|
   ...TextProps,
-  forwardedRef: ?React.Ref<'RCTText' | 'RCTVirtualText'>,
+  forwardedRef: ?React.Ref<typeof NativeText | typeof NativeVirtualText>,
 |}>;
 
 type State = {|
@@ -51,36 +50,6 @@ type State = {|
 
 const PRESS_RECT_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
 
-const viewConfig = {
-  validAttributes: {
-    ...ReactNativeViewAttributes.UIView,
-    isHighlighted: true,
-    numberOfLines: true,
-    ellipsizeMode: true,
-    allowFontScaling: true,
-    maxFontSizeMultiplier: true,
-    disabled: true,
-    selectable: true,
-    selectionColor: true,
-    adjustsFontSizeToFit: true,
-    minimumFontScale: true,
-    textBreakStrategy: true,
-    onTextLayout: true,
-    onInlineViewLayout: true,
-    dataDetectorType: true,
-    android_hyphenationFrequency: true,
-  },
-  directEventTypes: {
-    topTextLayout: {
-      registrationName: 'onTextLayout',
-    },
-    topInlineViewLayout: {
-      registrationName: 'onInlineViewLayout',
-    },
-  },
-  uiViewClassName: 'RCTText',
-};
-
 /**
  * A React component for displaying text.
  *
@@ -122,21 +91,19 @@ class TouchableText extends React.Component<Props, State> {
       : null;
   }
 
-  static viewConfig = viewConfig;
-
   render(): React.Node {
-    let props = this.props;
-    if (isTouchable(props)) {
+    let {forwardedRef, selectionColor, ...props} = this.props;
+    if (isTouchable(this.props)) {
       props = {
         ...props,
         ...this.state.responseHandlers,
         isHighlighted: this.state.isHighlighted,
       };
     }
-    if (props.selectionColor != null) {
+    if (selectionColor != null) {
       props = {
         ...props,
-        selectionColor: processColor(props.selectionColor),
+        selectionColor: processColor(selectionColor),
       };
     }
     if (__DEV__) {
@@ -151,16 +118,17 @@ class TouchableText extends React.Component<Props, State> {
       <TextAncestor.Consumer>
         {hasTextAncestor =>
           hasTextAncestor ? (
-            <RCTVirtualText
+            // $FlowFixMe[prop-missing] For the `onClick` workaround.
+            <NativeVirtualText
               {...props}
               // This is used on Android to call a nested Text component's press handler from the context menu.
               // TODO T75145059 Clean this up once Text is migrated off of Touchable
               onClick={props.onPress}
-              ref={props.forwardedRef}
+              ref={forwardedRef}
             />
           ) : (
             <TextAncestor.Provider value={true}>
-              <RCTText {...props} ref={props.forwardedRef} />
+              <NativeText {...props} ref={forwardedRef} />
             </TextAncestor.Provider>
           )
         }
@@ -263,26 +231,9 @@ const isTouchable = (props: Props): boolean =>
   props.onLongPress != null ||
   props.onStartShouldSetResponder != null;
 
-const RCTText = createReactNativeComponentClass(
-  viewConfig.uiViewClassName,
-  () => viewConfig,
-);
-
-const RCTVirtualText =
-  UIManager.getViewManagerConfig('RCTVirtualText') == null
-    ? RCTText
-    : createReactNativeComponentClass('RCTVirtualText', () => ({
-        validAttributes: {
-          ...ReactNativeViewAttributes.UIView,
-          isHighlighted: true,
-          maxFontSizeMultiplier: true,
-        },
-        uiViewClassName: 'RCTVirtualText',
-      }));
-
 const Text = (
   props: TextProps,
-  forwardedRef: ?React.Ref<'RCTText' | 'RCTVirtualText'>,
+  forwardedRef: ?React.Ref<typeof NativeText | typeof NativeVirtualText>,
 ) => {
   return <TouchableText {...props} forwardedRef={forwardedRef} />;
 };
diff --git a/Libraries/Text/TextNativeComponent.js b/Libraries/Text/TextNativeComponent.js
new file mode 100644
index 00000000000000..eafc7ddf8d1483
--- /dev/null
+++ b/Libraries/Text/TextNativeComponent.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import ReactNativeViewAttributes from '../Components/View/ReactNativeViewAttributes';
+import UIManager from '../ReactNative/UIManager';
+import {type HostComponent} from '../Renderer/shims/ReactNativeTypes';
+import createReactNativeComponentClass from '../Renderer/shims/createReactNativeComponentClass';
+import {type ProcessedColorValue} from '../StyleSheet/processColor';
+import {type TextProps} from './TextProps';
+
+type NativeTextProps = $ReadOnly<{
+  ...TextProps,
+  isHighlighted?: ?boolean,
+  selectionColor?: ?ProcessedColorValue,
+}>;
+
+export const NativeText: HostComponent<NativeTextProps> = (createReactNativeComponentClass(
+  'RCTText',
+  () => ({
+    validAttributes: {
+      ...ReactNativeViewAttributes.UIView,
+      isHighlighted: true,
+      numberOfLines: true,
+      ellipsizeMode: true,
+      allowFontScaling: true,
+      maxFontSizeMultiplier: true,
+      disabled: true,
+      selectable: true,
+      selectionColor: true,
+      adjustsFontSizeToFit: true,
+      minimumFontScale: true,
+      textBreakStrategy: true,
+      onTextLayout: true,
+      onInlineViewLayout: true,
+      dataDetectorType: true,
+    },
+    directEventTypes: {
+      topTextLayout: {
+        registrationName: 'onTextLayout',
+      },
+      topInlineViewLayout: {
+        registrationName: 'onInlineViewLayout',
+      },
+    },
+    uiViewClassName: 'RCTText',
+  }),
+): any);
+
+export const NativeVirtualText: HostComponent<NativeTextProps> =
+  UIManager.getViewManagerConfig('RCTVirtualText') == null
+    ? NativeText
+    : (createReactNativeComponentClass('RCTVirtualText', () => ({
+        validAttributes: {
+          ...ReactNativeViewAttributes.UIView,
+          isHighlighted: true,
+          maxFontSizeMultiplier: true,
+        },
+        uiViewClassName: 'RCTVirtualText',
+      })): any);

From 216037757494edf990ecb5a3dfdf6f75bab818a1 Mon Sep 17 00:00:00 2001
From: simek <gosimek@gmail.com>
Date: Mon, 28 Sep 2020 21:24:45 -0700
Subject: [PATCH 098/241] remove most of tvOS remnants from the code (#29407)

Summary:
Refs: [0.62 release](https://reactnative.dev/blog/#moving-apple-tv-to-react-native-tvos), https://github.com/facebook/react-native/issues/28706, https://github.com/facebook/react-native/issues/28743, https://github.com/facebook/react-native/issues/29018

This PR removes most of the tvOS remnants in the code. Most of the changes are related to the tvOS platform removal from `.podspec` files, tvOS specific conditionals removal (Obj-C + JS) or tvOS CI/testing pipeline related code.

In addition to the changes listed above I have removed the deprecated `Platform.isTVOS` method. I'm not sure how `Platform.isTV` method is correlated with Android TV devices support which is technically not deprecated in the core so I left this method untouched for now.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

* **[Internal] [Removed]** - remove most of tvOS remnants from the code:
  * `TVEventHandler`, `TVTouchable`, `RCTTVView`, `RCTTVRemoteHandler` and `RCTTVNavigationEventEmitter`
* **[Internal] [Removed]** - remove `TARGET_TV_OS` flag and all the usages
* **[iOS] [Removed]** - remove deprecated `Platform.isTVOS` method
* **[iOS] [Removed]** - remove deprecated and TV related props from View:
  * `isTVSelectable`, `hasTVPreferredFocus` and `tvParallaxProperties`
* **[iOS] [Removed]** - remove `BackHandler` utility implementation

Pull Request resolved: https://github.com/facebook/react-native/pull/29407

Test Plan: Local tests (and iOS CI run) do not yield any errors, but I'm not sure how the CI pipeline would react to those changes. That is the reason why this PR is being posted as Draft. Some tweaks and code adjustment could be required.

Reviewed By: PeteTheHeat

Differential Revision: D22619441

Pulled By: shergin

fbshipit-source-id: 9aaf3840c5e8bd469c2cfcfa7c5b441ef71b30b6
---
 .../Dockerfiles/scripts/run-ci-e2e-tests.sh   |   5 -
 .../React-RCTActionSheet.podspec              |   4 +-
 Libraries/Blob/React-RCTBlob.podspec          |   2 +-
 .../Components/AppleTV/TVEventHandler.js      |  51 ----
 Libraries/Components/ScrollView/ScrollView.js |   3 +-
 Libraries/Components/Touchable/TVTouchable.js |  55 ----
 Libraries/Components/Touchable/Touchable.js   |  22 --
 .../Components/Touchable/TouchableBounce.js   |  31 ---
 .../Touchable/TouchableHighlight.js           |  27 --
 .../Touchable/TouchableNativeFeedback.js      |  31 ---
 .../Components/Touchable/TouchableOpacity.js  |  31 ---
 .../Touchable/TouchableWithoutFeedback.js     |  31 ---
 .../DeprecatedTVViewPropTypes.js              |  23 --
 Libraries/FBLazyVector/FBLazyVector.podspec   |   2 +-
 .../FBReactNativeSpec.podspec                 |   2 +-
 Libraries/Image/React-RCTImage.podspec        |   2 +-
 Libraries/LinkingIOS/React-RCTLinking.podspec |   2 +-
 .../React-RCTAnimation.podspec                |   2 +-
 Libraries/Network/React-RCTNetwork.podspec    |   2 +-
 .../RCTPushNotificationManager.h              |   2 +-
 .../RCTPushNotificationManager.mm             |  14 +-
 .../React-RCTPushNotification.podspec         |   2 +-
 Libraries/RCTRequired/RCTRequired.podspec     |   2 +-
 Libraries/Settings/React-RCTSettings.podspec  |   2 +-
 Libraries/Text/React-RCTText.podspec          |   2 +-
 Libraries/Text/Text/RCTTextView.m             |   4 +-
 .../RCTMultilineTextInputViewManager.m        |   2 -
 .../Text/TextInput/Multiline/RCTUITextView.m  |   2 -
 .../Text/TextInput/RCTBaseTextInputView.m     |   8 +-
 .../TextInput/RCTInputAccessoryViewContent.m  |   2 +-
 Libraries/TypeSafety/RCTTypeSafety.podspec    |   2 +-
 Libraries/Utilities/BackHandler.android.js    |   7 +-
 Libraries/Utilities/BackHandler.ios.js        | 107 +-------
 .../Vibration/React-RCTVibration.podspec      |   2 +-
 React-Core.podspec                            |   9 +-
 React.podspec                                 |   2 +-
 React/Base/RCTConvert.m                       |   5 -
 React/Base/RCTRootView.m                      |  22 --
 React/Base/RCTRootViewInternal.h              |  10 -
 React/Base/RCTTVRemoteHandler.h               |  31 ---
 React/Base/RCTTVRemoteHandler.m               | 233 ----------------
 React/CoreModules/BUCK                        |   3 -
 React/CoreModules/CoreModulesPlugins.h        |   1 -
 React/CoreModules/CoreModulesPlugins.mm       |   1 -
 React/CoreModules/RCTAsyncLocalStorage.mm     |   8 -
 React/CoreModules/RCTDeviceInfo.mm            |  10 +-
 React/CoreModules/RCTKeyboardObserver.mm      |   8 -
 React/CoreModules/RCTRedBox.mm                |   4 -
 React/CoreModules/RCTStatusBarManager.h       |   2 -
 React/CoreModules/RCTStatusBarManager.mm      |  10 -
 .../CoreModules/RCTTVNavigationEventEmitter.h |  14 -
 .../RCTTVNavigationEventEmitter.mm            |  63 -----
 React/CoreModules/React-CoreModules.podspec   |   2 +-
 .../RCTInputAccessoryContentView.mm           |   2 +-
 .../Modal/RCTFabricModalHostViewController.h  |   2 -
 .../Modal/RCTFabricModalHostViewController.mm |   2 -
 .../Modal/RCTModalHostViewComponentView.mm    |   2 -
 .../RCTSafeAreaViewComponentView.mm           |   2 +-
 React/Modules/RCTLayoutAnimation.m            |   4 -
 .../RCTRedBoxExtraDataViewController.m        |   6 -
 React/Modules/RCTUIManager.m                  |   4 -
 React/Profiler/RCTProfile.m                   |   4 -
 React/React-RCTFabric.podspec                 |   2 +-
 React/Views/RCTComponentData.m                |   2 -
 React/Views/RCTModalHostView.h                |   6 -
 React/Views/RCTModalHostView.m                |  59 +---
 React/Views/RCTModalHostViewController.h      |   2 -
 React/Views/RCTModalHostViewController.m      |   6 -
 React/Views/RCTModalHostViewManager.m         |   6 -
 React/Views/RCTProgressViewManager.m          |   2 -
 React/Views/RCTTVView.h                       |  31 ---
 React/Views/RCTTVView.m                       | 258 ------------------
 React/Views/RCTViewManager.m                  |  15 -
 React/Views/ScrollView/RCTScrollView.m        |  23 +-
 React/Views/ScrollView/RCTScrollViewManager.m |   2 -
 ReactCommon/React-Fabric.podspec              |   2 +-
 ReactCommon/ReactCommon.podspec               |   2 +-
 .../callinvoker/React-callinvoker.podspec     |   2 +-
 ReactCommon/jsi/React-jsi.podspec             |   2 +-
 .../jsiexecutor/React-jsiexecutor.podspec     |   2 +-
 .../jsinspector/React-jsinspector.podspec     |   2 +-
 .../reactperflogger/React-perflogger.podspec  |   2 +-
 .../React-runtimeexecutor.podspec             |   2 +-
 ReactCommon/yoga/Yoga.podspec                 |   2 +-
 index.js                                      |   4 -
 packages/rn-tester/Podfile.lock               |  50 ++--
 .../TVEventHandler/TVEventHandlerExample.js   |  89 ------
 .../rn-tester/js/utils/RNTesterList.ios.js    |   5 -
 scripts/.tests.env                            |   1 -
 scripts/ios-configure-glog.sh                 |  10 -
 .../ios/HelloWorld.xcodeproj/project.pbxproj  |   1 -
 third-party-podspecs/DoubleConversion.podspec |   2 +-
 third-party-podspecs/glog.podspec             |   2 +-
 93 files changed, 87 insertions(+), 1463 deletions(-)
 delete mode 100644 Libraries/Components/AppleTV/TVEventHandler.js
 delete mode 100644 Libraries/Components/Touchable/TVTouchable.js
 delete mode 100644 Libraries/DeprecatedPropTypes/DeprecatedTVViewPropTypes.js
 delete mode 100644 React/Base/RCTTVRemoteHandler.h
 delete mode 100644 React/Base/RCTTVRemoteHandler.m
 delete mode 100644 React/CoreModules/RCTTVNavigationEventEmitter.h
 delete mode 100644 React/CoreModules/RCTTVNavigationEventEmitter.mm
 delete mode 100644 React/Views/RCTTVView.h
 delete mode 100644 React/Views/RCTTVView.m
 delete mode 100644 packages/rn-tester/js/examples/TVEventHandler/TVEventHandlerExample.js

diff --git a/.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh b/.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh
index 4c12de632141fd..c930937a593021 100755
--- a/.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh
+++ b/.circleci/Dockerfiles/scripts/run-ci-e2e-tests.sh
@@ -67,11 +67,6 @@ while :; do
       shift
       ;;
 
-    --tvos)
-      RUN_IOS=1
-      shift
-      ;;
-
     *)
       break
   esac
diff --git a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
index ef883132395026..1fc93c03536570 100644
--- a/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
+++ b/Libraries/ActionSheetIOS/React-RCTActionSheet.podspec
@@ -24,10 +24,10 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/actionsheetios"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "*.{m}"
-  s.preserve_paths          = "package.json", "LICENSE", "LICENSE-docs"
+  s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.header_dir             = "RCTActionSheet"
 
   s.dependency "React-Core/RCTActionSheetHeaders", version
diff --git a/Libraries/Blob/React-RCTBlob.podspec b/Libraries/Blob/React-RCTBlob.podspec
index 045cf27ab9d0f8..9d691b100ab9fa 100644
--- a/Libraries/Blob/React-RCTBlob.podspec
+++ b/Libraries/Blob/React-RCTBlob.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{h,m,mm}"
diff --git a/Libraries/Components/AppleTV/TVEventHandler.js b/Libraries/Components/AppleTV/TVEventHandler.js
deleted file mode 100644
index d3f475a1fdb777..00000000000000
--- a/Libraries/Components/AppleTV/TVEventHandler.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-import NativeEventEmitter from '../../EventEmitter/NativeEventEmitter';
-import Platform from '../../Utilities/Platform';
-import {type EventSubscription} from '../../vendor/emitter/EventEmitter';
-import NativeTVNavigationEventEmitter from './NativeTVNavigationEventEmitter';
-
-class TVEventHandler {
-  __nativeTVNavigationEventListener: ?EventSubscription = null;
-  __nativeTVNavigationEventEmitter: ?NativeEventEmitter = null;
-
-  enable(component: ?any, callback: Function): void {
-    if (Platform.OS === 'ios' && !NativeTVNavigationEventEmitter) {
-      return;
-    }
-
-    this.__nativeTVNavigationEventEmitter = new NativeEventEmitter(
-      NativeTVNavigationEventEmitter,
-    );
-    this.__nativeTVNavigationEventListener = this.__nativeTVNavigationEventEmitter.addListener(
-      'onHWKeyEvent',
-      data => {
-        if (callback) {
-          callback(component, data);
-        }
-      },
-    );
-  }
-
-  disable(): void {
-    if (this.__nativeTVNavigationEventListener) {
-      this.__nativeTVNavigationEventListener.remove();
-      delete this.__nativeTVNavigationEventListener;
-    }
-    if (this.__nativeTVNavigationEventEmitter) {
-      delete this.__nativeTVNavigationEventEmitter;
-    }
-  }
-}
-
-module.exports = TVEventHandler;
diff --git a/Libraries/Components/ScrollView/ScrollView.js b/Libraries/Components/ScrollView/ScrollView.js
index 4da263df2e56a6..a069a24c733b87 100644
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -1206,13 +1206,12 @@ class ScrollView extends React.Component<Props, State> {
     if (refreshControl) {
       if (Platform.OS === 'ios') {
         // On iOS the RefreshControl is a child of the ScrollView.
-        // tvOS lacks native support for RefreshControl, so don't include it in that case
         return (
           /* $FlowFixMe(>=0.117.0 site=react_native_fb) This comment suppresses
            * an error found when Flow v0.117 was deployed. To see the error,
            * delete this comment and run Flow. */
           <ScrollViewClass {...props} ref={this._setNativeRef}>
-            {Platform.isTV ? null : refreshControl}
+            {refreshControl}
             {contentContainer}
           </ScrollViewClass>
         );
diff --git a/Libraries/Components/Touchable/TVTouchable.js b/Libraries/Components/Touchable/TVTouchable.js
deleted file mode 100644
index 01e51ba766509a..00000000000000
--- a/Libraries/Components/Touchable/TVTouchable.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- * @format
- */
-
-'use strict';
-
-import invariant from 'invariant';
-import ReactNative from '../../Renderer/shims/ReactNative';
-import type {
-  BlurEvent,
-  FocusEvent,
-  PressEvent,
-} from '../../Types/CoreEventTypes';
-import Platform from '../../Utilities/Platform';
-import TVEventHandler from '../../Components/AppleTV/TVEventHandler';
-
-type TVTouchableConfig = $ReadOnly<{|
-  getDisabled: () => boolean,
-  onBlur: (event: BlurEvent) => mixed,
-  onFocus: (event: FocusEvent) => mixed,
-  onPress: (event: PressEvent) => mixed,
-|}>;
-
-export default class TVTouchable {
-  _tvEventHandler: TVEventHandler;
-
-  constructor(component: any, config: TVTouchableConfig) {
-    invariant(Platform.isTV, 'TVTouchable: Requires `Platform.isTV`.');
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(component, (_, tvData) => {
-      tvData.dispatchConfig = {};
-      if (ReactNative.findNodeHandle(component) === tvData.tag) {
-        if (tvData.eventType === 'focus') {
-          config.onFocus(tvData);
-        } else if (tvData.eventType === 'blur') {
-          config.onBlur(tvData);
-        } else if (tvData.eventType === 'select') {
-          if (!config.getDisabled()) {
-            config.onPress(tvData);
-          }
-        }
-      }
-    });
-  }
-
-  destroy(): void {
-    this._tvEventHandler.disable();
-  }
-}
diff --git a/Libraries/Components/Touchable/Touchable.js b/Libraries/Components/Touchable/Touchable.js
index 8bfa1cb75eeb26..8b232d13d467be 100644
--- a/Libraries/Components/Touchable/Touchable.js
+++ b/Libraries/Components/Touchable/Touchable.js
@@ -16,7 +16,6 @@ const Position = require('./Position');
 const React = require('react');
 const ReactNative = require('../../Renderer/shims/ReactNative');
 const StyleSheet = require('../../StyleSheet/StyleSheet');
-const TVEventHandler = require('../AppleTV/TVEventHandler');
 const UIManager = require('../../ReactNative/UIManager');
 const View = require('../View/View');
 const SoundManager = require('../Sound/SoundManager');
@@ -370,33 +369,12 @@ const TouchableMixin = {
     if (!Platform.isTV) {
       return;
     }
-
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(this, function(cmp, evt) {
-      const myTag = ReactNative.findNodeHandle(cmp);
-      evt.dispatchConfig = {};
-      if (myTag === evt.tag) {
-        if (evt.eventType === 'focus') {
-          cmp.touchableHandleFocus(evt);
-        } else if (evt.eventType === 'blur') {
-          cmp.touchableHandleBlur(evt);
-        } else if (evt.eventType === 'select' && Platform.OS !== 'android') {
-          cmp.touchableHandlePress &&
-            !cmp.props.disabled &&
-            cmp.touchableHandlePress(evt);
-        }
-      }
-    });
   },
 
   /**
    * Clear all timeouts on unmount
    */
   componentWillUnmount: function() {
-    if (this._tvEventHandler) {
-      this._tvEventHandler.disable();
-      delete this._tvEventHandler;
-    }
     this.touchableDelayTimeout && clearTimeout(this.touchableDelayTimeout);
     this.longPressDelayTimeout && clearTimeout(this.longPressDelayTimeout);
     this.pressOutDelayTimeout && clearTimeout(this.pressOutDelayTimeout);
diff --git a/Libraries/Components/Touchable/TouchableBounce.js b/Libraries/Components/Touchable/TouchableBounce.js
index 0403be409eca60..49a9a35f078d64 100644
--- a/Libraries/Components/Touchable/TouchableBounce.js
+++ b/Libraries/Components/Touchable/TouchableBounce.js
@@ -15,7 +15,6 @@ import Pressability, {
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
-import TVTouchable from './TVTouchable';
 import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 import {Animated, Platform} from 'react-native';
 import * as React from 'react';
@@ -38,8 +37,6 @@ type State = $ReadOnly<{|
 |}>;
 
 class TouchableBounce extends React.Component<Props, State> {
-  _tvTouchable: ?TVTouchable;
-
   state: State = {
     pressability: new Pressability(this._createPressabilityConfig()),
     scale: new Animated.Value(1),
@@ -172,39 +169,11 @@ class TouchableBounce extends React.Component<Props, State> {
     );
   }
 
-  componentDidMount(): void {
-    if (Platform.isTV) {
-      this._tvTouchable = new TVTouchable(this, {
-        getDisabled: () => this.props.disabled === true,
-        onBlur: event => {
-          if (this.props.onBlur != null) {
-            this.props.onBlur(event);
-          }
-        },
-        onFocus: event => {
-          if (this.props.onFocus != null) {
-            this.props.onFocus(event);
-          }
-        },
-        onPress: event => {
-          if (this.props.onPress != null) {
-            this.props.onPress(event);
-          }
-        },
-      });
-    }
-  }
-
   componentDidUpdate(prevProps: Props, prevState: State) {
     this.state.pressability.configure(this._createPressabilityConfig());
   }
 
   componentWillUnmount(): void {
-    if (Platform.isTV) {
-      if (this._tvTouchable != null) {
-        this._tvTouchable.destroy();
-      }
-    }
     this.state.pressability.reset();
   }
 }
diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
index 9987ec7f704245..327d455e283b6c 100644
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -16,7 +16,6 @@ import Pressability, {
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import StyleSheet, {type ViewStyleProp} from '../../StyleSheet/StyleSheet';
 import type {ColorValue} from '../../StyleSheet/StyleSheet';
-import TVTouchable from './TVTouchable';
 import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 import Platform from '../../Utilities/Platform';
 import View from '../../Components/View/View';
@@ -158,7 +157,6 @@ type State = $ReadOnly<{|
 class TouchableHighlight extends React.Component<Props, State> {
   _hideTimeout: ?TimeoutID;
   _isMounted: boolean = false;
-  _tvTouchable: ?TVTouchable;
 
   state: State = {
     pressability: new Pressability(this._createPressabilityConfig()),
@@ -335,26 +333,6 @@ class TouchableHighlight extends React.Component<Props, State> {
 
   componentDidMount(): void {
     this._isMounted = true;
-    if (Platform.isTV) {
-      this._tvTouchable = new TVTouchable(this, {
-        getDisabled: () => this.props.disabled === true,
-        onBlur: event => {
-          if (this.props.onBlur != null) {
-            this.props.onBlur(event);
-          }
-        },
-        onFocus: event => {
-          if (this.props.onFocus != null) {
-            this.props.onFocus(event);
-          }
-        },
-        onPress: event => {
-          if (this.props.onPress != null) {
-            this.props.onPress(event);
-          }
-        },
-      });
-    }
   }
 
   componentDidUpdate(prevProps: Props, prevState: State) {
@@ -366,11 +344,6 @@ class TouchableHighlight extends React.Component<Props, State> {
     if (this._hideTimeout != null) {
       clearTimeout(this._hideTimeout);
     }
-    if (Platform.isTV) {
-      if (this._tvTouchable != null) {
-        this._tvTouchable.destroy();
-      }
-    }
     this.state.pressability.reset();
   }
 }
diff --git a/Libraries/Components/Touchable/TouchableNativeFeedback.js b/Libraries/Components/Touchable/TouchableNativeFeedback.js
index dda6c4bf371093..907f9670537f52 100644
--- a/Libraries/Components/Touchable/TouchableNativeFeedback.js
+++ b/Libraries/Components/Touchable/TouchableNativeFeedback.js
@@ -14,7 +14,6 @@ import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
-import TVTouchable from './TVTouchable';
 import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 import {Commands} from 'react-native/Libraries/Components/View/ViewNativeComponent';
 import ReactNative from 'react-native/Libraries/Renderer/shims/ReactNative';
@@ -164,8 +163,6 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
   static canUseNativeForeground: () => boolean = () =>
     Platform.OS === 'android' && Platform.Version >= 23;
 
-  _tvTouchable: ?TVTouchable;
-
   state: State = {
     pressability: new Pressability(this._createPressabilityConfig()),
   };
@@ -301,39 +298,11 @@ class TouchableNativeFeedback extends React.Component<Props, State> {
     );
   }
 
-  componentDidMount(): void {
-    if (Platform.isTV) {
-      this._tvTouchable = new TVTouchable(this, {
-        getDisabled: () => this.props.disabled === true,
-        onBlur: event => {
-          if (this.props.onBlur != null) {
-            this.props.onBlur(event);
-          }
-        },
-        onFocus: event => {
-          if (this.props.onFocus != null) {
-            this.props.onFocus(event);
-          }
-        },
-        onPress: event => {
-          if (this.props.onPress != null) {
-            this.props.onPress(event);
-          }
-        },
-      });
-    }
-  }
-
   componentDidUpdate(prevProps: Props, prevState: State) {
     this.state.pressability.configure(this._createPressabilityConfig());
   }
 
   componentWillUnmount(): void {
-    if (Platform.isTV) {
-      if (this._tvTouchable != null) {
-        this._tvTouchable.destroy();
-      }
-    }
     this.state.pressability.reset();
   }
 }
diff --git a/Libraries/Components/Touchable/TouchableOpacity.js b/Libraries/Components/Touchable/TouchableOpacity.js
index f1d09510e03cb8..8023030a36f962 100644
--- a/Libraries/Components/Touchable/TouchableOpacity.js
+++ b/Libraries/Components/Touchable/TouchableOpacity.js
@@ -14,7 +14,6 @@ import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
-import TVTouchable from './TVTouchable';
 import typeof TouchableWithoutFeedback from './TouchableWithoutFeedback';
 import Animated from 'react-native/Libraries/Animated/Animated';
 import Easing from 'react-native/Libraries/Animated/Easing';
@@ -132,8 +131,6 @@ type State = $ReadOnly<{|
  *
  */
 class TouchableOpacity extends React.Component<Props, State> {
-  _tvTouchable: ?TVTouchable;
-
   state: State = {
     anim: new Animated.Value(this._getChildStyleOpacityWithDefault()),
     pressability: new Pressability(this._createPressabilityConfig()),
@@ -258,29 +255,6 @@ class TouchableOpacity extends React.Component<Props, State> {
     );
   }
 
-  componentDidMount(): void {
-    if (Platform.isTV) {
-      this._tvTouchable = new TVTouchable(this, {
-        getDisabled: () => this.props.disabled === true,
-        onBlur: event => {
-          if (this.props.onBlur != null) {
-            this.props.onBlur(event);
-          }
-        },
-        onFocus: event => {
-          if (this.props.onFocus != null) {
-            this.props.onFocus(event);
-          }
-        },
-        onPress: event => {
-          if (this.props.onPress != null) {
-            this.props.onPress(event);
-          }
-        },
-      });
-    }
-  }
-
   componentDidUpdate(prevProps: Props, prevState: State) {
     this.state.pressability.configure(this._createPressabilityConfig());
     if (this.props.disabled !== prevProps.disabled) {
@@ -289,11 +263,6 @@ class TouchableOpacity extends React.Component<Props, State> {
   }
 
   componentWillUnmount(): void {
-    if (Platform.isTV) {
-      if (this._tvTouchable != null) {
-        this._tvTouchable.destroy();
-      }
-    }
     this.state.pressability.reset();
   }
 }
diff --git a/Libraries/Components/Touchable/TouchableWithoutFeedback.js b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
index 0cb20d0dbad078..d50b1b0bcb1a4d 100755
--- a/Libraries/Components/Touchable/TouchableWithoutFeedback.js
+++ b/Libraries/Components/Touchable/TouchableWithoutFeedback.js
@@ -14,7 +14,6 @@ import Pressability, {
   type PressabilityConfig,
 } from '../../Pressability/Pressability';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
-import TVTouchable from './TVTouchable';
 import type {
   AccessibilityActionEvent,
   AccessibilityActionInfo,
@@ -94,8 +93,6 @@ const PASSTHROUGH_PROPS = [
 ];
 
 class TouchableWithoutFeedback extends React.Component<Props, State> {
-  _tvTouchable: ?TVTouchable;
-
   state: State = {
     pressability: new Pressability(createPressabilityConfig(this.props)),
   };
@@ -134,39 +131,11 @@ class TouchableWithoutFeedback extends React.Component<Props, State> {
     return React.cloneElement(element, elementProps, ...children);
   }
 
-  componentDidMount(): void {
-    if (Platform.isTV) {
-      this._tvTouchable = new TVTouchable(this, {
-        getDisabled: () => this.props.disabled === true,
-        onBlur: event => {
-          if (this.props.onBlur != null) {
-            this.props.onBlur(event);
-          }
-        },
-        onFocus: event => {
-          if (this.props.onFocus != null) {
-            this.props.onFocus(event);
-          }
-        },
-        onPress: event => {
-          if (this.props.onPress != null) {
-            this.props.onPress(event);
-          }
-        },
-      });
-    }
-  }
-
   componentDidUpdate(): void {
     this.state.pressability.configure(createPressabilityConfig(this.props));
   }
 
   componentWillUnmount(): void {
-    if (Platform.isTV) {
-      if (this._tvTouchable != null) {
-        this._tvTouchable.destroy();
-      }
-    }
     this.state.pressability.reset();
   }
 }
diff --git a/Libraries/DeprecatedPropTypes/DeprecatedTVViewPropTypes.js b/Libraries/DeprecatedPropTypes/DeprecatedTVViewPropTypes.js
deleted file mode 100644
index 22628f0e469446..00000000000000
--- a/Libraries/DeprecatedPropTypes/DeprecatedTVViewPropTypes.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow strict-local
- */
-
-'use strict';
-
-const PropTypes = require('prop-types');
-
-const DeprecatedTVViewPropTypes = {
-  hasTVPreferredFocus: PropTypes.bool,
-  tvParallaxShiftDistanceX: PropTypes.number,
-  tvParallaxShiftDistanceY: PropTypes.number,
-  tvParallaxTiltAngle: PropTypes.number,
-  tvParallaxMagnification: PropTypes.number,
-};
-
-module.exports = DeprecatedTVViewPropTypes;
diff --git a/Libraries/FBLazyVector/FBLazyVector.podspec b/Libraries/FBLazyVector/FBLazyVector.podspec
index 439c326f9de31f..925860e7e9f242 100644
--- a/Libraries/FBLazyVector/FBLazyVector.podspec
+++ b/Libraries/FBLazyVector/FBLazyVector.podspec
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "FBLazyVector"
diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec
index bd2a78e45cccbb..de5e03607754d2 100644
--- a/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec
+++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
diff --git a/Libraries/Image/React-RCTImage.podspec b/Libraries/Image/React-RCTImage.podspec
index d0de0bd722e4e1..2678065c862b1e 100644
--- a/Libraries/Image/React-RCTImage.podspec
+++ b/Libraries/Image/React-RCTImage.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/image"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/LinkingIOS/React-RCTLinking.podspec b/Libraries/LinkingIOS/React-RCTLinking.podspec
index 5f07abebc676a3..fe2c5d33079dec 100644
--- a/Libraries/LinkingIOS/React-RCTLinking.podspec
+++ b/Libraries/LinkingIOS/React-RCTLinking.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/linking"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/NativeAnimation/React-RCTAnimation.podspec b/Libraries/NativeAnimation/React-RCTAnimation.podspec
index 01f605c9822f46..cf09cbff7c0c05 100644
--- a/Libraries/NativeAnimation/React-RCTAnimation.podspec
+++ b/Libraries/NativeAnimation/React-RCTAnimation.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "{Drivers/*,Nodes/*,*}.{m,mm}"
diff --git a/Libraries/Network/React-RCTNetwork.podspec b/Libraries/Network/React-RCTNetwork.podspec
index e21afd21a309d7..e868267d51d079 100644
--- a/Libraries/Network/React-RCTNetwork.podspec
+++ b/Libraries/Network/React-RCTNetwork.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
index c4281361e6d673..e486252c704b4a 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.h
@@ -13,7 +13,7 @@ extern NSString *const RCTRemoteNotificationReceived;
 
 typedef void (^RCTRemoteNotificationCallback)(UIBackgroundFetchResult result);
 
-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_UIKITFORMAC
 + (void)didRegisterUserNotificationSettings:(UIUserNotificationSettings *)notificationSettings;
 + (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken;
 + (void)didReceiveRemoteNotification:(NSDictionary *)notification;
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
index 95eec384e9a9a6..02fb7e4214bdcb 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
@@ -25,7 +25,7 @@
 
 static NSString *const kErrorUnableToRequestPermissions = @"E_UNABLE_TO_REQUEST_PERMISSIONS";
 
-#if !TARGET_OS_TV
+#if !TARGET_OS_UIKITFORMAC
 @implementation RCTConvert (NSCalendarUnit)
 
 RCT_ENUM_CONVERTER(NSCalendarUnit,
@@ -79,11 +79,11 @@ + (UILocalNotification *)UILocalNotification:(id)json
 #else
 @interface RCTPushNotificationManager () <NativePushNotificationManagerIOS>
 @end
-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#endif // TARGET_OS_UIKITFORMAC
 
 @implementation RCTPushNotificationManager
 
-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_UIKITFORMAC
 
 static NSDictionary *RCTFormatLocalNotification(UILocalNotification *notification)
 {
@@ -128,7 +128,7 @@ @implementation RCTPushNotificationManager
   return formattedNotification;
 }
 
-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#endif // TARGET_OS_UIKITFORMAC
 
 RCT_EXPORT_MODULE()
 
@@ -137,7 +137,7 @@ - (dispatch_queue_t)methodQueue
   return dispatch_get_main_queue();
 }
 
-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_UIKITFORMAC
 - (void)startObserving
 {
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -472,7 +472,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   }];
 }
 
-#else //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#else // TARGET_OS_UIKITFORMAC
 
 RCT_EXPORT_METHOD(onFinishRemoteNotification:(NSString *)notificationId fetchResult:(NSString *)fetchResult)
 {
@@ -557,7 +557,7 @@ - (void)handleRemoteNotificationRegistrationError:(NSNotification *)notification
   return @[];
 }
 
-#endif //TARGET_OS_TV / TARGET_OS_UIKITFORMAC
+#endif // TARGET_OS_UIKITFORMAC
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
 {
diff --git a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
index a2c915316eb7a0..f1f734adabd1a4 100644
--- a/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
+++ b/Libraries/PushNotificationIOS/React-RCTPushNotification.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/pushnotificationios"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/RCTRequired/RCTRequired.podspec b/Libraries/RCTRequired/RCTRequired.podspec
index 3c55234fbd3e50..45d537db606814 100644
--- a/Libraries/RCTRequired/RCTRequired.podspec
+++ b/Libraries/RCTRequired/RCTRequired.podspec
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "RCTRequired"
diff --git a/Libraries/Settings/React-RCTSettings.podspec b/Libraries/Settings/React-RCTSettings.podspec
index 45c92ba557b623..c9790ff0e8e29d 100644
--- a/Libraries/Settings/React-RCTSettings.podspec
+++ b/Libraries/Settings/React-RCTSettings.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/settings"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/Libraries/Text/React-RCTText.podspec b/Libraries/Text/React-RCTText.podspec
index 6f94706d54e3bc..af8a8f6ec70156 100644
--- a/Libraries/Text/React-RCTText.podspec
+++ b/Libraries/Text/React-RCTText.podspec
@@ -24,7 +24,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/text"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "**/*.{h,m}"
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
diff --git a/Libraries/Text/Text/RCTTextView.m b/Libraries/Text/Text/RCTTextView.m
index 0c13d038cb3502..bda5f8d078f428 100644
--- a/Libraries/Text/Text/RCTTextView.m
+++ b/Libraries/Text/Text/RCTTextView.m
@@ -227,7 +227,7 @@ - (void)disableContextMenu
 - (void)handleLongPress:(UILongPressGestureRecognizer *)gesture
 {
   // TODO: Adopt showMenuFromRect (necessary for UIKitForMac)
-#if !TARGET_OS_TV && !TARGET_OS_UIKITFORMAC
+#if !TARGET_OS_UIKITFORMAC
   UIMenuController *menuController = [UIMenuController sharedMenuController];
 
   if (menuController.isMenuVisible) {
@@ -259,7 +259,6 @@ - (BOOL)canPerformAction:(SEL)action withSender:(id)sender
 
 - (void)copy:(id)sender
 {
-#if !TARGET_OS_TV
   NSAttributedString *attributedText = _textStorage;
 
   NSMutableDictionary *item = [NSMutableDictionary new];
@@ -276,7 +275,6 @@ - (void)copy:(id)sender
 
   UIPasteboard *pasteboard = [UIPasteboard generalPasteboard];
   pasteboard.items = @[item];
-#endif
 }
 
 @end
diff --git a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
index 6f9696029b049f..7a661b183fa008 100644
--- a/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
+++ b/Libraries/Text/TextInput/Multiline/RCTMultilineTextInputViewManager.m
@@ -19,8 +19,6 @@ - (UIView *)view
 
 #pragma mark - Multiline <TextInput> (aka TextView) specific properties
 
-#if !TARGET_OS_TV
 RCT_REMAP_VIEW_PROPERTY(dataDetectorTypes, backedTextInputView.dataDetectorTypes, UIDataDetectorTypes)
-#endif
 
 @end
diff --git a/Libraries/Text/TextInput/Multiline/RCTUITextView.m b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
index a949f1d73b103f..a417cc11751099 100644
--- a/Libraries/Text/TextInput/Multiline/RCTUITextView.m
+++ b/Libraries/Text/TextInput/Multiline/RCTUITextView.m
@@ -51,9 +51,7 @@ - (instancetype)initWithFrame:(CGRect)frame
     self.textColor = [UIColor blackColor];
     // This line actually removes 5pt (default value) left and right padding in UITextView.
     self.textContainer.lineFragmentPadding = 0;
-#if !TARGET_OS_TV
     self.scrollsToTop = NO;
-#endif
     self.scrollEnabled = YES;
   }
 
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 9edad515f00861..01ab7f19d12267 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -245,7 +245,7 @@ - (void)setTextContentType:(NSString *)type
                           };
 
       #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 110000 /* __IPHONE_11_0 */
-        if (@available(iOS 11.0, tvOS 11.0, *)) {
+        if (@available(iOS 11.0, *)) {
           NSDictionary<NSString *, NSString *> * iOS11extras = @{@"username": UITextContentTypeUsername,
                                                                   @"password": UITextContentTypePassword};
 
@@ -257,7 +257,7 @@ - (void)setTextContentType:(NSString *)type
       #endif
 
       #if __IPHONE_OS_VERSION_MAX_ALLOWED >= 120000 /* __IPHONE_12_0 */
-        if (@available(iOS 12.0, tvOS 12.0, *)) {
+        if (@available(iOS 12.0, *)) {
           NSDictionary<NSString *, NSString *> * iOS12extras = @{@"newPassword": UITextContentTypeNewPassword,
                                                                   @"oneTimeCode": UITextContentTypeOneTimeCode};
 
@@ -572,7 +572,6 @@ - (void)didSetProps:(NSArray<NSString *> *)changedProps
 
 - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
 {
-  #if !TARGET_OS_TV
   __weak RCTBaseTextInputView *weakSelf = self;
   [_bridge.uiManager rootViewForReactTag:self.reactTag withCompletion:^(UIView *rootView) {
     RCTBaseTextInputView *strongSelf = weakSelf;
@@ -585,12 +584,10 @@ - (void)setCustomInputAccessoryViewWithNativeID:(NSString *)nativeID
       }
     }
   }];
-  #endif /* !TARGET_OS_TV */
 }
 
 - (void)setDefaultInputAccessoryView
 {
-  #if !TARGET_OS_TV
   UIView<RCTBackedTextInputViewProtocol> *textInputView = self.backedTextInputView;
   UIKeyboardType keyboardType = textInputView.keyboardType;
 
@@ -629,7 +626,6 @@ - (void)setDefaultInputAccessoryView
     textInputView.inputAccessoryView = nil;
   }
   [self reloadInputViewsIfNecessary];
-  #endif /* !TARGET_OS_TV */
 }
 
 - (void)reloadInputViewsIfNecessary
diff --git a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
index de77e47bf2d0d7..35db4d308733c4 100644
--- a/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
+++ b/Libraries/Text/TextInput/RCTInputAccessoryViewContent.m
@@ -30,7 +30,7 @@ - (instancetype)init
     _heightConstraint = [_safeAreaContainer.heightAnchor constraintEqualToConstant:0];
     _heightConstraint.active = YES;
 
-    if (@available(iOS 11.0, tvOS 11.0, *)) {
+    if (@available(iOS 11.0, *)) {
       [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor].active = YES;
       [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor].active = YES;
       [_safeAreaContainer.leadingAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.leadingAnchor].active = YES;
diff --git a/Libraries/TypeSafety/RCTTypeSafety.podspec b/Libraries/TypeSafety/RCTTypeSafety.podspec
index 1dd04a8c29a6e8..96d90e6949b1de 100644
--- a/Libraries/TypeSafety/RCTTypeSafety.podspec
+++ b/Libraries/TypeSafety/RCTTypeSafety.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
diff --git a/Libraries/Utilities/BackHandler.android.js b/Libraries/Utilities/BackHandler.android.js
index e762c1635f93f7..efb07ec5918ea6 100644
--- a/Libraries/Utilities/BackHandler.android.js
+++ b/Libraries/Utilities/BackHandler.android.js
@@ -35,10 +35,6 @@ RCTDeviceEventEmitter.addListener(DEVICE_BACK_EVENT, function() {
  * Android: Detect hardware back button presses, and programmatically invoke the default back button
  * functionality to exit the app if there are no listeners or if none of the listeners return true.
  *
- * tvOS: Detect presses of the menu button on the TV remote.  (Still to be implemented:
- * programmatically disable menu button handling
- * functionality to exit the app if there are no listeners or if none of the listeners return true.)
- *
  * iOS: Not applicable.
  *
  * The event subscriptions are called in reverse order (i.e. last registered subscription first),
@@ -82,8 +78,7 @@ const BackHandler: TBackHandler = {
   /**
    * Adds an event handler. Supported events:
    *
-   * - `hardwareBackPress`: Fires when the Android hardware back button is pressed or when the
-   * tvOS menu button is pressed.
+   * - `hardwareBackPress`: Fires when the Android hardware back button is pressed.
    */
   addEventListener: function(
     eventName: BackPressEventName,
diff --git a/Libraries/Utilities/BackHandler.ios.js b/Libraries/Utilities/BackHandler.ios.js
index 1407a57e95ff0d..2e1e5c4cd2a7ac 100644
--- a/Libraries/Utilities/BackHandler.ios.js
+++ b/Libraries/Utilities/BackHandler.ios.js
@@ -4,52 +4,18 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @flow strict-local
  * @format
+ * @flow
  */
 
-// On Apple TV, this implements back navigation using the TV remote's menu button.
-// On iOS, this just implements a stub.
-
 'use strict';
 
-const Platform = require('./Platform');
-const TVEventHandler = require('../Components/AppleTV/TVEventHandler');
+module.exports = require('../Components/UnimplementedViews/UnimplementedView');
 
 type BackPressEventName = 'backPress' | 'hardwareBackPress';
 
 function emptyFunction(): void {}
 
-/**
- * Detect hardware button presses for back navigation.
- *
- * Android: Detect hardware back button presses, and programmatically invoke the default back button
- * functionality to exit the app if there are no listeners or if none of the listeners return true.
- *
- * tvOS: Detect presses of the menu button on the TV remote.  (Still to be implemented:
- * programmatically disable menu button handling
- * functionality to exit the app if there are no listeners or if none of the listeners return true.)
- *
- * iOS: Not applicable.
- *
- * The event subscriptions are called in reverse order (i.e. last registered subscription first),
- * and if one subscription returns true then subscriptions registered earlier will not be called.
- *
- * Example:
- *
- * ```javascript
- * BackHandler.addEventListener('hardwareBackPress', function() {
- *  // this.onMainScreen and this.goBack are just examples, you need to use your own implementation here
- *  // Typically you would use the navigator here to go to the last state.
- *
- *  if (!this.onMainScreen()) {
- *    this.goBack();
- *    return true;
- *  }
- *  return false;
- * });
- * ```
- */
 type TBackHandler = {|
   +exitApp: () => void,
   +addEventListener: (
@@ -62,65 +28,14 @@ type TBackHandler = {|
   ) => void,
 |};
 
-let BackHandler: TBackHandler;
-
-if (Platform.isTV) {
-  const _tvEventHandler = new TVEventHandler();
-  const _backPressSubscriptions = new Set();
-
-  _tvEventHandler.enable(this, function(cmp, evt) {
-    if (evt && evt.eventType === 'menu') {
-      let invokeDefault = true;
-      const subscriptions = Array.from(
-        _backPressSubscriptions.values(),
-      ).reverse();
-
-      for (let i = 0; i < subscriptions.length; ++i) {
-        if (subscriptions[i]()) {
-          invokeDefault = false;
-          break;
-        }
-      }
-
-      if (invokeDefault) {
-        BackHandler.exitApp();
-      }
-    }
-  });
-
-  BackHandler = {
-    exitApp: emptyFunction,
-
-    addEventListener: function(
-      eventName: BackPressEventName,
-      handler: () => ?boolean,
-    ): {remove: () => void, ...} {
-      _backPressSubscriptions.add(handler);
-      return {
-        remove: () => BackHandler.removeEventListener(eventName, handler),
-      };
-    },
-
-    removeEventListener: function(
-      eventName: BackPressEventName,
-      handler: () => ?boolean,
-    ): void {
-      _backPressSubscriptions.delete(handler);
-    },
-  };
-} else {
-  BackHandler = {
-    exitApp: emptyFunction,
-    addEventListener(_eventName: BackPressEventName, _handler: () => ?boolean) {
-      return {
-        remove: emptyFunction,
-      };
-    },
-    removeEventListener(
-      _eventName: BackPressEventName,
-      _handler: () => ?boolean,
-    ) {},
-  };
-}
+let BackHandler: TBackHandler = {
+  exitApp: emptyFunction,
+  addEventListener(_eventName: BackPressEventName, _handler: Function) {
+    return {
+      remove: emptyFunction,
+    };
+  },
+  removeEventListener(_eventName: BackPressEventName, _handler: Function) {},
+};
 
 module.exports = BackHandler;
diff --git a/Libraries/Vibration/React-RCTVibration.podspec b/Libraries/Vibration/React-RCTVibration.podspec
index c08abe6407cc3a..87e0659e4d1c4f 100644
--- a/Libraries/Vibration/React-RCTVibration.podspec
+++ b/Libraries/Vibration/React-RCTVibration.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/vibration"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
diff --git a/React-Core.podspec b/React-Core.podspec
index 7079adab55bb27..5c69ed70f06778 100644
--- a/React-Core.podspec
+++ b/React-Core.podspec
@@ -41,7 +41,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.resource_bundle        = { "AccessibilityResources" => ["React/AccessibilityResources/*.lproj"]}
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
@@ -59,13 +59,6 @@ Pod::Spec.new do |s|
                                 "React/Fabric/**/*",
                                 "React/Tests/**/*",
                                 "React/Inspector/**/*"
-    ss.ios.exclude_files      = "React/**/RCTTV*.*"
-    ss.tvos.exclude_files     = "React/Modules/RCTClipboard*",
-                                "React/Views/RCTDatePicker*",
-                                "React/Views/RCTPicker*",
-                                "React/Views/RCTRefreshControl*",
-                                "React/Views/RCTSlider*",
-                                "React/Views/RCTSwitch*",
     ss.private_header_files   = "React/Cxx*/*.h"
   end
 
diff --git a/React.podspec b/React.podspec
index da482ff0154c7e..a6511d2d1aeadb 100644
--- a/React.podspec
+++ b/React.podspec
@@ -36,7 +36,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.preserve_paths         = "package.json", "LICENSE", "LICENSE-docs"
   s.cocoapods_version      = ">= 1.2.0"
diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index f3588b38ecb503..7ef3b233893ae9 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -416,7 +416,6 @@ + (UIKeyboardType)UIKeyboardType:(id)json RCT_DYNAMIC
   return type;
 }
 
-#if !TARGET_OS_TV
 RCT_MULTI_ENUM_CONVERTER(
     UIDataDetectorTypes,
     (@{
@@ -446,8 +445,6 @@ + (UIKeyboardType)UIKeyboardType:(id)json RCT_DYNAMIC
     WKDataDetectorTypePhoneNumber,
     unsignedLongLongValue)
 
-#endif // !TARGET_OS_TV
-
 RCT_ENUM_CONVERTER(
     UIKeyboardAppearance,
     (@{
@@ -500,7 +497,6 @@ + (UIKeyboardType)UIKeyboardType:(id)json RCT_DYNAMIC
     UIViewContentModeScaleAspectFill,
     integerValue)
 
-#if !TARGET_OS_TV
 RCT_ENUM_CONVERTER(
     UIBarStyle,
     (@{
@@ -511,7 +507,6 @@ + (UIKeyboardType)UIKeyboardType:(id)json RCT_DYNAMIC
     }),
     UIBarStyleDefault,
     integerValue)
-#endif
 
 static void convertCGStruct(const char *type, NSArray *fields, CGFloat *result, id json)
 {
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index 013c7506850fd2..d9fbc37b38dfae 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -29,11 +29,6 @@
 #import "RCTView.h"
 #import "UIView+React.h"
 
-#if TARGET_OS_TV
-#import "RCTTVNavigationEventEmitter.h"
-#import "RCTTVRemoteHandler.h"
-#endif
-
 NSString *const RCTContentDidAppearNotification = @"RCTContentDidAppearNotification";
 
 @interface RCTUIManager (RCTRootView)
@@ -89,13 +84,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
                                                  name:RCTContentDidAppearNotification
                                                object:self];
 
-#if TARGET_OS_TV
-    self.tvRemoteHandler = [RCTTVRemoteHandler new];
-    for (NSString *key in [self.tvRemoteHandler.tvRemoteGestureRecognizers allKeys]) {
-      [self addGestureRecognizer:self.tvRemoteHandler.tvRemoteGestureRecognizers[key]];
-    }
-#endif
-
     [self showLoadingView];
 
     // Immediately schedule the application to be started.
@@ -121,16 +109,6 @@ - (instancetype)initWithBundleURL:(NSURL *)bundleURL
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : (NSCoder *)aDecoder)
 
-#if TARGET_OS_TV
-- (UIView *)preferredFocusedView
-{
-  if (self.reactPreferredFocusedView) {
-    return self.reactPreferredFocusedView;
-  }
-  return [super preferredFocusedView];
-}
-#endif
-
 #pragma mark - passThroughTouches
 
 - (BOOL)passThroughTouches
diff --git a/React/Base/RCTRootViewInternal.h b/React/Base/RCTRootViewInternal.h
index c6a21c9ab1cb2f..8e28dd453570c1 100644
--- a/React/Base/RCTRootViewInternal.h
+++ b/React/Base/RCTRootViewInternal.h
@@ -7,8 +7,6 @@
 
 #import <React/RCTRootView.h>
 
-@class RCTTVRemoteHandler;
-
 /**
  * The interface provides a set of functions that allow other internal framework
  * classes to change the RCTRootViews's internal state.
@@ -21,14 +19,6 @@
  */
 @property (readwrite, nonatomic, assign) CGSize intrinsicContentSize;
 
-/**
- * TV remote gesture recognizers
- */
-#if TARGET_OS_TV
-@property (nonatomic, strong) RCTTVRemoteHandler *tvRemoteHandler;
-@property (nonatomic, strong) UIView *reactPreferredFocusedView;
-#endif
-
 - (void)contentViewInvalidated;
 
 @end
diff --git a/React/Base/RCTTVRemoteHandler.h b/React/Base/RCTTVRemoteHandler.h
deleted file mode 100644
index 10d56906901677..00000000000000
--- a/React/Base/RCTTVRemoteHandler.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <UIKit/UIKit.h>
-
-extern NSString *const RCTTVRemoteEventMenu;
-extern NSString *const RCTTVRemoteEventPlayPause;
-extern NSString *const RCTTVRemoteEventSelect;
-
-extern NSString *const RCTTVRemoteEventLongPlayPause;
-extern NSString *const RCTTVRemoteEventLongSelect;
-
-extern NSString *const RCTTVRemoteEventLeft;
-extern NSString *const RCTTVRemoteEventRight;
-extern NSString *const RCTTVRemoteEventUp;
-extern NSString *const RCTTVRemoteEventDown;
-
-extern NSString *const RCTTVRemoteEventSwipeLeft;
-extern NSString *const RCTTVRemoteEventSwipeRight;
-extern NSString *const RCTTVRemoteEventSwipeUp;
-extern NSString *const RCTTVRemoteEventSwipeDown;
-
-@interface RCTTVRemoteHandler : NSObject
-
-@property (nonatomic, copy, readonly) NSDictionary *tvRemoteGestureRecognizers;
-
-@end
diff --git a/React/Base/RCTTVRemoteHandler.m b/React/Base/RCTTVRemoteHandler.m
deleted file mode 100644
index aadbacec4b7eb5..00000000000000
--- a/React/Base/RCTTVRemoteHandler.m
+++ /dev/null
@@ -1,233 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTTVRemoteHandler.h"
-
-#import <UIKit/UIGestureRecognizerSubclass.h>
-
-#import "RCTAssert.h"
-#import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
-#import "RCTLog.h"
-#import "RCTRootView.h"
-#import "RCTTVNavigationEventEmitter.h"
-#import "RCTUIManager.h"
-#import "RCTUtils.h"
-#import "RCTView.h"
-#import "UIView+React.h"
-
-#if __has_include("RCTDevMenu.h")
-#import "RCTDevMenu.h"
-#endif
-
-NSString *const RCTTVRemoteEventMenu = @"menu";
-NSString *const RCTTVRemoteEventPlayPause = @"playPause";
-NSString *const RCTTVRemoteEventSelect = @"select";
-
-NSString *const RCTTVRemoteEventLongPlayPause = @"longPlayPause";
-NSString *const RCTTVRemoteEventLongSelect = @"longSelect";
-
-NSString *const RCTTVRemoteEventLeft = @"left";
-NSString *const RCTTVRemoteEventRight = @"right";
-NSString *const RCTTVRemoteEventUp = @"up";
-NSString *const RCTTVRemoteEventDown = @"down";
-
-NSString *const RCTTVRemoteEventSwipeLeft = @"swipeLeft";
-NSString *const RCTTVRemoteEventSwipeRight = @"swipeRight";
-NSString *const RCTTVRemoteEventSwipeUp = @"swipeUp";
-NSString *const RCTTVRemoteEventSwipeDown = @"swipeDown";
-
-@implementation RCTTVRemoteHandler {
-  NSMutableDictionary<NSString *, UIGestureRecognizer *> *_tvRemoteGestureRecognizers;
-}
-
-- (instancetype)init
-{
-  if ((self = [super init])) {
-    _tvRemoteGestureRecognizers = [NSMutableDictionary dictionary];
-
-    // Recognizers for Apple TV remote buttons
-
-    // Play/Pause
-    [self addTapGestureRecognizerWithSelector:@selector(playPausePressed:)
-                                    pressType:UIPressTypePlayPause
-                                         name:RCTTVRemoteEventPlayPause];
-
-    // Menu
-    [self addTapGestureRecognizerWithSelector:@selector(menuPressed:)
-                                    pressType:UIPressTypeMenu
-                                         name:RCTTVRemoteEventMenu];
-
-    // Select
-    [self addTapGestureRecognizerWithSelector:@selector(selectPressed:)
-                                    pressType:UIPressTypeSelect
-                                         name:RCTTVRemoteEventSelect];
-
-    // Up
-    [self addTapGestureRecognizerWithSelector:@selector(tappedUp:)
-                                    pressType:UIPressTypeUpArrow
-                                         name:RCTTVRemoteEventUp];
-
-    // Down
-    [self addTapGestureRecognizerWithSelector:@selector(tappedDown:)
-                                    pressType:UIPressTypeDownArrow
-                                         name:RCTTVRemoteEventDown];
-
-    // Left
-    [self addTapGestureRecognizerWithSelector:@selector(tappedLeft:)
-                                    pressType:UIPressTypeLeftArrow
-                                         name:RCTTVRemoteEventLeft];
-
-    // Right
-    [self addTapGestureRecognizerWithSelector:@selector(tappedRight:)
-                                    pressType:UIPressTypeRightArrow
-                                         name:RCTTVRemoteEventRight];
-
-    // Recognizers for long button presses
-    // We don't intercept long menu press -- that's used by the system to go to the home screen
-
-    [self addLongPressGestureRecognizerWithSelector:@selector(longPlayPausePressed:)
-                                          pressType:UIPressTypePlayPause
-                                               name:RCTTVRemoteEventLongPlayPause];
-
-    [self addLongPressGestureRecognizerWithSelector:@selector(longSelectPressed:)
-                                          pressType:UIPressTypeSelect
-                                               name:RCTTVRemoteEventLongSelect];
-
-    // Recognizers for Apple TV remote trackpad swipes
-
-    // Up
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedUp:)
-                                      direction:UISwipeGestureRecognizerDirectionUp
-                                           name:RCTTVRemoteEventSwipeUp];
-
-    // Down
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedDown:)
-                                      direction:UISwipeGestureRecognizerDirectionDown
-                                           name:RCTTVRemoteEventSwipeDown];
-
-    // Left
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedLeft:)
-                                      direction:UISwipeGestureRecognizerDirectionLeft
-                                           name:RCTTVRemoteEventSwipeLeft];
-
-    // Right
-    [self addSwipeGestureRecognizerWithSelector:@selector(swipedRight:)
-                                      direction:UISwipeGestureRecognizerDirectionRight
-                                           name:RCTTVRemoteEventSwipeRight];
-  }
-
-  return self;
-}
-
-- (void)playPausePressed:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventPlayPause toView:r.view];
-}
-
-- (void)menuPressed:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventMenu toView:r.view];
-}
-
-- (void)selectPressed:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventSelect toView:r.view];
-}
-
-- (void)longPlayPausePressed:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventLongPlayPause toView:r.view];
-
-#if __has_include("RCTDevMenu.h") && RCT_DEV
-  // If shake to show is enabled on device, use long play/pause event to show dev menu
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTShowDevMenuNotification object:nil];
-#endif
-}
-
-- (void)longSelectPressed:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventLongSelect toView:r.view];
-}
-
-- (void)swipedUp:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeUp toView:r.view];
-}
-
-- (void)swipedDown:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeDown toView:r.view];
-}
-
-- (void)swipedLeft:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeLeft toView:r.view];
-}
-
-- (void)swipedRight:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventSwipeRight toView:r.view];
-}
-
-- (void)tappedUp:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventUp toView:r.view];
-}
-
-- (void)tappedDown:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventDown toView:r.view];
-}
-
-- (void)tappedLeft:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventLeft toView:r.view];
-}
-
-- (void)tappedRight:(UIGestureRecognizer *)r
-{
-  [self sendAppleTVEvent:RCTTVRemoteEventRight toView:r.view];
-}
-
-#pragma mark -
-
-- (void)addLongPressGestureRecognizerWithSelector:(nonnull SEL)selector
-                                        pressType:(UIPressType)pressType
-                                             name:(NSString *)name
-{
-  UILongPressGestureRecognizer *recognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:selector];
-  recognizer.allowedPressTypes = @[ @(pressType) ];
-
-  _tvRemoteGestureRecognizers[name] = recognizer;
-}
-
-- (void)addTapGestureRecognizerWithSelector:(nonnull SEL)selector pressType:(UIPressType)pressType name:(NSString *)name
-{
-  UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:selector];
-  recognizer.allowedPressTypes = @[ @(pressType) ];
-
-  _tvRemoteGestureRecognizers[name] = recognizer;
-}
-
-- (void)addSwipeGestureRecognizerWithSelector:(nonnull SEL)selector
-                                    direction:(UISwipeGestureRecognizerDirection)direction
-                                         name:(NSString *)name
-{
-  UISwipeGestureRecognizer *recognizer = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:selector];
-  recognizer.direction = direction;
-
-  _tvRemoteGestureRecognizers[name] = recognizer;
-}
-
-- (void)sendAppleTVEvent:(NSString *)eventType toView:(__unused UIView *)v
-{
-  [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
-                                                      object:@{@"eventType" : eventType}];
-}
-
-@end
diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
index 2f9902478139d5..45b4b45f0daf1b 100644
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@@ -104,9 +104,6 @@ rn_apple_library(
         ) + react_module_plugin_providers(
             name = "LogBox",
             native_class_func = "RCTLogBoxCls",
-        ) + react_module_plugin_providers(
-            name = "TVNavigationEventEmitter",
-            native_class_func = "RCTTVNavigationEventEmitterCls",
         ) + react_module_plugin_providers(
             name = "WebSocketExecutor",
             native_class_func = "RCTWebSocketExecutorCls",
diff --git a/React/CoreModules/CoreModulesPlugins.h b/React/CoreModules/CoreModulesPlugins.h
index 509eb5af2f8dbc..b8fa8e9f0767ed 100644
--- a/React/CoreModules/CoreModulesPlugins.h
+++ b/React/CoreModules/CoreModulesPlugins.h
@@ -49,7 +49,6 @@ Class RCTDevMenuCls(void) __attribute__((used));
 Class RCTDevSettingsCls(void) __attribute__((used));
 Class RCTRedBoxCls(void) __attribute__((used));
 Class RCTLogBoxCls(void) __attribute__((used));
-Class RCTTVNavigationEventEmitterCls(void) __attribute__((used));
 Class RCTWebSocketExecutorCls(void) __attribute__((used));
 Class RCTWebSocketModuleCls(void) __attribute__((used));
 Class RCTDevLoadingViewCls(void) __attribute__((used));
diff --git a/React/CoreModules/CoreModulesPlugins.mm b/React/CoreModules/CoreModulesPlugins.mm
index ced0cbd0797bbe..de47e923f813d7 100644
--- a/React/CoreModules/CoreModulesPlugins.mm
+++ b/React/CoreModules/CoreModulesPlugins.mm
@@ -38,7 +38,6 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"DevSettings", RCTDevSettingsCls},
     {"RedBox", RCTRedBoxCls},
     {"LogBox", RCTLogBoxCls},
-    {"TVNavigationEventEmitter", RCTTVNavigationEventEmitterCls},
     {"WebSocketExecutor", RCTWebSocketExecutorCls},
     {"WebSocketModule", RCTWebSocketModuleCls},
     {"DevLoadingView", RCTDevLoadingViewCls},
diff --git a/React/CoreModules/RCTAsyncLocalStorage.mm b/React/CoreModules/RCTAsyncLocalStorage.mm
index 00b66634f03edd..ecbb05976a0168 100644
--- a/React/CoreModules/RCTAsyncLocalStorage.mm
+++ b/React/CoreModules/RCTAsyncLocalStorage.mm
@@ -76,11 +76,7 @@ static void RCTAppendError(NSDictionary *error, NSMutableArray<NSDictionary *> *
   static NSString *storageDirectory = nil;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-#if TARGET_OS_TV
-    storageDirectory = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES).firstObject;
-#else
     storageDirectory = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES).firstObject;
-#endif
     storageDirectory = [storageDirectory stringByAppendingPathComponent:RCTStorageDirectory];
   });
   return storageDirectory;
@@ -232,10 +228,6 @@ - (NSDictionary *)_ensureSetup
 {
   RCTAssertThread(RCTGetMethodQueue(), @"Must be executed on storage thread");
 
-#if TARGET_OS_TV
-  RCTLogWarn(@"Persistent storage is not supported on tvOS, your data may be removed at any point.");
-#endif
-
   NSError *error = nil;
   if (!RCTHasCreatedStorageDirectory) {
     [[NSFileManager defaultManager] createDirectoryAtPath:RCTGetStorageDirectory()
diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm
index eb5f8217946238..e3ac433991568c 100644
--- a/React/CoreModules/RCTDeviceInfo.mm
+++ b/React/CoreModules/RCTDeviceInfo.mm
@@ -23,10 +23,8 @@ @interface RCTDeviceInfo () <NativeDeviceInfoSpec>
 @end
 
 @implementation RCTDeviceInfo {
-#if !TARGET_OS_TV
   UIInterfaceOrientation _currentInterfaceOrientation;
   NSDictionary *_currentInterfaceDimensions;
-#endif
 }
 
 @synthesize bridge = _bridge;
@@ -51,7 +49,7 @@ - (void)setBridge:(RCTBridge *)bridge
                                            selector:@selector(didReceiveNewContentSizeMultiplier)
                                                name:RCTAccessibilityManagerDidUpdateMultiplierNotification
                                              object:_bridge.accessibilityManager];
-#if !TARGET_OS_TV
+
   _currentInterfaceOrientation = [RCTSharedApplication() statusBarOrientation];
 
   [[NSNotificationCenter defaultCenter] addObserver:self
@@ -70,8 +68,6 @@ - (void)setBridge:(RCTBridge *)bridge
                                            selector:@selector(interfaceFrameDidChange)
                                                name:RCTUserInterfaceStyleDidChangeNotification
                                              object:nil];
-
-#endif
 }
 
 static BOOL RCTIsIPhoneX()
@@ -149,8 +145,6 @@ - (void)didReceiveNewContentSizeMultiplier
   });
 }
 
-#if !TARGET_OS_TV
-
 - (void)interfaceOrientationDidChange
 {
   __weak __typeof(self) weakSelf = self;
@@ -199,8 +193,6 @@ - (void)_interfaceFrameDidChange
   _currentInterfaceDimensions = nextInterfaceDimensions;
 }
 
-#endif // TARGET_OS_TV
-
 - (std::shared_ptr<TurboModule>)getTurboModule:(const ObjCTurboModule::InitParams &)params
 {
   return std::make_shared<NativeDeviceInfoSpecJSI>(params);
diff --git a/React/CoreModules/RCTKeyboardObserver.mm b/React/CoreModules/RCTKeyboardObserver.mm
index b00f08c21cabb6..93c853f7acc423 100644
--- a/React/CoreModules/RCTKeyboardObserver.mm
+++ b/React/CoreModules/RCTKeyboardObserver.mm
@@ -23,8 +23,6 @@ @implementation RCTKeyboardObserver
 
 - (void)startObserving
 {
-#if !TARGET_OS_TV
-
   NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
 
 #define ADD_KEYBOARD_HANDLER(NAME, SELECTOR) [nc addObserver:self selector:@selector(SELECTOR:) name:NAME object:nil]
@@ -37,8 +35,6 @@ - (void)startObserving
   ADD_KEYBOARD_HANDLER(UIKeyboardDidChangeFrameNotification, keyboardDidChangeFrame);
 
 #undef ADD_KEYBOARD_HANDLER
-
-#endif
 }
 
 - (NSArray<NSString *> *)supportedEvents
@@ -113,9 +109,6 @@ -(void)EVENT : (NSNotification *)notification
 
 static NSDictionary *RCTParseKeyboardNotification(NSNotification *notification)
 {
-#if TARGET_OS_TV
-  return @{};
-#else
   NSDictionary *userInfo = notification.userInfo;
   CGRect beginFrame = [userInfo[UIKeyboardFrameBeginUserInfoKey] CGRectValue];
   CGRect endFrame = [userInfo[UIKeyboardFrameEndUserInfoKey] CGRectValue];
@@ -131,7 +124,6 @@ -(void)EVENT : (NSNotification *)notification
     @"easing" : RCTAnimationNameForCurve(curve),
     @"isEventFromThisApp" : isLocalUserInfoKey == 1 ? @YES : @NO,
   };
-#endif
 }
 
 Class RCTKeyboardObserverCls(void)
diff --git a/React/CoreModules/RCTRedBox.mm b/React/CoreModules/RCTRedBox.mm
index 4325dc139eca47..9fec829b0157e2 100644
--- a/React/CoreModules/RCTRedBox.mm
+++ b/React/CoreModules/RCTRedBox.mm
@@ -104,10 +104,8 @@ - (instancetype)initWithFrame:(CGRect)frame
     _stackTraceTableView.delegate = self;
     _stackTraceTableView.dataSource = self;
     _stackTraceTableView.backgroundColor = [UIColor clearColor];
-#if !TARGET_OS_TV
     _stackTraceTableView.separatorColor = [UIColor colorWithWhite:1 alpha:0.3];
     _stackTraceTableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-#endif
     _stackTraceTableView.indicatorStyle = UIScrollViewIndicatorStyleWhite;
     [rootView addSubview:_stackTraceTableView];
 
@@ -292,10 +290,8 @@ - (void)copyStack
       [fullStackTrace appendFormat:@"    %@\n", [self formatFrameSource:stackFrame]];
     }
   }
-#if !TARGET_OS_TV
   UIPasteboard *pb = [UIPasteboard generalPasteboard];
   [pb setString:fullStackTrace];
-#endif
 }
 
 - (NSString *)formatFrameSource:(RCTJSStackFrame *)stackFrame
diff --git a/React/CoreModules/RCTStatusBarManager.h b/React/CoreModules/RCTStatusBarManager.h
index dead2d86a85803..db02b9176a694b 100644
--- a/React/CoreModules/RCTStatusBarManager.h
+++ b/React/CoreModules/RCTStatusBarManager.h
@@ -12,10 +12,8 @@
 
 @interface RCTConvert (UIStatusBar)
 
-#if !TARGET_OS_TV
 + (UIStatusBarStyle)UIStatusBarStyle:(id)json;
 + (UIStatusBarAnimation)UIStatusBarAnimation:(id)json;
-#endif
 
 @end
 
diff --git a/React/CoreModules/RCTStatusBarManager.mm b/React/CoreModules/RCTStatusBarManager.mm
index 3e62b9df5052c7..4104a7081512c0 100644
--- a/React/CoreModules/RCTStatusBarManager.mm
+++ b/React/CoreModules/RCTStatusBarManager.mm
@@ -12,7 +12,6 @@
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 
-#if !TARGET_OS_TV
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 
 @implementation RCTConvert (UIStatusBar)
@@ -58,15 +57,10 @@ + (UIStatusBarStyle)UIStatusBarStyle:(id)json RCT_DYNAMIC
     integerValue);
 
 @end
-#endif
-
-#if !TARGET_OS_TV
 
 @interface RCTStatusBarManager () <NativeStatusBarManagerIOSSpec>
 @end
 
-#endif
-
 @implementation RCTStatusBarManager
 
 static BOOL RCTViewControllerBasedStatusBarAppearance()
@@ -94,8 +88,6 @@ + (BOOL)requiresMainQueueSetup
   return @[ @"statusBarFrameDidChange", @"statusBarFrameWillChange" ];
 }
 
-#if !TARGET_OS_TV
-
 - (void)startObserving
 {
   NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
@@ -207,8 +199,6 @@ - (void)applicationWillChangeStatusBarFrame:(NSNotification *)notification
   return std::make_shared<facebook::react::NativeStatusBarManagerIOSSpecJSI>(params);
 }
 
-#endif // TARGET_OS_TV
-
 @end
 
 Class RCTStatusBarManagerCls(void)
diff --git a/React/CoreModules/RCTTVNavigationEventEmitter.h b/React/CoreModules/RCTTVNavigationEventEmitter.h
deleted file mode 100644
index b3bf1d43bd07a3..00000000000000
--- a/React/CoreModules/RCTTVNavigationEventEmitter.h
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <React/RCTEventEmitter.h>
-
-RCT_EXTERN NSString *const RCTTVNavigationEventNotification;
-
-@interface RCTTVNavigationEventEmitter : RCTEventEmitter
-
-@end
diff --git a/React/CoreModules/RCTTVNavigationEventEmitter.mm b/React/CoreModules/RCTTVNavigationEventEmitter.mm
deleted file mode 100644
index 58fc1ead297cfb..00000000000000
--- a/React/CoreModules/RCTTVNavigationEventEmitter.mm
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTTVNavigationEventEmitter.h"
-
-#import <FBReactNativeSpec/FBReactNativeSpec.h>
-#import "CoreModulesPlugins.h"
-
-NSString *const RCTTVNavigationEventNotification = @"RCTTVNavigationEventNotification";
-
-static NSString *const TVNavigationEventName = @"onHWKeyEvent";
-
-@interface RCTTVNavigationEventEmitter () <NativeTVNavigationEventEmitterSpec>
-@end
-
-@implementation RCTTVNavigationEventEmitter
-
-RCT_EXPORT_MODULE()
-
-+ (BOOL)requiresMainQueueSetup
-{
-  return NO;
-}
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    [[NSNotificationCenter defaultCenter] addObserver:self
-                                             selector:@selector(handleTVNavigationEventNotification:)
-                                                 name:RCTTVNavigationEventNotification
-                                               object:nil];
-  }
-  return self;
-}
-
-- (NSArray<NSString *> *)supportedEvents
-{
-  return @[ TVNavigationEventName ];
-}
-
-- (void)handleTVNavigationEventNotification:(NSNotification *)notif
-{
-  if (self.bridge) {
-    [self sendEventWithName:TVNavigationEventName body:notif.object];
-  }
-}
-
-- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:
-    (const facebook::react::ObjCTurboModule::InitParams &)params
-{
-  return std::make_shared<facebook::react::NativeTVNavigationEventEmitterSpecJSI>(params);
-}
-
-@end
-
-Class RCTTVNavigationEventEmitterCls(void)
-{
-  return RCTTVNavigationEventEmitter.class;
-}
diff --git a/React/CoreModules/React-CoreModules.podspec b/React/CoreModules/React-CoreModules.podspec
index 7d5a617b28a7ee..dee7239471187d 100644
--- a/React/CoreModules/React-CoreModules.podspec
+++ b/React/CoreModules/React-CoreModules.podspec
@@ -26,7 +26,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "**/*.{c,m,mm,cpp}"
diff --git a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm
index d9c4fb231b2493..1d112b51c1c88f 100644
--- a/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/InputAccessory/RCTInputAccessoryContentView.mm
@@ -24,7 +24,7 @@ - (instancetype)init
     _heightConstraint = [_safeAreaContainer.heightAnchor constraintEqualToConstant:0];
     _heightConstraint.active = YES;
 
-    if (@available(iOS 11.0, tvOS 11.0, *)) {
+    if (@available(iOS 11.0, *)) {
       [NSLayoutConstraint activateConstraints:@[
         [_safeAreaContainer.bottomAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.bottomAnchor],
         [_safeAreaContainer.topAnchor constraintEqualToAnchor:self.safeAreaLayoutGuide.topAnchor],
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h
index 1cd88f8aa62fff..f794b067c75443 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.h
@@ -15,8 +15,6 @@
 
 @property (nonatomic, weak) id<RCTFabricModalHostViewControllerDelegate> delegate;
 
-#if !TARGET_OS_TV
 @property (nonatomic, assign) UIInterfaceOrientationMask supportedInterfaceOrientations;
-#endif
 
 @end
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
index 95f333c2e3f7fe..54061f535d79ee 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
@@ -40,7 +40,6 @@ - (void)loadView
   [_touchHandler attachToView:self.view];
 }
 
-#if !TARGET_OS_TV
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
   return [RCTSharedApplication() statusBarStyle];
@@ -89,6 +88,5 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations
   return _supportedInterfaceOrientations;
 }
 #endif // RCT_DEV
-#endif // !TARGET_OS_TV
 
 @end
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
index b4a8b7b2f5239d..65f2f6ce266300 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
@@ -19,7 +19,6 @@
 
 using namespace facebook::react;
 
-#if !TARGET_OS_TV
 static UIInterfaceOrientationMask supportedOrientationsMask(ModalHostViewSupportedOrientationsMask mask)
 {
   UIInterfaceOrientationMask supportedOrientations = 0;
@@ -54,7 +53,6 @@ static UIInterfaceOrientationMask supportedOrientationsMask(ModalHostViewSupport
 
   return supportedOrientations;
 }
-#endif
 
 static std::tuple<BOOL, UIModalTransitionStyle> animationConfiguration(ModalHostViewAnimationType const animation)
 {
diff --git a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
index c54ea89bcac19f..7623c1099f93b0 100644
--- a/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/SafeAreaView/RCTSafeAreaViewComponentView.mm
@@ -34,7 +34,7 @@ - (instancetype)initWithFrame:(CGRect)frame
 
 - (UIEdgeInsets)_safeAreaInsets
 {
-  if (@available(iOS 11.0, tvOS 11.0, *)) {
+  if (@available(iOS 11.0, *)) {
     return self.safeAreaInsets;
   }
 
diff --git a/React/Modules/RCTLayoutAnimation.m b/React/Modules/RCTLayoutAnimation.m
index 7ad88992d9ec87..7b702c18d80dcb 100644
--- a/React/Modules/RCTLayoutAnimation.m
+++ b/React/Modules/RCTLayoutAnimation.m
@@ -39,7 +39,6 @@ static UIViewAnimationOptions UIViewAnimationOptionsFromRCTAnimationType(RCTAnim
 // `UIKeyboardWillChangeFrameNotification`s.
 + (void)initializeStatics
 {
-#if !TARGET_OS_TV
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
     [[NSNotificationCenter defaultCenter] addObserver:self
@@ -47,15 +46,12 @@ + (void)initializeStatics
                                                  name:UIKeyboardWillChangeFrameNotification
                                                object:nil];
   });
-#endif
 }
 
 + (void)keyboardWillChangeFrame:(NSNotification *)notification
 {
-#if !TARGET_OS_TV
   NSDictionary *userInfo = notification.userInfo;
   _currentKeyboardAnimationCurve = [userInfo[UIKeyboardAnimationCurveUserInfoKey] integerValue];
-#endif
 }
 
 - (instancetype)initWithDuration:(NSTimeInterval)duration
diff --git a/React/Modules/RCTRedBoxExtraDataViewController.m b/React/Modules/RCTRedBoxExtraDataViewController.m
index 240aa5e9b033ad..9b006ec68c1ef3 100644
--- a/React/Modules/RCTRedBoxExtraDataViewController.m
+++ b/React/Modules/RCTRedBoxExtraDataViewController.m
@@ -33,10 +33,8 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
 
     self.keyLabel.textColor = [UIColor whiteColor];
     self.keyLabel.numberOfLines = 0;
-#if !TARGET_OS_TV
     self.keyLabel.lineBreakMode = NSLineBreakByWordWrapping;
     self.keyLabel.font = [UIFont fontWithName:@"Menlo-Regular" size:12.0f];
-#endif
     self.valueLabel = [UILabel new];
     [self.contentView addSubview:self.valueLabel];
 
@@ -48,10 +46,8 @@ - (instancetype)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSStr
 
     self.valueLabel.textColor = [UIColor whiteColor];
     self.valueLabel.numberOfLines = 0;
-#if !TARGET_OS_TV
     self.valueLabel.lineBreakMode = NSLineBreakByWordWrapping;
     self.valueLabel.font = [UIFont fontWithName:@"Menlo-Regular" size:12.0f];
-#endif
   }
   return self;
 }
@@ -82,9 +78,7 @@ - (instancetype)init
     _tableView.dataSource = self;
     _tableView.backgroundColor = [UIColor clearColor];
     _tableView.estimatedRowHeight = 200;
-#if !TARGET_OS_TV
     _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
-#endif
     _tableView.rowHeight = UITableViewAutomaticDimension;
     _tableView.allowsSelection = NO;
 
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 2079bbb7f6c215..8f43fd3f3b1c04 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -179,12 +179,10 @@ - (void)setBridge:(RCTBridge *)bridge
                                                object:[self->_bridge moduleForName:@"AccessibilityManager"
                                                              lazilyLoadIfNecessary:YES]];
   });
-#if !TARGET_OS_TV
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(namedOrientationDidChange)
                                                name:UIDeviceOrientationDidChangeNotification
                                              object:nil];
-#endif
   [RCTLayoutAnimation initializeStatics];
 }
 
@@ -210,7 +208,6 @@ - (void)didReceiveNewContentSizeMultiplier
   });
 }
 
-#if !TARGET_OS_TV
 // Names and coordinate system from html5 spec:
 // https://developer.mozilla.org/en-US/docs/Web/API/Screen.orientation
 // https://developer.mozilla.org/en-US/docs/Web/API/Screen.lockOrientation
@@ -262,7 +259,6 @@ - (void)namedOrientationDidChange
   [_bridge.eventDispatcher sendDeviceEventWithName:@"namedOrientationDidChange" body:orientationEvent];
 #pragma clang diagnostic pop
 }
-#endif
 
 - (dispatch_queue_t)methodQueue
 {
diff --git a/React/Profiler/RCTProfile.m b/React/Profiler/RCTProfile.m
index 149451ad6bfeee..233f6e767ba781 100644
--- a/React/Profiler/RCTProfile.m
+++ b/React/Profiler/RCTProfile.m
@@ -393,7 +393,6 @@ + (void)toggle:(UIButton *)target
     RCTProfileEnd(RCTProfilingBridge(), ^(NSString *result) {
       NSString *outFile = [NSTemporaryDirectory() stringByAppendingString:@"tmp_trace.json"];
       [result writeToFile:outFile atomically:YES encoding:NSUTF8StringEncoding error:nil];
-#if !TARGET_OS_TV
       UIActivityViewController *activityViewController =
           [[UIActivityViewController alloc] initWithActivityItems:@[ [NSURL fileURLWithPath:outFile] ]
                                             applicationActivities:nil];
@@ -410,7 +409,6 @@ + (void)toggle:(UIButton *)target
                                                                                       animated:YES
                                                                                     completion:nil];
       });
-#endif
     });
   } else {
     RCTProfileInit(RCTProfilingBridge());
@@ -747,7 +745,6 @@ void RCTProfileSendResult(RCTBridge *bridge, NSString *route, NSData *data)
               NSString *message = [[NSString alloc] initWithData:responseData encoding:NSUTF8StringEncoding];
 
               if (message.length) {
-#if !TARGET_OS_TV
                 dispatch_async(dispatch_get_main_queue(), ^{
                   UIAlertController *alertController =
                       [UIAlertController alertControllerWithTitle:@"Profile"
@@ -758,7 +755,6 @@ void RCTProfileSendResult(RCTBridge *bridge, NSString *route, NSData *data)
                                                                     handler:nil]];
                   [RCTPresentedViewController() presentViewController:alertController animated:YES completion:nil];
                 });
-#endif
               }
             }
           }];
diff --git a/React/React-RCTFabric.podspec b/React/React-RCTFabric.podspec
index 34d1096c413d9e..bca122846f75b0 100644
--- a/React/React-RCTFabric.podspec
+++ b/React/React-RCTFabric.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "Fabric/**/*.{c,h,m,mm,S,cpp}",
                              "Tests/**/*.{mm}"
diff --git a/React/Views/RCTComponentData.m b/React/Views/RCTComponentData.m
index c8c893863e2b32..5a8600cf5b55ab 100644
--- a/React/Views/RCTComponentData.m
+++ b/React/Views/RCTComponentData.m
@@ -70,9 +70,7 @@ - (UIView *)createViewWithTag:(nullable NSNumber *)tag rootTag:(nullable NSNumbe
   UIView *view = [self.manager view];
   view.reactTag = tag;
   view.rootTag = rootTag;
-#if !TARGET_OS_TV
   view.multipleTouchEnabled = YES;
-#endif
   view.userInteractionEnabled = YES; // required for touch handling
   view.layer.allowsGroupOpacity = YES; // required for touch handling
   return view;
diff --git a/React/Views/RCTModalHostView.h b/React/Views/RCTModalHostView.h
index 4e61886dba54ef..c54c1c69c94413 100644
--- a/React/Views/RCTModalHostView.h
+++ b/React/Views/RCTModalHostView.h
@@ -13,7 +13,6 @@
 
 @class RCTBridge;
 @class RCTModalHostViewController;
-@class RCTTVRemoteHandler;
 
 @protocol RCTModalHostViewInteractor;
 
@@ -32,11 +31,6 @@
 @property (nonatomic, copy) NSArray<NSString *> *supportedOrientations;
 @property (nonatomic, copy) RCTDirectEventBlock onOrientationChange;
 
-#if TARGET_OS_TV
-@property (nonatomic, copy) RCTDirectEventBlock onRequestClose;
-@property (nonatomic, strong) RCTTVRemoteHandler *tvRemoteHandler;
-#endif
-
 - (instancetype)initWithBridge:(RCTBridge *)bridge NS_DESIGNATED_INITIALIZER;
 
 @end
diff --git a/React/Views/RCTModalHostView.m b/React/Views/RCTModalHostView.m
index 6a153301038853..0cfa69a99aab6f 100644
--- a/React/Views/RCTModalHostView.m
+++ b/React/Views/RCTModalHostView.m
@@ -16,9 +16,6 @@
 #import "RCTUIManager.h"
 #import "RCTUtils.h"
 #import "UIView+React.h"
-#if TARGET_OS_TV
-#import "RCTTVRemoteHandler.h"
-#endif
 
 @implementation RCTModalHostView {
   __weak RCTBridge *_bridge;
@@ -26,11 +23,7 @@ @implementation RCTModalHostView {
   RCTModalHostViewController *_modalViewController;
   RCTTouchHandler *_touchHandler;
   UIView *_reactSubview;
-#if TARGET_OS_TV
-  UITapGestureRecognizer *_menuButtonGestureRecognizer;
-#else
   UIInterfaceOrientation _lastKnownOrientation;
-#endif
 }
 
 RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
@@ -45,12 +38,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
     containerView.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
     _modalViewController.view = containerView;
     _touchHandler = [[RCTTouchHandler alloc] initWithBridge:bridge];
-#if TARGET_OS_TV
-    _menuButtonGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
-                                                                           action:@selector(menuButtonPressed:)];
-    _menuButtonGestureRecognizer.allowedPressTypes = @[ @(UIPressTypeMenu) ];
-    self.tvRemoteHandler = [RCTTVRemoteHandler new];
-#endif
     _isPresented = NO;
 
     __weak typeof(self) weakSelf = self;
@@ -62,27 +49,6 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   return self;
 }
 
-#if TARGET_OS_TV
-- (void)menuButtonPressed:(__unused UIGestureRecognizer *)gestureRecognizer
-{
-  if (_onRequestClose) {
-    _onRequestClose(nil);
-  }
-}
-
-- (void)setOnRequestClose:(RCTDirectEventBlock)onRequestClose
-{
-  _onRequestClose = onRequestClose;
-  if (_reactSubview) {
-    if (_onRequestClose && _menuButtonGestureRecognizer) {
-      [_reactSubview addGestureRecognizer:_menuButtonGestureRecognizer];
-    } else {
-      [_reactSubview removeGestureRecognizer:_menuButtonGestureRecognizer];
-    }
-  }
-}
-#endif
-
 - (void)notifyForBoundsChange:(CGRect)newBounds
 {
   if (_reactSubview && _isPresented) {
@@ -93,7 +59,6 @@ - (void)notifyForBoundsChange:(CGRect)newBounds
 
 - (void)notifyForOrientationChange
 {
-#if !TARGET_OS_TV
   if (!_onOrientationChange) {
     return;
   }
@@ -110,7 +75,6 @@ - (void)notifyForOrientationChange
     @"orientation" : isPortrait ? @"portrait" : @"landscape",
   };
   _onOrientationChange(eventPayload);
-#endif
 }
 
 - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
@@ -118,16 +82,6 @@ - (void)insertReactSubview:(UIView *)subview atIndex:(NSInteger)atIndex
   RCTAssert(_reactSubview == nil, @"Modal view can only have one subview");
   [super insertReactSubview:subview atIndex:atIndex];
   [_touchHandler attachToView:subview];
-#if TARGET_OS_TV
-  for (NSString *key in [self.tvRemoteHandler.tvRemoteGestureRecognizers allKeys]) {
-    if (![key isEqualToString:RCTTVRemoteEventMenu]) {
-      [subview addGestureRecognizer:self.tvRemoteHandler.tvRemoteGestureRecognizers[key]];
-    }
-  }
-  if (_onRequestClose) {
-    [subview addGestureRecognizer:_menuButtonGestureRecognizer];
-  }
-#endif
 
   [_modalViewController.view insertSubview:subview atIndex:0];
   _reactSubview = subview;
@@ -139,14 +93,6 @@ - (void)removeReactSubview:(UIView *)subview
   // Superclass (category) removes the `subview` from actual `superview`.
   [super removeReactSubview:subview];
   [_touchHandler detachFromView:subview];
-#if TARGET_OS_TV
-  if (_menuButtonGestureRecognizer) {
-    [subview removeGestureRecognizer:_menuButtonGestureRecognizer];
-  }
-  for (UIGestureRecognizer *gr in self.tvRemoteHandler.tvRemoteGestureRecognizers) {
-    [subview removeGestureRecognizer:gr];
-  }
-#endif
   _reactSubview = nil;
 }
 
@@ -176,9 +122,8 @@ - (void)didMoveToWindow
   if (!_isPresented && self.window) {
     RCTAssert(self.reactViewController, @"Can't present modal view controller without a presenting view controller");
 
-#if !TARGET_OS_TV
     _modalViewController.supportedInterfaceOrientations = [self supportedOrientationsMask];
-#endif
+
     if ([self.animationType isEqualToString:@"fade"]) {
       _modalViewController.modalTransitionStyle = UIModalTransitionStyleCrossDissolve;
     } else if ([self.animationType isEqualToString:@"slide"]) {
@@ -228,7 +173,6 @@ - (void)setTransparent:(BOOL)transparent
       transparent ? UIModalPresentationOverFullScreen : UIModalPresentationFullScreen;
 }
 
-#if !TARGET_OS_TV
 - (UIInterfaceOrientationMask)supportedOrientationsMask
 {
   if (_supportedOrientations.count == 0) {
@@ -255,6 +199,5 @@ - (UIInterfaceOrientationMask)supportedOrientationsMask
   }
   return supportedOrientations;
 }
-#endif
 
 @end
diff --git a/React/Views/RCTModalHostViewController.h b/React/Views/RCTModalHostViewController.h
index 0a4a82968075c5..a3f66b6b068336 100644
--- a/React/Views/RCTModalHostViewController.h
+++ b/React/Views/RCTModalHostViewController.h
@@ -11,8 +11,6 @@
 
 @property (nonatomic, copy) void (^boundsDidChangeBlock)(CGRect newBounds);
 
-#if !TARGET_OS_TV
 @property (nonatomic, assign) UIInterfaceOrientationMask supportedInterfaceOrientations;
-#endif
 
 @end
diff --git a/React/Views/RCTModalHostViewController.m b/React/Views/RCTModalHostViewController.m
index 112bc17c4d85bf..00c149d3db8474 100644
--- a/React/Views/RCTModalHostViewController.m
+++ b/React/Views/RCTModalHostViewController.m
@@ -12,10 +12,8 @@
 
 @implementation RCTModalHostViewController {
   CGRect _lastViewFrame;
-#if !TARGET_OS_TV
   UIStatusBarStyle _preferredStatusBarStyle;
   BOOL _preferredStatusBarHidden;
-#endif
 }
 
 - (instancetype)init
@@ -31,10 +29,8 @@ - (instancetype)init
   }
 #endif
 
-#if !TARGET_OS_TV
   _preferredStatusBarStyle = [RCTSharedApplication() statusBarStyle];
   _preferredStatusBarHidden = [RCTSharedApplication() isStatusBarHidden];
-#endif
 
   return self;
 }
@@ -49,7 +45,6 @@ - (void)viewDidLayoutSubviews
   }
 }
 
-#if !TARGET_OS_TV
 - (UIStatusBarStyle)preferredStatusBarStyle
 {
   return _preferredStatusBarStyle;
@@ -78,6 +73,5 @@ - (UIInterfaceOrientationMask)supportedInterfaceOrientations
   return _supportedInterfaceOrientations;
 }
 #endif // RCT_DEV
-#endif // !TARGET_OS_TV
 
 @end
diff --git a/React/Views/RCTModalHostViewManager.m b/React/Views/RCTModalHostViewManager.m
index 4698139f90102b..14c220ba5b90e9 100644
--- a/React/Views/RCTModalHostViewManager.m
+++ b/React/Views/RCTModalHostViewManager.m
@@ -19,10 +19,8 @@ @implementation RCTConvert (RCTModalHostView)
     UIModalPresentationStyle,
     (@{
       @"fullScreen" : @(UIModalPresentationFullScreen),
-#if !TARGET_OS_TV
       @"pageSheet" : @(UIModalPresentationPageSheet),
       @"formSheet" : @(UIModalPresentationFormSheet),
-#endif
       @"overFullScreen" : @(UIModalPresentationOverFullScreen),
     }),
     UIModalPresentationFullScreen,
@@ -132,8 +130,4 @@ - (void)invalidate
 RCT_EXPORT_VIEW_PROPERTY(supportedOrientations, NSArray)
 RCT_EXPORT_VIEW_PROPERTY(onOrientationChange, RCTDirectEventBlock)
 
-#if TARGET_OS_TV
-RCT_EXPORT_VIEW_PROPERTY(onRequestClose, RCTDirectEventBlock)
-#endif
-
 @end
diff --git a/React/Views/RCTProgressViewManager.m b/React/Views/RCTProgressViewManager.m
index 887473cb1aa73b..ed434250101f58 100644
--- a/React/Views/RCTProgressViewManager.m
+++ b/React/Views/RCTProgressViewManager.m
@@ -15,9 +15,7 @@ @implementation RCTConvert (RCTProgressViewManager)
     UIProgressViewStyle,
     (@{
       @"default" : @(UIProgressViewStyleDefault),
-#if !TARGET_OS_TV
       @"bar" : @(UIProgressViewStyleBar),
-#endif
     }),
     UIProgressViewStyleDefault,
     integerValue)
diff --git a/React/Views/RCTTVView.h b/React/Views/RCTTVView.h
deleted file mode 100644
index a421e6fc61f173..00000000000000
--- a/React/Views/RCTTVView.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import <Foundation/Foundation.h>
-#import <UIKit/UIKit.h>
-
-#import <React/RCTView.h>
-
-//  A RCTView with additional properties and methods for user interaction using the Apple TV focus engine.
-@interface RCTTVView : RCTView
-
-/**
- * TV event handlers
- */
-@property (nonatomic, assign) BOOL isTVSelectable; // True if this view is TV-focusable
-
-/**
- *  Properties for Apple TV focus parallax effects
- */
-@property (nonatomic, copy) NSDictionary *tvParallaxProperties;
-
-/**
- * TV preferred focus
- */
-@property (nonatomic, assign) BOOL hasTVPreferredFocus;
-
-@end
diff --git a/React/Views/RCTTVView.m b/React/Views/RCTTVView.m
deleted file mode 100644
index 6f06b9a1f411d2..00000000000000
--- a/React/Views/RCTTVView.m
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTTVView.h"
-
-#import "RCTAutoInsetsProtocol.h"
-#import "RCTBorderDrawing.h"
-#import "RCTBridge.h"
-#import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
-#import "RCTLog.h"
-#import "RCTRootViewInternal.h"
-#import "RCTTVNavigationEventEmitter.h"
-#import "RCTUtils.h"
-#import "RCTView.h"
-#import "UIView+React.h"
-
-@implementation RCTTVView {
-  UITapGestureRecognizer *_selectRecognizer;
-}
-
-- (instancetype)initWithFrame:(CGRect)frame
-{
-  if (self = [super initWithFrame:frame]) {
-    dispatch_once(&onceToken, ^{
-      defaultTVParallaxProperties = @{
-        @"enabled" : @YES,
-        @"shiftDistanceX" : @2.0f,
-        @"shiftDistanceY" : @2.0f,
-        @"tiltAngle" : @0.05f,
-        @"magnification" : @1.0f,
-        @"pressMagnification" : @1.0f,
-        @"pressDuration" : @0.3f,
-        @"pressDelay" : @0.0f
-      };
-    });
-    self.tvParallaxProperties = defaultTVParallaxProperties;
-  }
-
-  return self;
-}
-
-static NSDictionary *defaultTVParallaxProperties = nil;
-static dispatch_once_t onceToken;
-
-- (void)setTvParallaxProperties:(NSDictionary *)tvParallaxProperties
-{
-  if (_tvParallaxProperties == nil) {
-    _tvParallaxProperties = [defaultTVParallaxProperties copy];
-    return;
-  }
-
-  NSMutableDictionary *newParallaxProperties = [NSMutableDictionary dictionaryWithDictionary:_tvParallaxProperties];
-  for (NSString *k in [defaultTVParallaxProperties allKeys]) {
-    if (tvParallaxProperties[k]) {
-      newParallaxProperties[k] = tvParallaxProperties[k];
-    }
-  }
-  _tvParallaxProperties = [newParallaxProperties copy];
-}
-
-RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : unused)
-
-- (void)setIsTVSelectable:(BOOL)isTVSelectable
-{
-  self->_isTVSelectable = isTVSelectable;
-  if (isTVSelectable) {
-    UITapGestureRecognizer *recognizer = [[UITapGestureRecognizer alloc] initWithTarget:self
-                                                                                 action:@selector(handleSelect:)];
-    recognizer.allowedPressTypes = @[ @(UIPressTypeSelect) ];
-    _selectRecognizer = recognizer;
-    [self addGestureRecognizer:_selectRecognizer];
-  } else {
-    if (_selectRecognizer) {
-      [self removeGestureRecognizer:_selectRecognizer];
-    }
-  }
-}
-
-- (void)handleSelect:(__unused UIGestureRecognizer *)r
-{
-  if ([self.tvParallaxProperties[@"enabled"] boolValue] == YES) {
-    float magnification = [self.tvParallaxProperties[@"magnification"] floatValue];
-    float pressMagnification = [self.tvParallaxProperties[@"pressMagnification"] floatValue];
-
-    // Duration of press animation
-    float pressDuration = [self.tvParallaxProperties[@"pressDuration"] floatValue];
-
-    // Delay of press animation
-    float pressDelay = [self.tvParallaxProperties[@"pressDelay"] floatValue];
-
-    [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:pressDelay]];
-
-    [UIView animateWithDuration:(pressDuration / 2)
-        animations:^{
-          self.transform = CGAffineTransformMakeScale(pressMagnification, pressMagnification);
-        }
-        completion:^(__unused BOOL finished1) {
-          [UIView animateWithDuration:(pressDuration / 2)
-              animations:^{
-                self.transform = CGAffineTransformMakeScale(magnification, magnification);
-              }
-              completion:^(__unused BOOL finished2) {
-                [[NSNotificationCenter defaultCenter]
-                    postNotificationName:RCTTVNavigationEventNotification
-                                  object:@{@"eventType" : @"select", @"tag" : self.reactTag}];
-              }];
-        }];
-
-  } else {
-    [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
-                                                        object:@{@"eventType" : @"select", @"tag" : self.reactTag}];
-  }
-}
-
-- (BOOL)isUserInteractionEnabled
-{
-  return YES;
-}
-
-- (BOOL)canBecomeFocused
-{
-  return (self.isTVSelectable);
-}
-
-- (void)addParallaxMotionEffects
-{
-  // Size of shift movements
-  CGFloat const shiftDistanceX = [self.tvParallaxProperties[@"shiftDistanceX"] floatValue];
-  CGFloat const shiftDistanceY = [self.tvParallaxProperties[@"shiftDistanceY"] floatValue];
-
-  // Make horizontal movements shift the centre left and right
-  UIInterpolatingMotionEffect *xShift =
-      [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"center.x"
-                                                      type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
-  xShift.minimumRelativeValue = @(shiftDistanceX * -1.0f);
-  xShift.maximumRelativeValue = @(shiftDistanceX);
-
-  // Make vertical movements shift the centre up and down
-  UIInterpolatingMotionEffect *yShift =
-      [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"center.y"
-                                                      type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
-  yShift.minimumRelativeValue = @(shiftDistanceY * -1.0f);
-  yShift.maximumRelativeValue = @(shiftDistanceY);
-
-  // Size of tilt movements
-  CGFloat const tiltAngle = [self.tvParallaxProperties[@"tiltAngle"] floatValue];
-
-  // Now make horizontal movements effect a rotation about the Y axis for side-to-side rotation.
-  UIInterpolatingMotionEffect *xTilt =
-      [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"layer.transform"
-                                                      type:UIInterpolatingMotionEffectTypeTiltAlongHorizontalAxis];
-
-  // CATransform3D value for minimumRelativeValue
-  CATransform3D transMinimumTiltAboutY = CATransform3DIdentity;
-  transMinimumTiltAboutY.m34 = 1.0 / 500;
-  transMinimumTiltAboutY = CATransform3DRotate(transMinimumTiltAboutY, tiltAngle * -1.0, 0, 1, 0);
-
-  // CATransform3D value for minimumRelativeValue
-  CATransform3D transMaximumTiltAboutY = CATransform3DIdentity;
-  transMaximumTiltAboutY.m34 = 1.0 / 500;
-  transMaximumTiltAboutY = CATransform3DRotate(transMaximumTiltAboutY, tiltAngle, 0, 1, 0);
-
-  // Set the transform property boundaries for the interpolation
-  xTilt.minimumRelativeValue = [NSValue valueWithCATransform3D:transMinimumTiltAboutY];
-  xTilt.maximumRelativeValue = [NSValue valueWithCATransform3D:transMaximumTiltAboutY];
-
-  // Now make vertical movements effect a rotation about the X axis for up and down rotation.
-  UIInterpolatingMotionEffect *yTilt =
-      [[UIInterpolatingMotionEffect alloc] initWithKeyPath:@"layer.transform"
-                                                      type:UIInterpolatingMotionEffectTypeTiltAlongVerticalAxis];
-
-  // CATransform3D value for minimumRelativeValue
-  CATransform3D transMinimumTiltAboutX = CATransform3DIdentity;
-  transMinimumTiltAboutX.m34 = 1.0 / 500;
-  transMinimumTiltAboutX = CATransform3DRotate(transMinimumTiltAboutX, tiltAngle * -1.0, 1, 0, 0);
-
-  // CATransform3D value for minimumRelativeValue
-  CATransform3D transMaximumTiltAboutX = CATransform3DIdentity;
-  transMaximumTiltAboutX.m34 = 1.0 / 500;
-  transMaximumTiltAboutX = CATransform3DRotate(transMaximumTiltAboutX, tiltAngle, 1, 0, 0);
-
-  // Set the transform property boundaries for the interpolation
-  yTilt.minimumRelativeValue = [NSValue valueWithCATransform3D:transMinimumTiltAboutX];
-  yTilt.maximumRelativeValue = [NSValue valueWithCATransform3D:transMaximumTiltAboutX];
-
-  // Add all of the motion effects to this group
-  self.motionEffects = @[ xShift, yShift, xTilt, yTilt ];
-
-  float magnification = [self.tvParallaxProperties[@"magnification"] floatValue];
-
-  [UIView animateWithDuration:0.2
-                   animations:^{
-                     self.transform = CGAffineTransformMakeScale(magnification, magnification);
-                   }];
-}
-
-- (void)didUpdateFocusInContext:(UIFocusUpdateContext *)context
-       withAnimationCoordinator:(UIFocusAnimationCoordinator *)coordinator
-{
-  if (context.nextFocusedView == self && self.isTVSelectable) {
-    [self becomeFirstResponder];
-    [coordinator
-        addCoordinatedAnimations:^(void) {
-          if ([self.tvParallaxProperties[@"enabled"] boolValue]) {
-            [self addParallaxMotionEffects];
-          }
-          [[NSNotificationCenter defaultCenter]
-              postNotificationName:RCTTVNavigationEventNotification
-                            object:@{@"eventType" : @"focus", @"tag" : self.reactTag}];
-        }
-                      completion:^(void){
-                      }];
-  } else {
-    [coordinator
-        addCoordinatedAnimations:^(void) {
-          [[NSNotificationCenter defaultCenter] postNotificationName:RCTTVNavigationEventNotification
-                                                              object:@{@"eventType" : @"blur", @"tag" : self.reactTag}];
-          [UIView animateWithDuration:0.2
-                           animations:^{
-                             self.transform = CGAffineTransformMakeScale(1, 1);
-                           }];
-
-          for (UIMotionEffect *effect in [self.motionEffects copy]) {
-            [self removeMotionEffect:effect];
-          }
-        }
-                      completion:^(void){
-                      }];
-    [self resignFirstResponder];
-  }
-}
-
-- (void)setHasTVPreferredFocus:(BOOL)hasTVPreferredFocus
-{
-  _hasTVPreferredFocus = hasTVPreferredFocus;
-  if (hasTVPreferredFocus) {
-    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(1.0 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
-      UIView *rootview = self;
-      while (![rootview isReactRootView] && rootview != nil) {
-        rootview = [rootview superview];
-      }
-      if (rootview == nil)
-        return;
-
-      rootview = [rootview superview];
-
-      [rootview setNeedsFocusUpdate];
-      [rootview updateFocusIfNeeded];
-    });
-  }
-}
-
-@end
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index 8b948eb5eb9ab8..ee6c41fee1cc2b 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -20,10 +20,6 @@
 #import "RCTView.h"
 #import "UIView+React.h"
 
-#if TARGET_OS_TV
-#import "RCTTVView.h"
-#endif
-
 @implementation RCTConvert (UIAccessibilityTraits)
 
 RCT_MULTI_ENUM_CONVERTER(
@@ -83,11 +79,7 @@ - (dispatch_queue_t)methodQueue
 
 - (UIView *)view
 {
-#if TARGET_OS_TV
-  return [RCTTVView new];
-#else
   return [RCTView new];
-#endif
 }
 
 - (RCTShadowView *)shadowView
@@ -118,13 +110,6 @@ - (RCTShadowView *)shadowView
 
 #pragma mark - View properties
 
-#if TARGET_OS_TV
-// TODO: Delete props for Apple TV.
-RCT_EXPORT_VIEW_PROPERTY(isTVSelectable, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(hasTVPreferredFocus, BOOL)
-RCT_EXPORT_VIEW_PROPERTY(tvParallaxProperties, NSDictionary)
-#endif
-
 // Accessibility related properties
 RCT_REMAP_VIEW_PROPERTY(accessible, reactAccessibilityElement.isAccessibilityElement, BOOL)
 RCT_REMAP_VIEW_PROPERTY(accessibilityActions, reactAccessibilityElement.accessibilityActions, NSDictionaryArray)
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index 7e341219a63984..8bdb3bb461d267 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -11,6 +11,7 @@
 
 #import "RCTConvert.h"
 #import "RCTLog.h"
+#import "RCTRefreshControl.h"
 #import "RCTScrollEvent.h"
 #import "RCTUIManager.h"
 #import "RCTUIManagerObserverCoordinator.h"
@@ -19,10 +20,6 @@
 #import "UIView+Private.h"
 #import "UIView+React.h"
 
-#if !TARGET_OS_TV
-#import "RCTRefreshControl.h"
-#endif
-
 /**
  * Include a custom scroll view subclass because we want to limit certain
  * default UIKit behaviors such as textFields automatically scrolling
@@ -31,10 +28,8 @@
 @interface RCTCustomScrollView : UIScrollView <UIGestureRecognizerDelegate>
 
 @property (nonatomic, assign) BOOL centerContent;
-#if !TARGET_OS_TV
 @property (nonatomic, strong) UIView<RCTCustomRefreshContolProtocol> *customRefreshControl;
 @property (nonatomic, assign) BOOL pinchGestureEnabled;
-#endif
 
 @end
 
@@ -52,9 +47,7 @@ - (instancetype)initWithFrame:(CGRect)frame
       self.semanticContentAttribute = UISemanticContentAttributeForceLeftToRight;
     }
 
-#if !TARGET_OS_TV
     _pinchGestureEnabled = YES;
-#endif
   }
   return self;
 }
@@ -223,7 +216,6 @@ - (void)setFrame:(CGRect)frame
   }
 }
 
-#if !TARGET_OS_TV
 - (void)setCustomRefreshControl:(UIView<RCTCustomRefreshContolProtocol> *)refreshControl
 {
   if (_customRefreshControl) {
@@ -256,7 +248,6 @@ - (void)didMoveToWindow
   // in the setter gets overridden when the view loads.
   self.pinchGestureRecognizer.enabled = _pinchGestureEnabled;
 }
-#endif // TARGET_OS_TV
 
 - (BOOL)shouldGroupAccessibilityChildren
 {
@@ -351,15 +342,12 @@ - (void)setRemoveClippedSubviews:(__unused BOOL)removeClippedSubviews
 - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
 {
   [super insertReactSubview:view atIndex:atIndex];
-#if !TARGET_OS_TV
   if ([view conformsToProtocol:@protocol(RCTCustomRefreshContolProtocol)]) {
     [_scrollView setCustomRefreshControl:(UIView<RCTCustomRefreshContolProtocol> *)view];
     if (![view isKindOfClass:[UIRefreshControl class]] && [view conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
       [self addScrollListener:(UIView<UIScrollViewDelegate> *)view];
     }
-  } else
-#endif
-  {
+  } else {
     RCTAssert(
         _contentView == nil,
         @"RCTScrollView may only contain a single subview, the already set subview looks like: %@",
@@ -373,16 +361,13 @@ - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex
 - (void)removeReactSubview:(UIView *)subview
 {
   [super removeReactSubview:subview];
-#if !TARGET_OS_TV
   if ([subview conformsToProtocol:@protocol(RCTCustomRefreshContolProtocol)]) {
     [_scrollView setCustomRefreshControl:nil];
     if (![subview isKindOfClass:[UIRefreshControl class]] &&
         [subview conformsToProtocol:@protocol(UIScrollViewDelegate)]) {
       [self removeScrollListener:(UIView<UIScrollViewDelegate> *)subview];
     }
-  } else
-#endif
-  {
+  } else {
     RCTAssert(_contentView == subview, @"Attempted to remove non-existent subview");
     _contentView = nil;
   }
@@ -994,10 +979,8 @@ -(type)getter                                           \
 RCT_SET_AND_PRESERVE_OFFSET(setMaximumZoomScale, maximumZoomScale, CGFloat)
 RCT_SET_AND_PRESERVE_OFFSET(setMinimumZoomScale, minimumZoomScale, CGFloat)
 RCT_SET_AND_PRESERVE_OFFSET(setScrollEnabled, isScrollEnabled, BOOL)
-#if !TARGET_OS_TV
 RCT_SET_AND_PRESERVE_OFFSET(setPagingEnabled, isPagingEnabled, BOOL)
 RCT_SET_AND_PRESERVE_OFFSET(setScrollsToTop, scrollsToTop, BOOL)
-#endif
 RCT_SET_AND_PRESERVE_OFFSET(setShowsHorizontalScrollIndicator, showsHorizontalScrollIndicator, BOOL)
 RCT_SET_AND_PRESERVE_OFFSET(setShowsVerticalScrollIndicator, showsVerticalScrollIndicator, BOOL)
 RCT_SET_AND_PRESERVE_OFFSET(setZoomScale, zoomScale, CGFloat);
diff --git a/React/Views/ScrollView/RCTScrollViewManager.m b/React/Views/ScrollView/RCTScrollViewManager.m
index a176d1068609ba..086a05450cbd6d 100644
--- a/React/Views/ScrollView/RCTScrollViewManager.m
+++ b/React/Views/ScrollView/RCTScrollViewManager.m
@@ -78,11 +78,9 @@ - (UIView *)view
 RCT_EXPORT_VIEW_PROPERTY(maximumZoomScale, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(minimumZoomScale, CGFloat)
 RCT_EXPORT_VIEW_PROPERTY(scrollEnabled, BOOL)
-#if !TARGET_OS_TV
 RCT_EXPORT_VIEW_PROPERTY(pagingEnabled, BOOL)
 RCT_REMAP_VIEW_PROPERTY(pinchGestureEnabled, scrollView.pinchGestureEnabled, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(scrollsToTop, BOOL)
-#endif
 RCT_EXPORT_VIEW_PROPERTY(showsHorizontalScrollIndicator, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(showsVerticalScrollIndicator, BOOL)
 RCT_EXPORT_VIEW_PROPERTY(scrollEventThrottle, NSTimeInterval)
diff --git a/ReactCommon/React-Fabric.podspec b/ReactCommon/React-Fabric.podspec
index 1937e45d71b0b6..0bf38ed0c2f62a 100644
--- a/ReactCommon/React-Fabric.podspec
+++ b/ReactCommon/React-Fabric.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.prepare_command        = File.read("../scripts/generate-rncore.sh")
   s.source_files           = "dummyFile.cpp"
diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec
index 0e306074b6239c..0c083cf2d5b133 100644
--- a/ReactCommon/ReactCommon.podspec
+++ b/ReactCommon/ReactCommon.podspec
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.header_dir             = "ReactCommon" # Use global header_dir for all subspecs for use_frameworks! compatibility
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
diff --git a/ReactCommon/callinvoker/React-callinvoker.podspec b/ReactCommon/callinvoker/React-callinvoker.podspec
index e2a90d30943353..76aec146d61cdb 100644
--- a/ReactCommon/callinvoker/React-callinvoker.podspec
+++ b/ReactCommon/callinvoker/React-callinvoker.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "ReactCommon"
diff --git a/ReactCommon/jsi/React-jsi.podspec b/ReactCommon/jsi/React-jsi.podspec
index 01035d5667e3e4..d250597b12721f 100644
--- a/ReactCommon/jsi/React-jsi.podspec
+++ b/ReactCommon/jsi/React-jsi.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.exclude_files          = "**/test/*"
diff --git a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
index f67143d1b0c91d..45429c92bf325d 100644
--- a/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
+++ b/ReactCommon/jsiexecutor/React-jsiexecutor.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files         = "jsireact/*.{cpp,h}"
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
diff --git a/ReactCommon/jsinspector/React-jsinspector.podspec b/ReactCommon/jsinspector/React-jsinspector.podspec
index 600480fe8e20cd..f87cdeefe3aed5 100644
--- a/ReactCommon/jsinspector/React-jsinspector.podspec
+++ b/ReactCommon/jsinspector/React-jsinspector.podspec
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "*.{cpp,h}"
   s.header_dir             = 'jsinspector'
diff --git a/ReactCommon/reactperflogger/React-perflogger.podspec b/ReactCommon/reactperflogger/React-perflogger.podspec
index 43d795d08e3ad0..b620cbf0e270bb 100644
--- a/ReactCommon/reactperflogger/React-perflogger.podspec
+++ b/ReactCommon/reactperflogger/React-perflogger.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "reactperflogger"
diff --git a/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec b/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec
index e7fc8d2d2a3319..152c1f639b205c 100644
--- a/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec
+++ b/ReactCommon/runtimeexecutor/React-runtimeexecutor.podspec
@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "10.0", :tvos => "10.0" }
+  s.platforms              = { :ios => "10.0" }
   s.source                 = source
   s.source_files           = "**/*.{cpp,h}"
   s.header_dir             = "ReactCommon"
diff --git a/ReactCommon/yoga/Yoga.podspec b/ReactCommon/yoga/Yoga.podspec
index b0a69cbb9b603a..500dfee8e47ac5 100644
--- a/ReactCommon/yoga/Yoga.podspec
+++ b/ReactCommon/yoga/Yoga.podspec
@@ -43,7 +43,7 @@ Pod::Spec.new do |spec|
   ]
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "10.0", :tvos => "10.0" }
+  spec.platforms = { :ios => "10.0" }
 
   # Set this environment variable when *not* using the `:path` option to install the pod.
   # E.g. when publishing this spec to a spec repo.
diff --git a/index.js b/index.js
index 63c1d5f96fd29f..581c1a9522fb38 100644
--- a/index.js
+++ b/index.js
@@ -80,7 +80,6 @@ import typeof StyleSheet from './Libraries/StyleSheet/StyleSheet';
 import typeof Systrace from './Libraries/Performance/Systrace';
 import typeof ToastAndroid from './Libraries/Components/ToastAndroid/ToastAndroid';
 import typeof * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistry';
-import typeof TVEventHandler from './Libraries/Components/AppleTV/TVEventHandler';
 import typeof UIManager from './Libraries/ReactNative/UIManager';
 import typeof useColorScheme from './Libraries/Utilities/useColorScheme';
 import typeof useWindowDimensions from './Libraries/Utilities/useWindowDimensions';
@@ -417,9 +416,6 @@ module.exports = {
   get TurboModuleRegistry(): TurboModuleRegistry {
     return require('./Libraries/TurboModule/TurboModuleRegistry');
   },
-  get TVEventHandler(): TVEventHandler {
-    return require('./Libraries/Components/AppleTV/TVEventHandler');
-  },
   get UIManager(): UIManager {
     return require('./Libraries/ReactNative/UIManager');
   },
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index feb55d5dbc64aa..0ea79d0fad55c3 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -489,8 +489,8 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: cde416483dac037923206447da6e1454df403714
-  FBLazyVector: 8ea0285646adaf7fa725c20ed737c49ee5ea680a
-  FBReactNativeSpec: 29b1b8a11346e71351f3a2ba126439810edee362
+  FBLazyVector: fe973c09b2299b5e8154186ecf1f6554b4f70987
+  FBReactNativeSpec: 20a9345af9157362b51ab0258d842cb7bb347d19
   Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
@@ -501,31 +501,31 @@ SPEC CHECKSUMS:
   glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
   OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
   RCT-Folly: b39288cedafe50da43317ec7d91bcc8cc0abbf33
-  RCTRequired: 34582e9b3ebe69f244e091f37218d318406d5c4a
-  RCTTypeSafety: 84db212a990ce622a28f1bcb1ac68c658e722373
-  React: cafb3c2321f7df55ce90dbf29d513799a79e4418
-  React-callinvoker: 0dada022d38b73e6e15b33e2a96476153f79bbf6
-  React-Core: fbbfaa3cbb1ca720fd74ef938214b5943da1aa5d
-  React-CoreModules: f38b671f8df4c1c744ed69f00264539a7c4024b4
+  RCTRequired: d3d4ce60e1e2282864d7560340690a3c8c646de1
+  RCTTypeSafety: 4da4f9f218727257c50fd3bf2683a06cdb4fede3
+  React: 87b3271d925336a94620915db5845c67c5dbbd77
+  React-callinvoker: e9524d75cf0b7ae108868f8d34c0b8d7dc08ec03
+  React-Core: f4eeb7ca3d6a7c2879d1d5b093800f23da9be617
+  React-CoreModules: 87f011fa87190ffe979e443ce578ec93ec6ff4d4
   React-cxxreact: de6de17eac6bbaa4f9fad46b66e7f0c4aaaf863d
-  React-jsi: 652ad7cb7ff8c87e0e9fb11e9ebcbbc70cdfe865
-  React-jsiexecutor: f20d2b5986dbe3d0e94ccbf2d8da24e0d9c42cc9
-  React-jsinspector: 7fbf9b42b58b02943a0d89b0ba9fff0070f2de98
-  React-perflogger: 1f668f3e4d1adef1fafb3b95e7d6cf922113fe31
-  React-RCTActionSheet: 51c43beeb74ef41189e87fe9823e53ebf6210359
-  React-RCTAnimation: 62f271148b71d0200773b4959e99a80f624182d4
-  React-RCTBlob: e3e60611af4a077b3c0a3f74f49a2c4a9a298da3
-  React-RCTImage: 37646ebc761e9f68781867e9e802afdadd18a3dc
-  React-RCTLinking: b5c261eb3befe7d5c62a4706ae904943e73f9c82
-  React-RCTNetwork: 2f6c4ba283c9c2ea768fecc6c681d3ab9448b5f5
-  React-RCTPushNotification: a4f86ef3d7c0cb3ee570108a62e39fcd296a5030
-  React-RCTSettings: 5a76683d9cf7408b5f8c3306cda3eaf4db191fce
+  React-jsi: 790da16b69a61adc36829eed43c44187c1488d10
+  React-jsiexecutor: 17a3e26806bc19d8be7b6c83792bffc46df796be
+  React-jsinspector: 01db8cd098c7ab72bd09abdda522a08c9acd3af9
+  React-perflogger: 37913fce32026582ad0244b585d1e52652fd01c0
+  React-RCTActionSheet: e6562ea4df7099af4023d1bd0e9716e43b45a5c9
+  React-RCTAnimation: fc2f655a64f0791879ab03843cca90c53737d1cb
+  React-RCTBlob: 5f82467e5d3bef65d05cdd900df6e12b0849744a
+  React-RCTImage: f3a98834281555ce1bbbe1af0306aaf40ac70fc7
+  React-RCTLinking: 801d05ad5e6d1636e977f4dfeab21f87358a02a5
+  React-RCTNetwork: b5e2f27a098ca52d98426328640314a499da6d00
+  React-RCTPushNotification: ce60993f816f917a6495227e16978b5fd550d73b
+  React-RCTSettings: 3cb638230af06ba769edc0bc4ed4123040b1b4e2
   React-RCTTest: 090e9816044220c39462be109dab6d473d94b1c9
-  React-RCTText: 6c01963d3e562109f5548262b09b1b2bc260dd60
-  React-RCTVibration: 0997fcaf753c7ac0a341177db120eebc438484cf
-  React-runtimeexecutor: 60dd6204a13f68a1aa1118870edcc604a791df2b
-  ReactCommon: e74025a9d02a02150f065719e14a8cbe03a93513
-  Yoga: f7fa200d8c49f97b54c9421079e781fb900b5cae
+  React-RCTText: 51a41bf9d18a91b2437b833ed4246754baf830d0
+  React-RCTVibration: a1cce36dd452eb88296d99d80d66f2c5bd50aad4
+  React-runtimeexecutor: 53867815d0a01e53a2c901cb7f01076216c5c799
+  ReactCommon: dc40b68c9a72e99e07f831b0e87a859f4660208b
+  Yoga: 69ef0b2bba5387523f793957a9f80dbd61e89631
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: c38c19657f5aaa2d604f5f4c607f030b60452997
diff --git a/packages/rn-tester/js/examples/TVEventHandler/TVEventHandlerExample.js b/packages/rn-tester/js/examples/TVEventHandler/TVEventHandlerExample.js
deleted file mode 100644
index 26aff1bfc30ef2..00000000000000
--- a/packages/rn-tester/js/examples/TVEventHandler/TVEventHandlerExample.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-const React = require('react');
-const ReactNative = require('react-native');
-
-const {Platform, View, Text, TouchableOpacity, TVEventHandler} = ReactNative;
-
-type Props = $ReadOnly<{||}>;
-type State = {|lastEventType: string|};
-class TVEventHandlerView extends React.Component<Props, State> {
-  constructor(props: Props) {
-    super(props);
-    this.state = {
-      lastEventType: '',
-    };
-  }
-
-  _tvEventHandler: any;
-
-  _enableTVEventHandler() {
-    this._tvEventHandler = new TVEventHandler();
-    this._tvEventHandler.enable(this, function(cmp, evt) {
-      cmp.setState({
-        lastEventType: evt.eventType,
-      });
-    });
-  }
-
-  _disableTVEventHandler() {
-    if (this._tvEventHandler) {
-      this._tvEventHandler.disable();
-      delete this._tvEventHandler;
-    }
-  }
-
-  componentDidMount() {
-    this._enableTVEventHandler();
-  }
-
-  componentWillUnmount() {
-    this._disableTVEventHandler();
-  }
-
-  render() {
-    if (Platform.isTV) {
-      return (
-        <View>
-          <TouchableOpacity onPress={() => {}}>
-            <Text>
-              This example enables an instance of TVEventHandler to show the
-              last event detected from the Apple TV Siri remote or from a
-              keyboard.
-            </Text>
-          </TouchableOpacity>
-          <Text style={{color: 'blue'}}>{this.state.lastEventType}</Text>
-        </View>
-      );
-    } else {
-      return (
-        <View>
-          <Text>This example is intended to be run on Apple TV.</Text>
-        </View>
-      );
-    }
-  }
-}
-
-exports.framework = 'React';
-exports.title = 'TVEventHandler example';
-exports.category = 'iOS';
-exports.description = 'iOS alerts and action sheets';
-exports.examples = [
-  {
-    title: 'TVEventHandler',
-    render(): React.Node {
-      return <TVEventHandlerView />;
-    },
-  },
-];
diff --git a/packages/rn-tester/js/utils/RNTesterList.ios.js b/packages/rn-tester/js/utils/RNTesterList.ios.js
index f0e96e4b005734..1c23b3aec4e028 100644
--- a/packages/rn-tester/js/utils/RNTesterList.ios.js
+++ b/packages/rn-tester/js/utils/RNTesterList.ios.js
@@ -293,11 +293,6 @@ const APIExamples: Array<RNTesterExample> = [
     module: require('../examples/TurboModule/TurboModuleExample'),
     supportsTVOS: false,
   },
-  {
-    key: 'TVEventHandlerExample',
-    module: require('../examples/TVEventHandler/TVEventHandlerExample'),
-    supportsTVOS: true,
-  },
   {
     key: 'VibrationExample',
     module: require('../examples/Vibration/VibrationExample'),
diff --git a/scripts/.tests.env b/scripts/.tests.env
index 0d9a9376dda3de..831e4ff0b8426d 100644
--- a/scripts/.tests.env
+++ b/scripts/.tests.env
@@ -19,7 +19,6 @@ export AVD_ABI=x86
 ## IOS ##
 export IOS_TARGET_OS="13.6"
 export IOS_DEVICE="iPhone 8"
-export TVOS_DEVICE="Apple TV"
 export SDK_IOS="iphonesimulator"
 
 ## CI OVERRIDES ##
diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh
index 73a892c9a85c15..f527702bbd03c9 100755
--- a/scripts/ios-configure-glog.sh
+++ b/scripts/ios-configure-glog.sh
@@ -30,22 +30,12 @@ fi
 
 ./configure --host arm-apple-darwin
 
-# Fix build for tvOS
-cat << EOF >> src/config.h
-
 /* Add in so we have Apple Target Conditionals */
 #ifdef __APPLE__
 #include <TargetConditionals.h>
 #include <Availability.h>
 #endif
 
-/* Special configuration for AppleTVOS */
-#if TARGET_OS_TV
-#undef HAVE_SYSCALL_H
-#undef HAVE_SYS_SYSCALL_H
-#undef OS_MACOSX
-#endif
-
 /* Special configuration for ucontext */
 #undef HAVE_UCONTEXT_H
 #undef PC_FROM_UCONTEXT
diff --git a/template/ios/HelloWorld.xcodeproj/project.pbxproj b/template/ios/HelloWorld.xcodeproj/project.pbxproj
index 0a340e5af348ee..217779569f5da2 100644
--- a/template/ios/HelloWorld.xcodeproj/project.pbxproj
+++ b/template/ios/HelloWorld.xcodeproj/project.pbxproj
@@ -37,7 +37,6 @@
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = HelloWorld/main.m; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = HelloWorld/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
-		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
diff --git a/third-party-podspecs/DoubleConversion.podspec b/third-party-podspecs/DoubleConversion.podspec
index fb337a96f70648..b84ba28a6b143e 100644
--- a/third-party-podspecs/DoubleConversion.podspec
+++ b/third-party-podspecs/DoubleConversion.podspec
@@ -19,6 +19,6 @@ Pod::Spec.new do |spec|
   spec.compiler_flags = '-Wno-unreachable-code'
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "10.0", :tvos => "10.0" }
+  spec.platforms = { :ios => "10.0" }
 
 end
diff --git a/third-party-podspecs/glog.podspec b/third-party-podspecs/glog.podspec
index b5f29e538d0eab..4a931f46a0cfa8 100644
--- a/third-party-podspecs/glog.podspec
+++ b/third-party-podspecs/glog.podspec
@@ -34,6 +34,6 @@ Pod::Spec.new do |spec|
                                "HEADER_SEARCH_PATHS" => "$(PODS_TARGET_SRCROOT)/src" }
 
   # Pinning to the same version as React.podspec.
-  spec.platforms = { :ios => "10.0", :tvos => "10.0" }
+  spec.platforms = { :ios => "10.0" }
 
 end

From 29f5dc2ae0091e3b230687a1870512316c156e87 Mon Sep 17 00:00:00 2001
From: simek <gosimek@gmail.com>
Date: Mon, 28 Sep 2020 22:39:27 -0700
Subject: [PATCH 099/241] chore: deduplicate lock, update packages repository
 fields (#30044)

Summary:
This small PR includes the following changes:
* deduplicate yarn lock file using [`yarn-deduplicate`](https://github.com/atlassian/yarn-deduplicate) package
  * deduplicate script has been added as `update-lock`, let me know if you would like also to see this in [`postinstall`](https://docs.npmjs.com/misc/scripts) (to automatically optimize lock on every dependency change)
* according to the [npm docs](https://docs.npmjs.com/files/package.json#repository):
  * main `package.json` repository field has been replaced with shorthand
  * monorepo packages repository field has been extended by `directory`

The main goal of introducing deduplication script was to optimize the dependencies footprint while developing and speed up the initial installation process. Running `yarn-deduplicate` also increase the security in some way, because it enforces usage only of the latest version of the package. You can read more about the benefits in the deduplicate script [repository](https://github.com/atlassian/yarn-deduplicate#duplicated-packages).

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Added] - add yarn lock deduplication script

Pull Request resolved: https://github.com/facebook/react-native/pull/30044

Test Plan: `yarn install` was successful, this also should not affect yarn workspaces in any way.

Reviewed By: GijsWeterings

Differential Revision: D23959812

Pulled By: cpojer

fbshipit-source-id: e2455e3718378e1ce6206e79463d4083f8fe5d47
---
 package.json                                  |   6 +-
 packages/assets/package.json                  |   3 +-
 packages/babel-plugin-codegen/package.json    |   3 +-
 .../package.json                              |   3 +-
 packages/eslint-plugin-codegen/package.json   |   3 +-
 .../package.json                              |   3 +-
 packages/normalize-color/package.json         |   3 +-
 packages/polyfills/package.json               |   3 +-
 packages/react-native-codegen/package.json    |   3 +-
 packages/rn-tester/package.json               |   3 +-
 yarn.lock                                     | 532 ++----------------
 11 files changed, 66 insertions(+), 499 deletions(-)

diff --git a/package.json b/package.json
index 8289be281dbbe8..433b4c90a32c7b 100644
--- a/package.json
+++ b/package.json
@@ -5,10 +5,7 @@
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
-  },
+  "repository": "github:facebook/react-native",
   "engines": {
     "node": ">=10"
   },
@@ -64,6 +61,7 @@
     "format": "npm run prettier && npm run clang-format",
     "prettier": "prettier --write \"./**/*.{js,md,yml}\"",
     "format-check": "prettier --list-different \"./**/*.{js,md,yml}\"",
+    "update-lock": "npx yarn-deduplicate",
     "docker-setup-android": "docker pull reactnativecommunity/react-native-android",
     "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
diff --git a/packages/assets/package.json b/packages/assets/package.json
index 13064909c99bb9..885e7175338867 100644
--- a/packages/assets/package.json
+++ b/packages/assets/package.json
@@ -4,7 +4,8 @@
   "description": "Asset support code for React Native.",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/assets"
   },
   "license": "MIT"
 }
diff --git a/packages/babel-plugin-codegen/package.json b/packages/babel-plugin-codegen/package.json
index ee2f27f894d54b..5360b6829c8a31 100644
--- a/packages/babel-plugin-codegen/package.json
+++ b/packages/babel-plugin-codegen/package.json
@@ -4,7 +4,8 @@
   "description": "Babel plugin to generate native module and view manager code for React Native.",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/babel-plugin-codegen"
   },
   "dependencies": {
     "react-native-codegen": "*"
diff --git a/packages/eslint-config-react-native-community/package.json b/packages/eslint-config-react-native-community/package.json
index a05f990d388fcc..3b8bc5635a3812 100644
--- a/packages/eslint-config-react-native-community/package.json
+++ b/packages/eslint-config-react-native-community/package.json
@@ -6,7 +6,8 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/eslint-config-react-native-community"
   },
   "homepage": "https://github.com/facebook/react-native/tree/master/packages/eslint-config-react-native-community#readme",
   "dependencies": {
diff --git a/packages/eslint-plugin-codegen/package.json b/packages/eslint-plugin-codegen/package.json
index 9d4b2328a91f8a..bc2b272dfe81af 100644
--- a/packages/eslint-plugin-codegen/package.json
+++ b/packages/eslint-plugin-codegen/package.json
@@ -5,7 +5,8 @@
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/eslint-plugin-codegen"
   },
   "license": "MIT"
 }
diff --git a/packages/eslint-plugin-react-native-community/package.json b/packages/eslint-plugin-react-native-community/package.json
index dad503b7c0e447..947d62498461b2 100644
--- a/packages/eslint-plugin-react-native-community/package.json
+++ b/packages/eslint-plugin-react-native-community/package.json
@@ -5,7 +5,8 @@
   "main": "index.js",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/eslint-plugin-react-native-community"
   },
   "license": "MIT"
 }
diff --git a/packages/normalize-color/package.json b/packages/normalize-color/package.json
index a9fd8fcef1b23d..9ff2e8a0733d9f 100644
--- a/packages/normalize-color/package.json
+++ b/packages/normalize-color/package.json
@@ -4,7 +4,8 @@
   "description": "Color normalization code for React Native.",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/normalize-color"
   },
   "license": "MIT"
 }
diff --git a/packages/polyfills/package.json b/packages/polyfills/package.json
index ed96b9f671dea5..6f00c64c7fca72 100644
--- a/packages/polyfills/package.json
+++ b/packages/polyfills/package.json
@@ -4,7 +4,8 @@
   "description": "Polyfills for React Native.",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/polyfills"
   },
   "license": "MIT"
 }
diff --git a/packages/react-native-codegen/package.json b/packages/react-native-codegen/package.json
index a68d170a740d1c..6f6cac7bb3599f 100644
--- a/packages/react-native-codegen/package.json
+++ b/packages/react-native-codegen/package.json
@@ -5,7 +5,8 @@
   "homepage": "https://github.com/facebook/react-native/tree/master/packages/react-native-codegen",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/react-native-codegen"
   },
   "scripts": {
     "build": "yarn clean && node scripts/build.js --verbose",
diff --git a/packages/rn-tester/package.json b/packages/rn-tester/package.json
index 268966a0890777..ba5cec706139d5 100644
--- a/packages/rn-tester/package.json
+++ b/packages/rn-tester/package.json
@@ -6,7 +6,8 @@
   "homepage": "https://github.com/facebook/react-native/tree/master/packages/rn-tester",
   "repository": {
     "type": "git",
-    "url": "git@github.com:facebook/react-native.git"
+    "url": "git@github.com:facebook/react-native.git",
+    "directory": "packages/rn-tester"
   },
   "dependencies": {
     "invariant": "^2.2.4",
diff --git a/yarn.lock b/yarn.lock
index b609e76d6021d8..a043e328e032cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -247,11 +247,6 @@
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.0.tgz#8eca3e71a73dd562c5222376b08253436bb4995b"
   integrity sha512-fnDUl1Uy2gThM4IFVW4ISNHqr3cJrCsRkSCasFgx0XDO9JcttDS5ytyBc4Cu4X1+fjoo3IVvFbRD6TeFlHJlEQ==
 
-"@babel/plugin-check-constants@^7.0.0-beta.38":
-  version "7.0.0-beta.38"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-check-constants/-/plugin-check-constants-7.0.0-beta.38.tgz#bbda6306d45a4f097ccb416c0b52d6503f6502cf"
-  integrity sha512-MjdGn/2sMLu0fnNFbkILut0OsegzRTeCOJ/uGHH88TwTXPzxONx2cTVJ36i3cTQXHMiIOUT3hX6HqzWM99Q6vA==
-
 "@babel/plugin-external-helpers@^7.0.0":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-external-helpers/-/plugin-external-helpers-7.8.3.tgz#5a94164d9af393b2820a3cdc407e28ebf237de4b"
@@ -978,24 +973,7 @@
     source-map "^0.6.1"
     write-file-atomic "^3.0.0"
 
-"@jest/types@^24.7.0":
-  version "24.7.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.7.0.tgz#c4ec8d1828cdf23234d9b4ee31f5482a3f04f48b"
-  integrity sha512-ipJUa2rFWiKoBqMKP63Myb6h9+iT3FHRTF2M8OR6irxWzItisa8i4dcSg14IbvmXUnBlHBlUQPYUHWyX3UPpYA==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/yargs" "^12.0.9"
-
-"@jest/types@^24.8.0":
-  version "24.8.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.8.0.tgz#f31e25948c58f0abd8c845ae26fcea1491dea7ad"
-  integrity sha512-g17UxVr2YfBtaMUxn9u/4+siG1ptg9IGYAYwvpwn61nBg779RXnjE/m7CxYcIzEt0AbHZZAHSEZNhkE2WxURVg==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^12.0.9"
-
-"@jest/types@^24.9.0":
+"@jest/types@^24.8.0", "@jest/types@^24.9.0":
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-24.9.0.tgz#63cb26cb7500d069e5a389441a7c6ab5e909fc59"
   integrity sha512-XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw==
@@ -1004,16 +982,6 @@
     "@types/istanbul-reports" "^1.1.1"
     "@types/yargs" "^13.0.0"
 
-"@jest/types@^25.3.0":
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.3.0.tgz#88f94b277a1d028fd7117bc1f74451e0fc2131e7"
-  integrity sha512-UkaDNewdqXAmCDbN2GlUM6amDKS78eCqiw/UmF5nE0mmLTd6moJkiZJML/X52Ke3LH7Swhw883IRXq8o9nWjVw==
-  dependencies:
-    "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
-    "@types/yargs" "^15.0.0"
-    chalk "^3.0.0"
-
 "@jest/types@^25.5.0":
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz#4d6a4793f7b9599fc3680877b856a97dbccf2a9d"
@@ -1204,16 +1172,11 @@
   dependencies:
     "@types/node" "*"
 
-"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.1":
+"@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz#42995b446db9a48a11a07ec083499a860e9138ff"
   integrity sha512-hRJD2ahnnpLgsj6KWMYSrmXkM3rm2Dl1qkx6IOFD5FnuNPXJIG5L0dhgKXCYTRMGzU4n0wImQ/xfmRc4POUFlg==
 
-"@types/istanbul-lib-coverage@^2.0.0":
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.0.tgz#1eb8c033e98cf4e1a4cedcaf8bcafe8cb7591e85"
-  integrity sha512-eAtOAFZefEnfJiRFQBGw1eYqa5GTLCZ1y86N0XSI/D6EB+E8z6VPV/UL7Gi5UEclFqoQk+6NRqEDsfmDLXn8sg==
-
 "@types/istanbul-lib-report@*":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-report/-/istanbul-lib-report-1.1.1.tgz#e5471e7fa33c61358dd38426189c037a58433b8c"
@@ -1254,11 +1217,6 @@
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
   integrity sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==
 
-"@types/yargs@^12.0.9":
-  version "12.0.9"
-  resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.9.tgz#693e76a52f61a2f1e7fb48c0eef167b95ea4ffd0"
-  integrity sha512-sCZy4SxP9rN2w30Hlmg5dtdRwgYQfYRiLo9usw8X9cxlf+H4FqM1xX7+sNH7NNKVdbXMJWqva7iyy+fxh/V7fA==
-
 "@types/yargs@^13.0.0":
   version "13.0.8"
   resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz#a38c22def2f1c2068f8971acb3ea734eb3c64a99"
@@ -1326,17 +1284,7 @@ acorn@^7.1.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz#e35668de0b402f359de515c5482a1ab9f89a69bf"
   integrity sha512-add7dgA5ppRPxCFJoAGfMDi7PIBXq1RtGo7BhbLaxwrXPOmw8gq48Y9ozT01hUKy9byMjlR20EJhu5zlkErEkg==
 
-ajv@^5.3.0:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
-  integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
-  dependencies:
-    co "^4.6.0"
-    fast-deep-equal "^1.0.0"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.3.0"
-
-ajv@^6.10.0, ajv@^6.10.2:
+ajv@^6.10.0, ajv@^6.10.2, ajv@^6.5.5:
   version "6.12.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd"
   integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ==
@@ -1346,16 +1294,6 @@ ajv@^6.10.0, ajv@^6.10.2:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^6.5.5:
-  version "6.12.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz#06d60b96d87b8454a5adaba86e7854da629db4b7"
-  integrity sha512-D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw==
-  dependencies:
-    fast-deep-equal "^3.1.1"
-    fast-json-stable-stringify "^2.0.0"
-    json-schema-traverse "^0.4.1"
-    uri-js "^4.2.2"
-
 anser@^1.4.9:
   version "1.4.9"
   resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
@@ -1420,12 +1358,7 @@ ansi-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
   integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
 
-ansi-regex@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.0.0.tgz#70de791edf021404c3fd615aa89118ae0432e5a9"
-  integrity sha512-iB5Dda8t/UqpPI/IjsejXu5jOGDrzn41wJyljwPH65VCIbk6+1BzFIMJGFwTNrYXT1CrD+B4l19U7awiQ8rk7w==
-
-ansi-regex@^4.1.0:
+ansi-regex@^4.0.0, ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
@@ -1597,7 +1530,7 @@ astral-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
   integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
 
-async-limiter@^1.0.0, async-limiter@~1.0.0:
+async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
   integrity sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==
@@ -1720,41 +1653,7 @@ babel-preset-current-node-syntax@^0.1.2:
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-babel-preset-fbjs@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.0.1.tgz#0be99c39367d6fb5bbcf1f6c33be0321b5234c1c"
-  integrity sha512-Fc0t7v8T1tBwv5AVyDDZEnS3T7OQ97qV0XawVZg1ouarlM9xCHL994C5tU8TBIKPk3yZXG+SaEM1YQcx/yLlcg==
-  dependencies:
-    "@babel/plugin-check-constants" "^7.0.0-beta.38"
-    "@babel/plugin-proposal-class-properties" "^7.0.0"
-    "@babel/plugin-proposal-object-rest-spread" "^7.0.0"
-    "@babel/plugin-syntax-class-properties" "^7.0.0"
-    "@babel/plugin-syntax-flow" "^7.0.0"
-    "@babel/plugin-syntax-jsx" "^7.0.0"
-    "@babel/plugin-syntax-object-rest-spread" "^7.0.0"
-    "@babel/plugin-transform-arrow-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.0.0"
-    "@babel/plugin-transform-block-scoping" "^7.0.0"
-    "@babel/plugin-transform-classes" "^7.0.0"
-    "@babel/plugin-transform-computed-properties" "^7.0.0"
-    "@babel/plugin-transform-destructuring" "^7.0.0"
-    "@babel/plugin-transform-flow-strip-types" "^7.0.0"
-    "@babel/plugin-transform-for-of" "^7.0.0"
-    "@babel/plugin-transform-function-name" "^7.0.0"
-    "@babel/plugin-transform-literals" "^7.0.0"
-    "@babel/plugin-transform-member-expression-literals" "^7.0.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.0.0"
-    "@babel/plugin-transform-object-super" "^7.0.0"
-    "@babel/plugin-transform-parameters" "^7.0.0"
-    "@babel/plugin-transform-property-literals" "^7.0.0"
-    "@babel/plugin-transform-react-display-name" "^7.0.0"
-    "@babel/plugin-transform-react-jsx" "^7.0.0"
-    "@babel/plugin-transform-shorthand-properties" "^7.0.0"
-    "@babel/plugin-transform-spread" "^7.0.0"
-    "@babel/plugin-transform-template-literals" "^7.0.0"
-    babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
-
-babel-preset-fbjs@^3.3.0:
+babel-preset-fbjs@^3.0.0, babel-preset-fbjs@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541"
   integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw==
@@ -1964,12 +1863,7 @@ callsites@^3.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.0.0.tgz#fb7eb569b72ad7a45812f93fd9430a3e410b3dd3"
   integrity sha512-tWnkwu9YEq2uzlBDI4RcLn8jrFvF9AOi8PxDNU3hZZjJcjkcRAq3vCI+vZcg1SuxISDYe86k9VZFwAxDiJGoAw==
 
-camelcase@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.0.0.tgz#03295527d58bd3cd4aa75363f35b2e8d97be2f42"
-  integrity sha512-faqwZqnWxbxn+F1d399ygeamQNy3lPp/H9H6rNrqYh4FSVCtcY+3cub1MxA8o9mDd55mM8Aghuu/kuyYA6VTsA==
-
-camelcase@^5.3.1:
+camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -1991,16 +1885,7 @@ caseless@~0.12.0:
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
-  integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
-  dependencies:
-    ansi-styles "^3.2.1"
-    escape-string-regexp "^1.0.5"
-    supports-color "^5.3.0"
-
-chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -2278,14 +2163,7 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0:
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
 
-convert-source-map@^1.4.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
-  integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
-  dependencies:
-    safe-buffer "~5.1.1"
-
-convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
   integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
@@ -2307,16 +2185,7 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-cosmiconfig@^5.0.5:
-  version "5.0.6"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.0.6.tgz#dca6cf680a0bd03589aff684700858c81abeeb39"
-  integrity sha512-6DWfizHriCrFWURP1/qyhsiFvYdlJzbCzmtFWh744+KyWsJo5+kPzUZZaMRSSItoYc0pxFX7gEO7ZC1/gN/7AQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-
-cosmiconfig@^5.1.0:
+cosmiconfig@^5.0.5, cosmiconfig@^5.1.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.0.tgz#45038e4d28a7fe787203aede9c25bca4a08b12c8"
   integrity sha512-nxt+Nfc3JAqf4WIWd0jXLjTJZmsPLrA9DDc4nRw2KFJQJK7DNooqSXrNI7tzLG50CF8axczly5UV929tBmh/7g==
@@ -2425,20 +2294,13 @@ debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3:
   dependencies:
     ms "2.0.0"
 
-debug@^4.0.1, debug@^4.1.1:
+debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
   integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.0.tgz#373687bffa678b38b1cd91f861b63850035ddc87"
-  integrity sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==
-  dependencies:
-    ms "^2.1.1"
-
 decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
@@ -2667,7 +2529,7 @@ errorhandler@^1.5.0:
     accepts "~1.3.3"
     escape-html "~1.0.3"
 
-es-abstract@^1.11.0:
+es-abstract@^1.11.0, es-abstract@^1.7.0:
   version "1.13.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
   integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
@@ -2679,18 +2541,7 @@ es-abstract@^1.11.0:
     is-regex "^1.0.4"
     object-keys "^1.0.12"
 
-es-abstract@^1.7.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  integrity sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
-es-to-primitive@^1.1.1, es-to-primitive@^1.2.0:
+es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
   integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
@@ -2856,12 +2707,7 @@ eslint-utils@^1.4.3:
   dependencies:
     eslint-visitor-keys "^1.1.0"
 
-eslint-visitor-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
-  integrity sha512-qzm/XxIbxm/FHyH341ZrbnMUpe+5Bocte9xkmFMzPMjRaZMcXww+MpBptFvtU+79L362nqiLhekCxCxDPaUMBQ==
-
-eslint-visitor-keys@^1.1.0:
+eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
   integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
@@ -3105,11 +2951,6 @@ fancy-log@^1.3.2:
     color-support "^1.1.3"
     time-stamp "^1.0.0"
 
-fast-deep-equal@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
-  integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=
-
 fast-deep-equal@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@@ -3125,7 +2966,7 @@ fast-json-stable-stringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:
+fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
@@ -3266,12 +3107,7 @@ flow-bin@^0.134.0:
   resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.134.0.tgz#e98e5724f6ed5a1265cf904bbb5e4c096ea3a026"
   integrity sha512-j5aCugO3jmwDsUKc+7KReArgnL6aVjHLo6DlozKhxKYN+TaP8BY+mintPSISjSQtKZFJyvoNAc1oXA79X5WjIA==
 
-flow-parser@0.*:
-  version "0.89.0"
-  resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.89.0.tgz#c87bf45831644733dd576983ab12e75a3546573b"
-  integrity sha512-vC8YuwhAPE+tbkz49DA/TjtFyfhcqM48occMdRQiZ/HL+Wg97IcuebMZUGVB4oBq7aHw0iJJtnvmlnmOQF7Ydg==
-
-flow-parser@^0.121.0:
+flow-parser@0.*, flow-parser@^0.121.0:
   version "0.121.0"
   resolved "https://registry.yarnpkg.com/flow-parser/-/flow-parser-0.121.0.tgz#9f9898eaec91a9f7c323e9e992d81ab5c58e618f"
   integrity sha512-1gIBiWJNR0tKUNv8gZuk7l9rVX06OuLzY9AoGio7y/JT4V1IZErEMEq2TJS+PFcw/y0RshZ1J/27VfK1UQzYVg==
@@ -3454,19 +3290,7 @@ glob@^6.0.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.5, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-glob@^7.1.4:
+glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4:
   version "7.1.6"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
   integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
@@ -3490,22 +3314,7 @@ globals@^12.1.0:
   dependencies:
     type-fest "^0.8.1"
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
-  version "4.1.11"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
-  integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
-
-graceful-fs@^4.1.15:
-  version "4.1.15"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
-  integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
-
-graceful-fs@^4.2.0:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
-  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
-
-graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.15, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@^4.2.0, graceful-fs@^4.2.4:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz#2256bde14d3632958c465ebc96dc467ca07a29fb"
   integrity sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==
@@ -3530,14 +3339,6 @@ har-schema@^2.0.0:
   resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92"
   integrity sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=
 
-har-validator@~5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.0.tgz#44657f5688a22cfd4b72486e81b3a3fb11742c29"
-  integrity sha512-+qnmNjI4OfH2ipQ9VQOw23bBd/ibtfbVdK2fYbY4acTDqKTW/YDp9McimZdDbG8iV9fZizUqQMD5xvriB146TA==
-  dependencies:
-    ajv "^5.3.0"
-    har-schema "^2.0.0"
-
 har-validator@~5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz#1ef89ebd3e4996557675eed9893110dc350fa080"
@@ -3811,7 +3612,7 @@ is-buffer@^1.1.5:
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.3, is-callable@^1.1.4:
+is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
@@ -3935,11 +3736,6 @@ is-potential-custom-element-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz#0c52e54bcca391bb2c494b21e8626d7336c6e397"
   integrity sha1-DFLlS8yjkbssSUsh6GJtczbG45c=
 
-is-promise@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
-  integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
-
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -4171,11 +3967,6 @@ jest-environment-node@^26.0.1:
     jest-mock "^26.0.1"
     jest-util "^26.0.1"
 
-jest-get-type@^24.3.0:
-  version "24.3.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.3.0.tgz#582cfd1a4f91b5cdad1d43d2932f816d543c65da"
-  integrity sha512-HYF6pry72YUlVcvUx3sEpMRwXEWGEPlJ0bSPVnB3b3n++j4phUEoSPcS6GC0pPJ9rpyPSe4cb5muFo6D39cXow==
-
 jest-get-type@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
@@ -4471,19 +4262,7 @@ jest-util@^26.0.1:
     is-ci "^2.0.0"
     make-dir "^3.0.0"
 
-jest-validate@^24.7.0:
-  version "24.7.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.7.0.tgz#70007076f338528ee1b1c8a8258b1b0bb982508d"
-  integrity sha512-cgai/gts9B2chz1rqVdmLhzYxQbgQurh1PEQSvSgPZ8KGa1AqXsqC45W5wKEwzxKrWqypuQrQxnF4+G9VejJJA==
-  dependencies:
-    "@jest/types" "^24.7.0"
-    camelcase "^5.0.0"
-    chalk "^2.0.1"
-    jest-get-type "^24.3.0"
-    leven "^2.1.0"
-    pretty-format "^24.7.0"
-
-jest-validate@^24.9.0:
+jest-validate@^24.7.0, jest-validate@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-24.9.0.tgz#0775c55360d173cd854e40180756d4ff52def8ab"
   integrity sha512-HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ==
@@ -4554,15 +4333,7 @@ jetifier@^1.6.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@^3.11.0, js-yaml@^3.9.0:
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
-  integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
-  dependencies:
-    argparse "^1.0.7"
-    esprima "^4.0.0"
-
-js-yaml@^3.13.0, js-yaml@^3.13.1:
+js-yaml@^3.11.0, js-yaml@^3.13.0, js-yaml@^3.13.1:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -4652,11 +4423,6 @@ json-parse-better-errors@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
 
-json-schema-traverse@^0.3.0:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
-  integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=
-
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -4780,11 +4546,6 @@ lcov-parse@^0.0.10:
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
   integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
 
-leven@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/leven/-/leven-2.1.0.tgz#c2e7a9f772094dee9d34202ae8acce4687875580"
-  integrity sha1-wuep93IJTe6dNCAq6KzORoeHVYA=
-
 leven@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2"
@@ -4828,12 +4589,7 @@ lodash.throttle@^4.1.1:
   resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4"
   integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ=
 
-lodash@4.x.x, lodash@^4.17.10, lodash@^4.17.5, lodash@^4.3.0:
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
-  integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
-
-lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15:
+lodash@4.x.x, lodash@^4.17.10, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@^4.3.0:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -4859,7 +4615,7 @@ logkitty@^0.7.1:
     dayjs "^1.8.15"
     yargs "^15.1.0"
 
-loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0:
+loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
   integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==
@@ -5347,12 +5103,7 @@ minimist@0.0.8:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.1, minimist@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
-  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
-
-minimist@^1.2.5:
+minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
   integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
@@ -5492,12 +5243,7 @@ node-fetch@^1.0.1:
     encoding "^0.1.11"
     is-stream "^1.0.1"
 
-node-fetch@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.2.0.tgz#4ee79bde909262f9775f731e3656d0db55ced5b5"
-  integrity sha512-OayFWziIxiHY8bCUyLX6sTpDH8Jsbp4FfYd1j1f7vZyfgkcOnAyM4oQR16f8a0s7Gl/viMGRey8eScYk4V4EZA==
-
-node-fetch@^2.6.0:
+node-fetch@^2.2.0, node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
@@ -5661,16 +5407,11 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-object-keys@^1.0.11:
+object-keys@^1.0.11, object-keys@^1.0.12:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e"
   integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==
 
-object-keys@^1.0.12:
-  version "1.0.12"
-  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
-  integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -5745,19 +5486,7 @@ open@^6.2.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optionator@^0.8.1:
-  version "0.8.2"
-  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.2.tgz#364c5e409d3f4d6301d6c0b4c05bba50180aeb64"
-  integrity sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=
-  dependencies:
-    deep-is "~0.1.3"
-    fast-levenshtein "~2.0.4"
-    levn "~0.3.0"
-    prelude-ls "~1.1.2"
-    type-check "~0.3.2"
-    wordwrap "~1.0.0"
-
-optionator@^0.8.3:
+optionator@^0.8.1, optionator@^0.8.3:
   version "0.8.3"
   resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
   integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
@@ -5833,14 +5562,7 @@ p-is-promise@^1.1.0:
   resolved "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
   integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
 
-p-limit@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.0.0.tgz#e624ed54ee8c460a778b3c9f3670496ff8a57aec"
-  integrity sha512-fl5s52lI5ahKCernzzIyAP0QAZbGIovtVHGwpcu1Jr/EpzLVDI2myISHwGqK7m8uQFugVWSrbxH7XnhGtvEc+A==
-  dependencies:
-    p-try "^2.0.0"
-
-p-limit@^2.2.0:
+p-limit@^2.0.0, p-limit@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
   integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
@@ -5963,14 +5685,7 @@ pinkie@^2.0.0:
   resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
   integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
 
-pirates@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.0.tgz#850b18781b4ac6ec58a43c9ed9ec5fe6796addbd"
-  integrity sha512-8t5BsXy1LUIjn3WWOlOuFDuKswhQb/tkak641lvBgmPOBUQHXveORtlMCp6OdPV1dtuTaEahKA8VNz6uLfKBtA==
-  dependencies:
-    node-modules-regexp "^1.0.0"
-
-pirates@^4.0.1:
+pirates@^4.0.0, pirates@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/pirates/-/pirates-4.0.1.tgz#643a92caf894566f91b2b986d2c66950a8e2fb87"
   integrity sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==
@@ -6026,17 +5741,7 @@ prettier@1.19.1:
   resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.19.1.tgz#f7d7f5ff8a9cd872a7be4ca142095956a60797cb"
   integrity sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==
 
-pretty-format@^24.7.0:
-  version "24.7.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.7.0.tgz#d23106bc2edcd776079c2daa5da02bcb12ed0c10"
-  integrity sha512-apen5cjf/U4dj7tHetpC7UEFCvtAgnNZnBDkfPv3fokzIqyOJckAG9OlAPC1BlFALnqT/lGB2tl9EJjlK6eCsA==
-  dependencies:
-    "@jest/types" "^24.7.0"
-    ansi-regex "^4.0.0"
-    ansi-styles "^3.2.0"
-    react-is "^16.8.4"
-
-pretty-format@^24.9.0:
+pretty-format@^24.7.0, pretty-format@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-24.9.0.tgz#12fac31b37019a4eea3c11aa9a959eb7628aa7c9"
   integrity sha512-00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA==
@@ -6046,7 +5751,7 @@ pretty-format@^24.9.0:
     ansi-styles "^3.2.0"
     react-is "^16.8.4"
 
-pretty-format@^25.1.0:
+pretty-format@^25.1.0, pretty-format@^25.2.0:
   version "25.5.0"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz#7873c1d774f682c34b8d48b6743a2bf2ac55791a"
   integrity sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==
@@ -6056,16 +5761,6 @@ pretty-format@^25.1.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-pretty-format@^25.2.0:
-  version "25.3.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.3.0.tgz#d0a4f988ff4a6cd350342fdabbb809aeb4d49ad5"
-  integrity sha512-wToHwF8bkQknIcFkBqNfKu4+UZqnrLn/Vr+wwKQwwvPzkBfDDKp/qIabFqdgtoi5PEnM8LFByVsOrHoa3SpTVA==
-  dependencies:
-    "@jest/types" "^25.3.0"
-    ansi-regex "^5.0.0"
-    ansi-styles "^4.0.0"
-    react-is "^16.12.0"
-
 pretty-format@^26.0.1:
   version "26.0.1"
   resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.0.1.tgz#a4fe54fe428ad2fd3413ca6bbd1ec8c2e277e197"
@@ -6118,15 +5813,7 @@ prompts@^2.0.1:
     kleur "^3.0.2"
     sisteransi "^1.0.0"
 
-prop-types@^15.6.2:
-  version "15.6.2"
-  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102"
-  integrity sha512-3pboPvLiWD7dkI3qf3KbUe6hKFKa52w+AE0VCqECtf+QHAKgOL37tTaNCnuX1nAAQ4ZhyP+kYVKf8rLmJ/feDQ==
-  dependencies:
-    loose-envify "^1.3.1"
-    object-assign "^4.1.1"
-
-prop-types@^15.7.2:
+prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -6148,11 +5835,6 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
   integrity sha1-8FKijacOYYkX7wqKw0wa5aaChrM=
 
-psl@^1.1.24:
-  version "1.1.29"
-  resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.29.tgz#60f580d360170bb722a797cc704411e6da850c67"
-  integrity sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==
-
 psl@^1.1.28:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
@@ -6166,11 +5848,6 @@ pump@^3.0.0:
     end-of-stream "^1.1.0"
     once "^1.3.1"
 
-punycode@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
-  integrity sha1-wNWmOycYgArY4esPpSachN1BhF4=
-
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -6209,17 +5886,7 @@ react-devtools-core@^4.6.0:
     shell-quote "^1.6.1"
     ws "^7"
 
-react-is@^16.12.0:
-  version "16.12.0"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.12.0.tgz#2cc0fe0fba742d97fd527c42a13bec4eeb06241c"
-  integrity sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q==
-
-react-is@^16.8.1, react-is@^16.8.4:
-  version "16.8.4"
-  resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.8.4.tgz#90f336a68c3a29a096a3d648ab80e87ec61482a2"
-  integrity sha512-PVadd+WaUDOAciICm/J1waJaSvgq+4rHE/K70j0PFqKhkTBsPv/82UGQJNXAngz1fOQLLxI6z1sEDmJDQhCTAA==
-
-react-is@^16.8.6:
+react-is@^16.12.0, react-is@^16.8.1, react-is@^16.8.4, react-is@^16.8.6:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
@@ -6275,7 +5942,7 @@ read-pkg@^5.2.0:
     parse-json "^5.0.0"
     type-fest "^0.6.0"
 
-readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -6317,12 +5984,7 @@ regenerate@^1.4.0:
   resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11"
   integrity sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.2.tgz#32e59c9a6fb9b1a4aff09b4930ca2d4477343447"
-  integrity sha512-S/TQAZJO+D3m9xeN1WTI8dLKBBiRgXBlTJvbWjCThHWZj9EvHK70Ff50/tYj2J/fvBY6JtFVwRuazHN2E7M9BA==
-
-regenerator-runtime@^0.13.4:
+regenerator-runtime@^0.13.2, regenerator-runtime@^0.13.4:
   version "0.13.5"
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697"
   integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==
@@ -6403,33 +6065,7 @@ request-promise-native@^1.0.8:
     stealthy-require "^1.1.1"
     tough-cookie "^2.3.3"
 
-request@^2.85.0:
-  version "2.88.0"
-  resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
-  integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
-  dependencies:
-    aws-sign2 "~0.7.0"
-    aws4 "^1.8.0"
-    caseless "~0.12.0"
-    combined-stream "~1.0.6"
-    extend "~3.0.2"
-    forever-agent "~0.6.1"
-    form-data "~2.3.2"
-    har-validator "~5.1.0"
-    http-signature "~1.2.0"
-    is-typedarray "~1.0.0"
-    isstream "~0.1.2"
-    json-stringify-safe "~5.0.1"
-    mime-types "~2.1.19"
-    oauth-sign "~0.9.0"
-    performance-now "^2.1.0"
-    qs "~6.5.2"
-    safe-buffer "^5.1.2"
-    tough-cookie "~2.4.3"
-    tunnel-agent "^0.6.0"
-    uuid "^3.3.2"
-
-request@^2.88.2:
+request@^2.85.0, request@^2.88.2:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -6492,21 +6128,7 @@ resolve-url@^0.2.1:
   resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
   integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
 
-resolve@^1.1.6, resolve@^1.10.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
-  version "1.15.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
-  integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.12.0:
-  version "1.16.1"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.16.1.tgz#49fac5d8bacf1fd53f200fa51247ae736175832c"
-  integrity sha512-rmAglCSqWWMrrBv/XM6sW0NuRFiKViw/W4d9EbC4pt+49H8JwHy+mcGmALTEg504AUDcLTvb1T2q3E9AnmY+ig==
-  dependencies:
-    path-parse "^1.0.6"
-
-resolve@^1.17.0:
+resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.17.0, resolve@^1.3.2, resolve@^1.5.0, resolve@^1.8.1, resolve@^1.9.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
   integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
@@ -6539,20 +6161,13 @@ retry@^0.10.1:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
-rimraf@2.6.3:
+rimraf@2.6.3, rimraf@^2.5.4, rimraf@^2.6.1:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
-rimraf@^2.5.4, rimraf@^2.6.1:
-  version "2.6.2"
-  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
-  integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
-  dependencies:
-    glob "^7.0.5"
-
 rimraf@^3.0.0:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
@@ -6577,14 +6192,7 @@ rsvp@^3.3.3:
   resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a"
   integrity sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==
 
-run-async@^2.2.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0"
-  integrity sha1-A3GrSuC91yDUFm19/aZP96RFpsA=
-  dependencies:
-    is-promise "^2.1.0"
-
-run-async@^2.4.0:
+run-async@^2.2.0, run-async@^2.4.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455"
   integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==
@@ -6679,16 +6287,11 @@ scheduler@0.19.1, scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
 
-semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
-  integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
-
 semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
@@ -6912,7 +6515,7 @@ source-map-resolve@^0.5.0:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
-source-map-support@^0.5.16:
+source-map-support@^0.5.16, source-map-support@^0.5.6:
   version "0.5.16"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
   integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
@@ -6920,14 +6523,6 @@ source-map-support@^0.5.16:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
-source-map-support@^0.5.6:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
-  integrity sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -7115,14 +6710,7 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-ansi@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.0.0.tgz#f78f68b5d0866c20b2c9b8c61b5298508dc8756f"
-  integrity sha512-Uu7gQyZI7J7gn5qLn1Np3G9vcYGTVqB+lFTytnDJv83dd8T22aGH451P3jueT2/QemInJDfxHB5Tde5OzgG1Ow==
-  dependencies:
-    ansi-regex "^4.0.0"
-
-strip-ansi@^5.1.0, strip-ansi@^5.2.0:
+strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
   integrity sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==
@@ -7293,15 +6881,7 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-through2@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
-  integrity sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=
-  dependencies:
-    readable-stream "^2.1.5"
-    xtend "~4.0.1"
-
-through2@^2.0.1:
+through2@^2.0.0, through2@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -7385,14 +6965,6 @@ tough-cookie@^3.0.1:
     psl "^1.1.28"
     punycode "^2.1.1"
 
-tough-cookie@~2.4.3:
-  version "2.4.3"
-  resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781"
-  integrity sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==
-  dependencies:
-    psl "^1.1.24"
-    punycode "^1.4.1"
-
 tr46@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz#03273586def1595ae08fedb38d7733cee91d2479"
@@ -7574,12 +7146,7 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^3.0.1, uuid@^3.3.2:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
-  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
-
-uuid@^3.3.3:
+uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3:
   version "3.4.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
@@ -7725,7 +7292,7 @@ word-wrap@~1.2.3:
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
 
-wordwrap@^1.0.0, wordwrap@~1.0.0:
+wordwrap@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
   integrity sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=
@@ -7820,14 +7387,7 @@ ws@^6.1.4:
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.1.1.tgz#f9942dc868b6dffb72c14fd8f2ba05f77a4d5983"
-  integrity sha512-o41D/WmDeca0BqYhsr3nJzQyg9NF5X8l/UdnFNux9cS3lwB+swm8qGWX5rn+aD6xfBU3rGmtHij7g7x6LxFU3A==
-  dependencies:
-    async-limiter "^1.0.0"
-
-ws@^7.2.3:
+ws@^7, ws@^7.2.3:
   version "7.2.5"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.2.5.tgz#abb1370d4626a5a9cd79d8de404aa18b3465d10d"
   integrity sha512-C34cIU4+DB2vMyAbmEKossWq2ZQDr6QEyuuCzWrM9zfw1sGc0mYiJ0UnG9zzNykt49C2Fi34hvr2vssFQRS6EA==

From da8b50cd33df692495c06332c995206351d72d57 Mon Sep 17 00:00:00 2001
From: generatedunixname89002005325676 <generatedunixname89002005325676@fb.com>
Date: Tue, 29 Sep 2020 04:10:45 -0700
Subject: [PATCH 100/241] Daily `arc lint --take CLANGFORMAT`

Reviewed By: zertosh

Differential Revision: D23986055

fbshipit-source-id: 7bfe9f06f236f8866e812db060edf3d089fe253c
---
 React/Views/RCTDatePicker.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/React/Views/RCTDatePicker.m b/React/Views/RCTDatePicker.m
index 9fee82b3cfffc2..064191b3e8aa1c 100644
--- a/React/Views/RCTDatePicker.m
+++ b/React/Views/RCTDatePicker.m
@@ -14,11 +14,11 @@
 #import "UIView+React.h"
 
 #ifndef __IPHONE_14_0
-  #define __IPHONE_14_0 140000
+#define __IPHONE_14_0 140000
 #endif // __IPHONE_14_0
 
 #ifndef RCT_IOS_14_0_SDK_OR_LATER
-  #define RCT_IOS_14_0_SDK_OR_LATER (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0)
+#define RCT_IOS_14_0_SDK_OR_LATER (__IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_14_0)
 #endif // RCT_IOS_14_0_SDK_OR_LATER
 
 @interface RCTDatePicker ()

From 121141c86b75b46fe9cbd5ec36853d75cd33615b Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@fb.com>
Date: Tue, 29 Sep 2020 05:14:48 -0700
Subject: [PATCH 101/241] Convert AndroidDialogPicker to JS view configs

Summary:
Convert AndroidDialogPicker to JS view configs

Changelog: [Internal]

Reviewed By: ejanzer

Differential Revision: D23911673

fbshipit-source-id: d5fefa997432f0096308ab5593ba74c2c07b71e1
---
 .../AndroidDialogPickerNativeComponent.js     | 21 ++++++++++---
 .../Picker/AndroidDialogPickerViewConfig.js   | 30 +++++++++++++++++++
 .../views/picker/ReactPickerManager.java      | 12 +++-----
 3 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 Libraries/Components/Picker/AndroidDialogPickerViewConfig.js

diff --git a/Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js b/Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js
index bac74826a1fb11..d01757865909fc 100644
--- a/Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js
+++ b/Libraries/Components/Picker/AndroidDialogPickerNativeComponent.js
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *
  * @format
- * @flow strict-local
+ * @flow
  */
 
 'use strict';
@@ -14,6 +14,8 @@ import * as React from 'react';
 
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
 import requireNativeComponent from '../../ReactNative/requireNativeComponent';
+import registerGeneratedViewConfig from '../../Utilities/registerGeneratedViewConfig';
+import AndroidDialogPickerViewConfig from './AndroidDialogPickerViewConfig';
 
 import type {
   DirectEventHandler,
@@ -64,6 +66,17 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['setNativeSelectedPosition'],
 });
 
-export default (requireNativeComponent<NativeProps>(
-  'AndroidDialogPicker',
-): NativeType);
+let AndroidDialogPickerNativeComponent;
+if (global.RN$Bridgeless) {
+  registerGeneratedViewConfig(
+    'AndroidDialogPicker',
+    AndroidDialogPickerViewConfig,
+  );
+  AndroidDialogPickerNativeComponent = 'AndroidDialogPicker';
+} else {
+  AndroidDialogPickerNativeComponent = requireNativeComponent<NativeProps>(
+    'AndroidDialogPicker',
+  );
+}
+
+export default ((AndroidDialogPickerNativeComponent: any): NativeType);
diff --git a/Libraries/Components/Picker/AndroidDialogPickerViewConfig.js b/Libraries/Components/Picker/AndroidDialogPickerViewConfig.js
new file mode 100644
index 00000000000000..1108b8105e37e1
--- /dev/null
+++ b/Libraries/Components/Picker/AndroidDialogPickerViewConfig.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import type {GeneratedViewConfig} from '../../Utilities/registerGeneratedViewConfig';
+
+const AndroidDialogPickerViewConfig = {
+  uiViewClassName: 'AndroidDialogPicker',
+  bubblingEventTypes: {},
+  directEventTypes: {},
+  validAttributes: {
+    color: {process: require('../../StyleSheet/processColor')},
+    backgroundColor: {process: require('../../StyleSheet/processColor')},
+    enabled: true,
+    items: true,
+    prompt: true,
+    selected: true,
+    onSelect: true,
+  },
+};
+
+module.exports = (AndroidDialogPickerViewConfig: GeneratedViewConfig);
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
index e5c42e059905e6..ffc46232aa9994 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/picker/ReactPickerManager.java
@@ -13,7 +13,7 @@
 import com.facebook.react.bridge.ReadableArray;
 import com.facebook.react.uimanager.SimpleViewManager;
 import com.facebook.react.uimanager.ThemedReactContext;
-import com.facebook.react.uimanager.UIManagerModule;
+import com.facebook.react.uimanager.UIManagerHelper;
 import com.facebook.react.uimanager.ViewProps;
 import com.facebook.react.uimanager.annotations.ReactProp;
 import com.facebook.react.uimanager.events.EventDispatcher;
@@ -62,13 +62,9 @@ protected void onAfterUpdateTransaction(ReactPicker view) {
 
   @Override
   protected void addEventEmitters(final ThemedReactContext reactContext, final ReactPicker picker) {
-    UIManagerModule uiManager = reactContext.getNativeModule(UIManagerModule.class);
-
-    if (uiManager == null) {
-      return;
-    }
-
-    picker.setOnSelectListener(new PickerEventEmitter(picker, uiManager.getEventDispatcher()));
+    picker.setOnSelectListener(
+        new PickerEventEmitter(
+            picker, UIManagerHelper.getEventDispatcherForReactTag(reactContext, picker.getId())));
   }
 
   @Override

From 5ccb5f5b8002e2301c9ae7292f1f9ab62feab4c0 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Tue, 29 Sep 2020 06:42:20 -0700
Subject: [PATCH 102/241] Fix dismissal animation of Modal Component

Summary:
Changelog: [Internal]

Fabric removes components bottom up (from leafs to the root).
This means that by the time Fabric hides Modal, it has no content and therefore it appears as if Modal disappears without Animation.

To fix this, we snapshot contents of the Modal before any of its contents are removed.

Reviewed By: shergin

Differential Revision: D23976244

fbshipit-source-id: 01c13b74e97f82816e8946fd9d1add1db10340b1
---
 .../Modal/RCTFabricModalHostViewController.mm      | 14 --------------
 .../Modal/RCTModalHostViewComponentView.h          |  3 ++-
 .../Modal/RCTModalHostViewComponentView.mm         | 13 +++++++++++++
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
index 54061f535d79ee..dc852ff001da6d 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTFabricModalHostViewController.mm
@@ -56,20 +56,6 @@ - (BOOL)prefersStatusBarHidden
   return [RCTSharedApplication() isStatusBarHidden];
 }
 
-- (void)dismissViewControllerAnimated:(BOOL)flag completion:(void (^)())completion
-{
-  UIView *snapshot = [self.view snapshotViewAfterScreenUpdates:NO];
-  [self.view addSubview:snapshot];
-
-  [super dismissViewControllerAnimated:flag
-                            completion:^{
-                              [snapshot removeFromSuperview];
-                              if (completion) {
-                                completion();
-                              }
-                            }];
-}
-
 #if RCT_DEV
 - (UIInterfaceOrientationMask)supportedInterfaceOrientations
 {
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h
index 16fbdfb9624ab7..b61196c4c57b0a 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.h
@@ -5,12 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <React/RCTMountingTransactionObserving.h>
 #import <React/RCTViewComponentView.h>
 
 /**
  * UIView class for root <ModalHostView> component.
  */
-@interface RCTModalHostViewComponentView : RCTViewComponentView
+@interface RCTModalHostViewComponentView : RCTViewComponentView <RCTMountingTransactionObserving>
 
 /**
  * Subclasses may override this method and present the modal on different view controller.
diff --git a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
index 65f2f6ce266300..01648dd2f423d9 100644
--- a/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Modal/RCTModalHostViewComponentView.mm
@@ -101,6 +101,7 @@ @implementation RCTModalHostViewComponentView {
   ModalHostViewShadowNode::ConcreteStateTeller _stateTeller;
   BOOL _shouldAnimatePresentation;
   BOOL _isPresented;
+  UIView *_modalContentsSnapshot;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -161,10 +162,22 @@ - (void)ensurePresentedOnlyIfNeeded
   BOOL shouldBeHidden = _isPresented && !self.superview;
   if (shouldBeHidden) {
     _isPresented = NO;
+    // To animate dismissal of view controller, snapshot of
+    // view hierarchy needs to be added to the UIViewController.
+    [self.viewController.view addSubview:_modalContentsSnapshot];
     [self dismissViewController:self.viewController animated:_shouldAnimatePresentation];
   }
 }
 
+#pragma mark - RCTMountingTransactionObserving
+
+- (void)mountingTransactionWillMountWithMetadata:(MountingTransactionMetadata const &)metadata
+{
+  _modalContentsSnapshot = [self.viewController.view snapshotViewAfterScreenUpdates:NO];
+}
+
+#pragma mark - UIView methods
+
 - (void)didMoveToWindow
 {
   [super didMoveToWindow];

From c06f765f7d73077feee1285dc56f01a32e63fe0c Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Tue, 29 Sep 2020 13:16:57 -0700
Subject: [PATCH 103/241] Allow Java classes to hook into ScrollView scroll and
 layout events

Summary:
For advanced interop cases.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D23984345

fbshipit-source-id: f5c2a43a1bf5937f9974bcc5c66c36ec35e679c5
---
 .../scroll/ReactHorizontalScrollView.java     |  1 +
 .../react/views/scroll/ReactScrollView.java   |  1 +
 .../views/scroll/ReactScrollViewHelper.java   | 31 +++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
index 61b1a712332a5d..b632671b712b6c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactHorizontalScrollView.java
@@ -266,6 +266,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
     int scrollToY =
         pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
     reactScrollTo(scrollToX, scrollToY);
+    ReactScrollViewHelper.emitLayoutEvent(this);
   }
 
   /**
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
index 6497c6bce989b2..118579c886f109 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollView.java
@@ -223,6 +223,7 @@ protected void onLayout(boolean changed, int l, int t, int r, int b) {
     int scrollToY =
         pendingContentOffsetY != UNSET_CONTENT_OFFSET ? pendingContentOffsetY : getScrollY();
     reactScrollTo(scrollToX, scrollToY);
+    ReactScrollViewHelper.emitLayoutEvent(this);
   }
 
   @Override
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
index 5183f24c44bd80..c10a38ebdb02aa 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/scroll/ReactScrollViewHelper.java
@@ -14,6 +14,8 @@
 import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.uimanager.UIManagerHelper;
+import java.util.ArrayList;
+import java.util.List;
 
 /** Helper class that deals with emitting Scroll Events. */
 public class ReactScrollViewHelper {
@@ -23,6 +25,16 @@ public class ReactScrollViewHelper {
   public static final String AUTO = "auto";
   public static final String OVER_SCROLL_NEVER = "never";
 
+  public interface ScrollListener {
+    void onScroll(
+        ViewGroup scrollView, ScrollEventType scrollEventType, float xVelocity, float yVelocity);
+
+    void onLayout(ViewGroup scrollView);
+  }
+
+  // Support global native listeners for scroll events
+  private static List<ScrollListener> sScrollListeners = new ArrayList<>();
+
   // If all else fails, this is the hardcoded value in OverScroller.java, in AOSP.
   // The default is defined here (as of this diff):
   // https://android.googlesource.com/platform/frameworks/base/+/ae5bcf23b5f0875e455790d6af387184dbd009c1/core/java/android/widget/OverScroller.java#44
@@ -64,6 +76,10 @@ private static void emitScrollEvent(
       return;
     }
 
+    for (ScrollListener scrollListener : sScrollListeners) {
+      scrollListener.onScroll(scrollView, scrollEventType, xVelocity, yVelocity);
+    }
+
     ReactContext reactContext = (ReactContext) scrollView.getContext();
     UIManagerHelper.getEventDispatcherForReactTag(reactContext, scrollView.getId())
         .dispatchEvent(
@@ -80,6 +96,13 @@ private static void emitScrollEvent(
                 scrollView.getHeight()));
   }
 
+  /** This is only for Java listeners. onLayout events emitted to JS are handled elsewhere. */
+  public static void emitLayoutEvent(ViewGroup scrollView) {
+    for (ScrollListener scrollListener : sScrollListeners) {
+      scrollListener.onLayout(scrollView);
+    }
+  }
+
   public static int parseOverScrollMode(String jsOverScrollMode) {
     if (jsOverScrollMode == null || jsOverScrollMode.equals(AUTO)) {
       return View.OVER_SCROLL_IF_CONTENT_SCROLLS;
@@ -130,4 +153,12 @@ public void startScroll(int startX, int startY, int dx, int dy, int duration) {
       mScrollAnimationDuration = duration;
     }
   }
+
+  public static void addScrollListener(ScrollListener listener) {
+    sScrollListeners.add(listener);
+  }
+
+  public static void removeScrollListener(ScrollListener listener) {
+    sScrollListeners.remove(listener);
+  }
 }

From a7c026e667bb39bef1c8e4b956c6d0c31e43bb31 Mon Sep 17 00:00:00 2001
From: Paige Sun <paigesun@fb.com>
Date: Tue, 29 Sep 2020 14:15:45 -0700
Subject: [PATCH 104/241] Remove unused Fabric image instrumentation

Summary:
Remove the older implementation of image instrumentation in Fabric by removing, RCTImageInstrumentationProxy, ImageInstrumentation from ImageRequest, and trackURLImageContentDidSetForRequest from RCTImageLoaderWithAttributionProtocol.

Changelog: [RN][Fabric][Image] Remove unused Fabric image instrumentation

Reviewed By: fkgozali

Differential Revision: D23990606

fbshipit-source-id: 004d04025d031af11377a73e5bfb64b1e0449962
---
 Libraries/Image/RCTImageLoader.mm             | 13 ---
 .../RCTImageLoaderWithAttributionProtocol.h   |  5 --
 .../Image/RCTImageURLLoaderWithAttribution.h  |  5 --
 .../Image/RCTImageComponentView.mm            |  7 --
 .../components/image/ImageShadowNode.h        |  2 +-
 .../components/slider/SliderShadowNode.h      |  8 +-
 ReactCommon/react/renderer/imagemanager/BUCK  |  1 -
 .../imagemanager/ImageInstrumentation.h       | 40 ---------
 .../renderer/imagemanager/ImageRequest.h      | 23 +-----
 .../renderer/imagemanager/ImageManager.cpp    |  2 +-
 .../renderer/imagemanager/ImageRequest.cpp    | 21 +----
 .../platform/ios/ImageRequest.cpp             | 20 +----
 .../ios/RCTImageInstrumentationProxy.h        | 40 ---------
 .../ios/RCTImageInstrumentationProxy.mm       | 81 -------------------
 .../platform/ios/RCTImageManager.mm           |  8 +-
 .../platform/ios/RCTSyncImageManager.mm       |  2 +-
 16 files changed, 15 insertions(+), 263 deletions(-)
 delete mode 100644 ReactCommon/react/renderer/imagemanager/ImageInstrumentation.h
 delete mode 100644 ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.h
 delete mode 100644 ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm

diff --git a/Libraries/Image/RCTImageLoader.mm b/Libraries/Image/RCTImageLoader.mm
index 0ea5a4a0c988f9..723b64dbe6184b 100644
--- a/Libraries/Image/RCTImageLoader.mm
+++ b/Libraries/Image/RCTImageLoader.mm
@@ -831,19 +831,6 @@ - (NSString *)loaderModuleNameForRequestUrl:(NSURL *)url {
   return nil;
 }
 
-- (void)trackURLImageContentDidSetForRequest:(RCTImageURLLoaderRequest *)loaderRequest
-{
-  if (!loaderRequest) {
-    return;
-  }
-
-  // This delegate method is Fabric-only
-  id<RCTImageURLLoader> loadHandler = [self imageURLLoaderForURL:loaderRequest.imageURL];
-  if ([loadHandler respondsToSelector:@selector(trackURLImageContentDidSetForRequest:)]) {
-    [(id<RCTImageURLLoaderWithAttribution>)loadHandler trackURLImageContentDidSetForRequest:loaderRequest];
-  }
-}
-
 - (void)trackURLImageVisibilityForRequest:(RCTImageURLLoaderRequest *)loaderRequest imageView:(UIView *)imageView
 {
   if (!loaderRequest || !imageView) {
diff --git a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
index bd26221531b8a4..44f4ee849a4a75 100644
--- a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
+++ b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
@@ -36,11 +36,6 @@ RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
                                       completionBlock:(RCTImageLoaderCompletionBlockWithMetadata)completionBlock;
 #endif
 
-/**
- * Image instrumentation - notify that the image content (UIImage) has been set on the native view.
- */
-- (void)trackURLImageContentDidSetForRequest:(RCTImageURLLoaderRequest *)loaderRequest;
-
 /**
  * Image instrumentation - start tracking the on-screen visibility of the native image view.
  */
diff --git a/Libraries/Image/RCTImageURLLoaderWithAttribution.h b/Libraries/Image/RCTImageURLLoaderWithAttribution.h
index b05ebfba8adfdf..4013367b4d3c63 100644
--- a/Libraries/Image/RCTImageURLLoaderWithAttribution.h
+++ b/Libraries/Image/RCTImageURLLoaderWithAttribution.h
@@ -59,11 +59,6 @@ struct ImageURLLoaderAttribution {
                             completionHandler:(RCTImageLoaderCompletionBlockWithMetadata)completionHandler;
 #endif
 
-/**
- * Image instrumentation - notify that the image content (UIImage) has been set on the native view.
- */
-- (void)trackURLImageContentDidSetForRequest:(RCTImageURLLoaderRequest *)loaderRequest;
-
 /**
  * Image instrumentation - start tracking the on-screen visibility of the native image view.
  */
diff --git a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
index ce8e55c0229fb6..09dd599650f026 100644
--- a/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Image/RCTImageComponentView.mm
@@ -13,9 +13,7 @@
 #import <react/renderer/components/image/ImageComponentDescriptor.h>
 #import <react/renderer/components/image/ImageEventEmitter.h>
 #import <react/renderer/components/image/ImageProps.h>
-#import <react/renderer/imagemanager/ImageInstrumentation.h>
 #import <react/renderer/imagemanager/ImageRequest.h>
-#import <react/renderer/imagemanager/RCTImageInstrumentationProxy.h>
 #import <react/renderer/imagemanager/RCTImagePrimitivesConversions.h>
 
 using namespace facebook::react;
@@ -160,11 +158,6 @@ - (void)didReceiveImage:(UIImage *)image metadata:(id)metadata fromObserver:(voi
     if (!data.hasValue()) {
       return;
     }
-    auto instrumentation = std::static_pointer_cast<RCTImageInstrumentationProxy const>(
-        data.value().getImageRequest().getSharedImageInstrumentation());
-    if (instrumentation) {
-      instrumentation->didSetImage();
-    }
   };
 
   if (imageProps.blurRadius > __FLT_EPSILON__) {
diff --git a/ReactCommon/react/renderer/components/image/ImageShadowNode.h b/ReactCommon/react/renderer/components/image/ImageShadowNode.h
index 12490840b611bd..0e60f78deef2dd 100644
--- a/ReactCommon/react/renderer/components/image/ImageShadowNode.h
+++ b/ReactCommon/react/renderer/components/image/ImageShadowNode.h
@@ -46,7 +46,7 @@ class ImageShadowNode final : public ConcreteViewShadowNode<
       ShadowNodeFamilyFragment const &familyFragment,
       ComponentDescriptor const &componentDescriptor) {
     auto imageSource = ImageSource{ImageSource::Type::Invalid};
-    return {imageSource, {imageSource, nullptr, nullptr}, 0};
+    return {imageSource, {imageSource, nullptr}, 0};
   }
 
 #pragma mark - LayoutableShadowNode
diff --git a/ReactCommon/react/renderer/components/slider/SliderShadowNode.h b/ReactCommon/react/renderer/components/slider/SliderShadowNode.h
index c012ff45a517fa..82ab4d0b1dc6c2 100644
--- a/ReactCommon/react/renderer/components/slider/SliderShadowNode.h
+++ b/ReactCommon/react/renderer/components/slider/SliderShadowNode.h
@@ -44,13 +44,13 @@ class SliderShadowNode final : public ConcreteViewShadowNode<
       ComponentDescriptor const &componentDescriptor) {
     auto imageSource = ImageSource{ImageSource::Type::Invalid};
     return {imageSource,
-            {imageSource, nullptr, nullptr},
+            {imageSource, nullptr},
             imageSource,
-            {imageSource, nullptr, nullptr},
+            {imageSource, nullptr},
             imageSource,
-            {imageSource, nullptr, nullptr},
+            {imageSource, nullptr},
             imageSource,
-            {imageSource, nullptr, nullptr}};
+            {imageSource, nullptr}};
   }
 
 #pragma mark - LayoutableShadowNode
diff --git a/ReactCommon/react/renderer/imagemanager/BUCK b/ReactCommon/react/renderer/imagemanager/BUCK
index a9797d2884b068..52f99b3fec6fc0 100644
--- a/ReactCommon/react/renderer/imagemanager/BUCK
+++ b/ReactCommon/react/renderer/imagemanager/BUCK
@@ -70,7 +70,6 @@ rn_xplat_cxx_library(
     ios_exported_headers = subdir_glob(
         [
             ("", "*.h"),
-            ("platform/ios", "RCTImageInstrumentationProxy.h"),
             ("platform/ios", "RCTImagePrimitivesConversions.h"),
         ],
         prefix = "react/renderer/imagemanager",
diff --git a/ReactCommon/react/renderer/imagemanager/ImageInstrumentation.h b/ReactCommon/react/renderer/imagemanager/ImageInstrumentation.h
deleted file mode 100644
index c1671cb6790376..00000000000000
--- a/ReactCommon/react/renderer/imagemanager/ImageInstrumentation.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <react/renderer/core/ReactPrimitives.h>
-
-namespace facebook {
-namespace react {
-
-/*
- * A base class for performing image loading instrumentation.
- * The actual instrumentation is app, platform, and image loader-specific.
- */
-class ImageInstrumentation {
- public:
-  virtual ~ImageInstrumentation() noexcept = default;
-
-  /**
-   * Mark that the image content is set on the native image component on screen.
-   */
-  virtual void didSetImage() const = 0;
-
-  /**
-   * Mark that the image view starts to be visible on screen.
-   */
-  virtual void didEnterVisibilityRange() const = 0;
-
-  /**
-   * Mark that the image view is no longer visible on screen.
-   */
-  virtual void didExitVisibilityRange() const = 0;
-};
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/imagemanager/ImageRequest.h b/ReactCommon/react/renderer/imagemanager/ImageRequest.h
index a77c1f76c794dd..e3f3047566429a 100644
--- a/ReactCommon/react/renderer/imagemanager/ImageRequest.h
+++ b/ReactCommon/react/renderer/imagemanager/ImageRequest.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <react/renderer/imagemanager/ImageInstrumentation.h>
 #include <react/renderer/imagemanager/ImageResponse.h>
 #include <react/renderer/imagemanager/ImageResponseObserver.h>
 #include <react/renderer/imagemanager/ImageResponseObserverCoordinator.h>
@@ -31,8 +30,7 @@ class ImageRequest final {
    */
   ImageRequest(
       const ImageSource &imageSource,
-      std::shared_ptr<const ImageTelemetry> telemetry,
-      std::shared_ptr<const ImageInstrumentation> instrumentation);
+      std::shared_ptr<const ImageTelemetry> telemetry);
 
   /*
    * The move constructor.
@@ -78,20 +76,6 @@ class ImageRequest final {
    */
   const std::shared_ptr<const ImageTelemetry> &getSharedTelemetry() const;
 
-  /*
-   * Returns stored image instrumentation object as a shared pointer.
-   * Retain this *or* `ImageRequest` to ensure a correct lifetime of the object.
-   */
-  const std::shared_ptr<const ImageInstrumentation>
-      &getSharedImageInstrumentation() const;
-
-  /*
-   * Returns the image instrumentation object specific to this request.
-   * Use this if a correct lifetime of the object is ensured in some other way
-   * (e.g. by retaining an `ImageRequest`).
-   */
-  const ImageInstrumentation &getImageInstrumentation() const;
-
  private:
   /*
    * Image source associated with the request.
@@ -108,11 +92,6 @@ class ImageRequest final {
    */
   std::shared_ptr<const ImageResponseObserverCoordinator> coordinator_{};
 
-  /*
-   * Image instrumentation specific to the request.
-   */
-  std::shared_ptr<const ImageInstrumentation> instrumentation_;
-
   /*
    * Function we can call to cancel image request (see destructor).
    */
diff --git a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp
index c1d4d1ac63e7b4..245c3b5e7a783b 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp
+++ b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageManager.cpp
@@ -24,7 +24,7 @@ ImageRequest ImageManager::requestImage(
     const ImageSource &imageSource,
     SurfaceId surfaceId) const {
   // Not implemented.
-  return ImageRequest(imageSource, nullptr, nullptr);
+  return ImageRequest(imageSource, nullptr);
 }
 
 } // namespace react
diff --git a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp
index 9cdbc7fdd0dda0..9f811bc4d4a3d2 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp
+++ b/ReactCommon/react/renderer/imagemanager/platform/cxx/react/renderer/imagemanager/ImageRequest.cpp
@@ -12,19 +12,15 @@ namespace react {
 
 ImageRequest::ImageRequest(
     const ImageSource &imageSource,
-    std::shared_ptr<const ImageTelemetry> telemetry,
-    std::shared_ptr<const ImageInstrumentation> instrumentation)
-    : imageSource_(imageSource),
-      telemetry_(telemetry),
-      instrumentation_(instrumentation) {
+    std::shared_ptr<const ImageTelemetry> telemetry)
+    : imageSource_(imageSource), telemetry_(telemetry) {
   // Not implemented.
 }
 
 ImageRequest::ImageRequest(ImageRequest &&other) noexcept
     : imageSource_(std::move(other.imageSource_)),
       telemetry_(std::move(other.telemetry_)),
-      coordinator_(std::move(other.coordinator_)),
-      instrumentation_(std::move(other.instrumentation_)) {
+      coordinator_(std::move(other.coordinator_)) {
   // Not implemented.
 }
 
@@ -44,16 +40,5 @@ const std::shared_ptr<const ImageResponseObserverCoordinator>
   abort();
 }
 
-const std::shared_ptr<const ImageInstrumentation>
-    &ImageRequest::getSharedImageInstrumentation() const {
-  // Not implemented
-  abort();
-}
-
-const ImageInstrumentation &ImageRequest::getImageInstrumentation() const {
-  // Not implemented
-  abort();
-}
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp b/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp
index 216e1ffdfd986d..ce7f9b2d04549f 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/ImageRequest.cpp
@@ -12,24 +12,19 @@ namespace react {
 
 ImageRequest::ImageRequest(
     const ImageSource &imageSource,
-    std::shared_ptr<const ImageTelemetry> telemetry,
-    std::shared_ptr<const ImageInstrumentation> instrumentation)
-    : imageSource_(imageSource),
-      telemetry_(telemetry),
-      instrumentation_(instrumentation) {
+    std::shared_ptr<const ImageTelemetry> telemetry)
+    : imageSource_(imageSource), telemetry_(telemetry) {
   coordinator_ = std::make_shared<ImageResponseObserverCoordinator>();
 }
 
 ImageRequest::ImageRequest(ImageRequest &&other) noexcept
     : imageSource_(std::move(other.imageSource_)),
       telemetry_(std::move(other.telemetry_)),
-      coordinator_(std::move(other.coordinator_)),
-      instrumentation_(std::move(other.instrumentation_)) {
+      coordinator_(std::move(other.coordinator_)) {
   other.moved_ = true;
   other.coordinator_ = nullptr;
   other.cancelRequest_ = nullptr;
   other.telemetry_ = nullptr;
-  other.instrumentation_ = nullptr;
 }
 
 ImageRequest::~ImageRequest() {
@@ -58,14 +53,5 @@ const std::shared_ptr<const ImageResponseObserverCoordinator>
   return coordinator_;
 }
 
-const std::shared_ptr<const ImageInstrumentation>
-    &ImageRequest::getSharedImageInstrumentation() const {
-  return instrumentation_;
-}
-
-const ImageInstrumentation &ImageRequest::getImageInstrumentation() const {
-  return *instrumentation_;
-}
-
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.h b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.h
deleted file mode 100644
index 95726a5ff0cccf..00000000000000
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#pragma once
-
-#include <React/RCTImageLoaderWithAttributionProtocol.h>
-
-#include <react/renderer/core/ReactPrimitives.h>
-#include <react/renderer/imagemanager/ImageInstrumentation.h>
-
-NS_ASSUME_NONNULL_BEGIN
-
-namespace facebook {
-namespace react {
-
-class RCTImageInstrumentationProxy final : public ImageInstrumentation {
- public:
-  RCTImageInstrumentationProxy(id<RCTImageLoaderWithAttributionProtocol> imageLoader);
-  ~RCTImageInstrumentationProxy();
-
-  void didSetImage() const override;
-  void didEnterVisibilityRange() const override;
-  void didExitVisibilityRange() const override;
-
-  void trackNativeImageView(UIView *imageView) const;
-  void setImageURLLoaderRequest(RCTImageURLLoaderRequest *request);
-
- private:
-  __weak id<RCTImageLoaderWithAttributionProtocol> imageLoader_;
-  RCTImageURLLoaderRequest *imageURLLoaderRequest_;
-};
-
-} // namespace react
-} // namespace facebook
-
-NS_ASSUME_NONNULL_END
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm
deleted file mode 100644
index 1ed24f9faacda3..00000000000000
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageInstrumentationProxy.mm
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-#import "RCTImageInstrumentationProxy.h"
-
-namespace facebook {
-namespace react {
-
-RCTImageInstrumentationProxy::RCTImageInstrumentationProxy(id<RCTImageLoaderWithAttributionProtocol> imageLoader)
-    : imageLoader_(imageLoader)
-{
-}
-
-RCTImageInstrumentationProxy::~RCTImageInstrumentationProxy()
-{
-  if (!imageURLLoaderRequest_) {
-    return;
-  }
-  [imageLoader_ trackURLImageDidDestroy:imageURLLoaderRequest_];
-}
-
-void RCTImageInstrumentationProxy::didSetImage() const
-{
-  if (!RCTImageLoadingPerfInstrumentationEnabled()) {
-    return;
-  }
-
-  if (!imageURLLoaderRequest_) {
-    return;
-  }
-
-  [imageLoader_ trackURLImageContentDidSetForRequest:imageURLLoaderRequest_];
-}
-
-void RCTImageInstrumentationProxy::didEnterVisibilityRange() const
-{
-  if (!RCTImageLoadingPerfInstrumentationEnabled()) {
-    return;
-  }
-
-  // TODO (T58941612): Not yet supported.
-  if (!imageURLLoaderRequest_) {
-    return;
-  }
-}
-
-void RCTImageInstrumentationProxy::didExitVisibilityRange() const
-{
-  if (!RCTImageLoadingPerfInstrumentationEnabled()) {
-    return;
-  }
-
-  // TODO (T58941612): Not yet supported.
-  if (!imageURLLoaderRequest_) {
-    return;
-  }
-}
-
-void RCTImageInstrumentationProxy::trackNativeImageView(UIView *imageView) const
-{
-  if (!RCTImageLoadingPerfInstrumentationEnabled()) {
-    return;
-  }
-
-  if (!imageURLLoaderRequest_) {
-    return;
-  }
-  [imageLoader_ trackURLImageVisibilityForRequest:imageURLLoaderRequest_ imageView:imageView];
-}
-
-void RCTImageInstrumentationProxy::setImageURLLoaderRequest(RCTImageURLLoaderRequest *request)
-{
-  imageURLLoaderRequest_ = request;
-}
-
-} // namespace react
-} // namespace facebook
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
index b719be1158fbb8..08e0c255885d3f 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
@@ -16,7 +16,6 @@
 #import <react/renderer/imagemanager/ImageResponse.h>
 #import <react/renderer/imagemanager/ImageResponseObserver.h>
 
-#import "RCTImageInstrumentationProxy.h"
 #import "RCTImagePrimitivesConversions.h"
 
 using namespace facebook::react;
@@ -41,10 +40,9 @@ - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfa
 {
   SystraceSection s("RCTImageManager::requestImage");
 
-  auto imageInstrumentation = std::make_shared<RCTImageInstrumentationProxy>(_imageLoader);
   auto telemetry = std::make_shared<ImageTelemetry>(surfaceId);
   telemetry->willRequestUrl();
-  auto imageRequest = ImageRequest(imageSource, telemetry, imageInstrumentation);
+  auto imageRequest = ImageRequest(imageSource, telemetry);
   auto weakObserverCoordinator =
       (std::weak_ptr<const ImageResponseObserverCoordinator>)imageRequest.getSharedObserverCoordinator();
 
@@ -108,10 +106,6 @@ - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfa
                                     completionBlock:completionBlock];
     RCTImageLoaderCancellationBlock cancelationBlock = loaderRequest.cancellationBlock;
     sharedCancelationFunction.assign([cancelationBlock]() { cancelationBlock(); });
-
-    if (imageInstrumentation) {
-      imageInstrumentation->setImageURLLoaderRequest(loaderRequest);
-    }
   });
 
   return imageRequest;
diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm
index df89da51cecf31..7a36d42ea4a283 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTSyncImageManager.mm
@@ -37,7 +37,7 @@ - (instancetype)initWithImageLoader:(id<RCTImageLoaderWithAttributionProtocol>)i
 - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfaceId
 {
   auto telemetry = std::make_shared<ImageTelemetry>(surfaceId);
-  auto imageRequest = ImageRequest(imageSource, telemetry, nullptr);
+  auto imageRequest = ImageRequest(imageSource, telemetry);
   auto weakObserverCoordinator =
       (std::weak_ptr<const ImageResponseObserverCoordinator>)imageRequest.getSharedObserverCoordinator();
 

From ef145adb9db646b4133eff7da03691a958854bd0 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 105/241] Split NativeImageStore into iOS and Android
 counterparts

Summary:
Split the two specs, so that that we don't have to use Flow unions in the merged spec.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23800841

fbshipit-source-id: 28b67578832ebd733bd080877e4ab763c013fded
---
 .../FBReactNativeSpec-generated.mm            | 50 ++++++++++++----
 .../FBReactNativeSpec/FBReactNativeSpec.h     | 57 ++++++++++++++++---
 Libraries/Image/NativeImageStoreAndroid.js    | 27 +++++++++
 ...veImageStore.js => NativeImageStoreIOS.js} | 12 +---
 Libraries/Image/RCTImageStoreManager.mm       |  4 +-
 .../specs/NativeImageStoreAndroidSpec.java    | 30 ++++++++++
 .../specs/NativeImageStoreIOSSpec.java        | 40 +++++++++++++
 .../specs/jni/FBReactNativeSpec-generated.cpp | 38 ++++++++++---
 .../fbreact/specs/jni/FBReactNativeSpec.h     | 20 ++++++-
 .../modules/camera/ImageStoreManager.java     | 20 +------
 10 files changed, 235 insertions(+), 63 deletions(-)
 create mode 100644 Libraries/Image/NativeImageStoreAndroid.js
 rename Libraries/Image/{NativeImageStore.js => NativeImageStoreIOS.js} (75%)
 create mode 100644 ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreAndroidSpec.java
 create mode 100644 ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreIOSSpec.java

diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
index 1f7227f478f872..5ca05feb84cd38 100644
--- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
+++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
@@ -1610,46 +1610,72 @@ + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenSelectDialogConfig:(id)js
 
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeImageStore_SpecAddImageFromBase64ErrorCallbackError)
-+ (RCTManagedPointer *)JS_NativeImageStore_SpecAddImageFromBase64ErrorCallbackError:(id)json
+namespace facebook {
+  namespace react {
+
+    
+    static facebook::jsi::Value __hostFunction_NativeImageStoreAndroidSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getBase64ForTag", @selector(getBase64ForTag:successCallback:errorCallback:), args, count);
+    }
+
+
+    NativeImageStoreAndroidSpecJSI::NativeImageStoreAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_["getBase64ForTag"] = MethodMetadata {3, __hostFunction_NativeImageStoreAndroidSpecJSI_getBase64ForTag};
+        
+        
+
+    }
+
+  } // namespace react
+} // namespace facebook
+@implementation RCTCxxConvert (NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError)
++ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeImageStoreIOS::SpecGetBase64ForTagErrorCallbackError>(json);
+}
+@end
+@implementation RCTCxxConvert (NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError)
++ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError:(id)json
 {
-  return facebook::react::managedPointer<JS::NativeImageStore::SpecAddImageFromBase64ErrorCallbackError>(json);
+  return facebook::react::managedPointer<JS::NativeImageStoreIOS::SpecAddImageFromBase64ErrorCallbackError>(json);
 }
 @end
 namespace facebook {
   namespace react {
 
     
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getBase64ForTag", @selector(getBase64ForTag:successCallback:errorCallback:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_hasImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_hasImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "hasImageForTag", @selector(hasImageForTag:callback:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_removeImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_removeImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeImageForTag", @selector(removeImageForTag:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_addImageFromBase64(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_addImageFromBase64(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "addImageFromBase64", @selector(addImageFromBase64:successCallback:errorCallback:), args, count);
     }
 
 
-    NativeImageStoreSpecJSI::NativeImageStoreSpecJSI(const ObjCTurboModule::InitParams &params)
+    NativeImageStoreIOSSpecJSI::NativeImageStoreIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_["getBase64ForTag"] = MethodMetadata {3, __hostFunction_NativeImageStoreSpecJSI_getBase64ForTag};
+        methodMap_["getBase64ForTag"] = MethodMetadata {3, __hostFunction_NativeImageStoreIOSSpecJSI_getBase64ForTag};
         
         
-        methodMap_["hasImageForTag"] = MethodMetadata {2, __hostFunction_NativeImageStoreSpecJSI_hasImageForTag};
+        methodMap_["hasImageForTag"] = MethodMetadata {2, __hostFunction_NativeImageStoreIOSSpecJSI_hasImageForTag};
         
         
-        methodMap_["removeImageForTag"] = MethodMetadata {1, __hostFunction_NativeImageStoreSpecJSI_removeImageForTag};
+        methodMap_["removeImageForTag"] = MethodMetadata {1, __hostFunction_NativeImageStoreIOSSpecJSI_removeImageForTag};
         
         
-        methodMap_["addImageFromBase64"] = MethodMetadata {3, __hostFunction_NativeImageStoreSpecJSI_addImageFromBase64};
+        methodMap_["addImageFromBase64"] = MethodMetadata {3, __hostFunction_NativeImageStoreIOSSpecJSI_addImageFromBase64};
         
         
 
diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
index 93f4a41177323f..78011e9ea4d305 100644
--- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
+++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
@@ -1524,9 +1524,45 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
+@protocol NativeImageStoreAndroidSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)getBase64ForTag:(NSString *)uri
+        successCallback:(RCTResponseSenderBlock)successCallback
+          errorCallback:(RCTResponseSenderBlock)errorCallback;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'ImageStoreAndroid'
+     */
+
+    class JSI_EXPORT NativeImageStoreAndroidSpecJSI : public ObjCTurboModule {
+    public:
+      NativeImageStoreAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
+
+    };
+  } // namespace react
+} // namespace facebook
 
 namespace JS {
-  namespace NativeImageStore {
+  namespace NativeImageStoreIOS {
+    struct SpecGetBase64ForTagErrorCallbackError {
+      NSString *message() const;
+
+      SpecGetBase64ForTagErrorCallbackError(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError)
++ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError:(id)json;
+@end
+
+namespace JS {
+  namespace NativeImageStoreIOS {
     struct SpecAddImageFromBase64ErrorCallbackError {
       NSString *message() const;
 
@@ -1537,10 +1573,10 @@ namespace JS {
   }
 }
 
-@interface RCTCxxConvert (NativeImageStore_SpecAddImageFromBase64ErrorCallbackError)
-+ (RCTManagedPointer *)JS_NativeImageStore_SpecAddImageFromBase64ErrorCallbackError:(id)json;
+@interface RCTCxxConvert (NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError)
++ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError:(id)json;
 @end
-@protocol NativeImageStoreSpec <RCTBridgeModule, RCTTurboModule>
+@protocol NativeImageStoreIOSSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getBase64ForTag:(NSString *)uri
         successCallback:(RCTResponseSenderBlock)successCallback
@@ -1556,12 +1592,12 @@ namespace JS {
 namespace facebook {
   namespace react {
     /**
-     * ObjC++ class for module 'ImageStore'
+     * ObjC++ class for module 'ImageStoreIOS'
      */
 
-    class JSI_EXPORT NativeImageStoreSpecJSI : public ObjCTurboModule {
+    class JSI_EXPORT NativeImageStoreIOSSpecJSI : public ObjCTurboModule {
     public:
-      NativeImageStoreSpecJSI(const ObjCTurboModule::InitParams &params);
+      NativeImageStoreIOSSpecJSI(const ObjCTurboModule::InitParams &params);
 
     };
   } // namespace react
@@ -3292,7 +3328,12 @@ inline bool JS::NativeImagePickerIOS::SpecOpenSelectDialogConfig::showVideos() c
   id const p = _v[@"showVideos"];
   return RCTBridgingToBool(p);
 }
-inline NSString *JS::NativeImageStore::SpecAddImageFromBase64ErrorCallbackError::message() const
+inline NSString *JS::NativeImageStoreIOS::SpecGetBase64ForTagErrorCallbackError::message() const
+{
+  id const p = _v[@"message"];
+  return RCTBridgingToString(p);
+}
+inline NSString *JS::NativeImageStoreIOS::SpecAddImageFromBase64ErrorCallbackError::message() const
 {
   id const p = _v[@"message"];
   return RCTBridgingToString(p);
diff --git a/Libraries/Image/NativeImageStoreAndroid.js b/Libraries/Image/NativeImageStoreAndroid.js
new file mode 100644
index 00000000000000..8ab6dc7c1a2315
--- /dev/null
+++ b/Libraries/Image/NativeImageStoreAndroid.js
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {TurboModule} from '../TurboModule/RCTExport';
+import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
+
+export interface Spec extends TurboModule {
+  +getConstants: () => {||};
+  +getBase64ForTag: (
+    uri: string,
+    successCallback: (base64ImageData: string) => void,
+    errorCallback: (error: string) => void,
+  ) => void;
+}
+
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'ImageStoreManager',
+): Spec);
diff --git a/Libraries/Image/NativeImageStore.js b/Libraries/Image/NativeImageStoreIOS.js
similarity index 75%
rename from Libraries/Image/NativeImageStore.js
rename to Libraries/Image/NativeImageStoreIOS.js
index 38603b6aaab2cf..d94f1ef4f35095 100644
--- a/Libraries/Image/NativeImageStore.js
+++ b/Libraries/Image/NativeImageStoreIOS.js
@@ -15,21 +15,11 @@ import * as TurboModuleRegistry from '../TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
   +getConstants: () => {||};
-  // Common
   +getBase64ForTag: (
     uri: string,
     successCallback: (base64ImageData: string) => void,
-
-    /**
-     * On Android, the failure callback is called with a string.
-     * On iOS, the failure callback is called with an error object.
-     *
-     * TODO(T47527939) Unify this inconsistency
-     */
-    errorCallback: (error: {|message: string|} | string) => void,
+    errorCallback: (error: {|message: string|}) => void,
   ) => void;
-
-  // iOS-only
   +hasImageForTag: (uri: string, callback: (hasImage: boolean) => void) => void;
   +removeImageForTag: (uri: string) => void;
   +addImageFromBase64: (
diff --git a/Libraries/Image/RCTImageStoreManager.mm b/Libraries/Image/RCTImageStoreManager.mm
index 907ecbbb6b0871..7eb3b1e91cc3d5 100644
--- a/Libraries/Image/RCTImageStoreManager.mm
+++ b/Libraries/Image/RCTImageStoreManager.mm
@@ -22,7 +22,7 @@
 
 static NSString *const RCTImageStoreURLScheme = @"rct-image-store";
 
-@interface RCTImageStoreManager() <NativeImageStoreSpec>
+@interface RCTImageStoreManager() <NativeImageStoreIOSSpec>
 @end
 
 @implementation RCTImageStoreManager
@@ -236,7 +236,7 @@ - (void)getImageForTag:(NSString *)imageTag withBlock:(void (^)(UIImage *image))
 
 - (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params
 {
-  return std::make_shared<facebook::react::NativeImageStoreSpecJSI>(params);
+  return std::make_shared<facebook::react::NativeImageStoreIOSSpecJSI>(params);
 }
 
 @end
diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreAndroidSpec.java b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreAndroidSpec.java
new file mode 100644
index 00000000000000..f3c53ac8544ac5
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreAndroidSpec.java
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ *
+ * <p>Generated by an internal genrule from Flow types.
+ *
+ * @generated
+ * @nolint
+ */
+
+package com.facebook.fbreact.specs;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+
+public abstract class NativeImageStoreAndroidSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public NativeImageStoreAndroidSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @ReactMethod
+  public abstract void getBase64ForTag(String uri, Callback successCallback,
+      Callback errorCallback);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreIOSSpec.java b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreIOSSpec.java
new file mode 100644
index 00000000000000..10455469ccec72
--- /dev/null
+++ b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/NativeImageStoreIOSSpec.java
@@ -0,0 +1,40 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * <p>This source code is licensed under the MIT license found in the LICENSE file in the root
+ * directory of this source tree.
+ *
+ * <p>Generated by an internal genrule from Flow types.
+ *
+ * @generated
+ * @nolint
+ */
+
+package com.facebook.fbreact.specs;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+
+public abstract class NativeImageStoreIOSSpec extends ReactContextBaseJavaModule implements ReactModuleWithSpec, TurboModule {
+  public NativeImageStoreIOSSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @ReactMethod
+  public abstract void addImageFromBase64(String base64ImageData, Callback successCallback,
+      Callback errorCallback);
+
+  @ReactMethod
+  public abstract void getBase64ForTag(String uri, Callback successCallback,
+      Callback errorCallback);
+
+  @ReactMethod
+  public abstract void hasImageForTag(String uri, Callback callback);
+
+  @ReactMethod
+  public abstract void removeImageForTag(String uri);
+}
diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec-generated.cpp b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec-generated.cpp
index 85c52d7e79592a..e8fdde414ba7d9 100644
--- a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec-generated.cpp
+++ b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec-generated.cpp
@@ -1416,36 +1416,56 @@ namespace facebook {
   namespace react {
 
     
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImageStoreAndroidSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<JavaTurboModule&>(turboModule).invokeJavaMethod(rt, VoidKind, "getBase64ForTag", "(Ljava/lang/String;Lcom/facebook/react/bridge/Callback;Lcom/facebook/react/bridge/Callback;)V", args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_hasImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+
+    NativeImageStoreAndroidSpecJSI::NativeImageStoreAndroidSpecJSI(const JavaTurboModule::InitParams &params)
+      : JavaTurboModule(params) {
+        
+        methodMap_["getBase64ForTag"] = MethodMetadata {3, __hostFunction_NativeImageStoreAndroidSpecJSI_getBase64ForTag};
+        
+        
+
+    }
+
+  } // namespace react
+} // namespace facebook
+namespace facebook {
+  namespace react {
+
+    
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<JavaTurboModule&>(turboModule).invokeJavaMethod(rt, VoidKind, "getBase64ForTag", "(Ljava/lang/String;Lcom/facebook/react/bridge/Callback;Lcom/facebook/react/bridge/Callback;)V", args, count);
+    }
+
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_hasImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<JavaTurboModule&>(turboModule).invokeJavaMethod(rt, VoidKind, "hasImageForTag", "(Ljava/lang/String;Lcom/facebook/react/bridge/Callback;)V", args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_removeImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_removeImageForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<JavaTurboModule&>(turboModule).invokeJavaMethod(rt, VoidKind, "removeImageForTag", "(Ljava/lang/String;)V", args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeImageStoreSpecJSI_addImageFromBase64(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_addImageFromBase64(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<JavaTurboModule&>(turboModule).invokeJavaMethod(rt, VoidKind, "addImageFromBase64", "(Ljava/lang/String;Lcom/facebook/react/bridge/Callback;Lcom/facebook/react/bridge/Callback;)V", args, count);
     }
 
 
-    NativeImageStoreSpecJSI::NativeImageStoreSpecJSI(const JavaTurboModule::InitParams &params)
+    NativeImageStoreIOSSpecJSI::NativeImageStoreIOSSpecJSI(const JavaTurboModule::InitParams &params)
       : JavaTurboModule(params) {
         
-        methodMap_["getBase64ForTag"] = MethodMetadata {3, __hostFunction_NativeImageStoreSpecJSI_getBase64ForTag};
+        methodMap_["getBase64ForTag"] = MethodMetadata {3, __hostFunction_NativeImageStoreIOSSpecJSI_getBase64ForTag};
         
         
-        methodMap_["hasImageForTag"] = MethodMetadata {2, __hostFunction_NativeImageStoreSpecJSI_hasImageForTag};
+        methodMap_["hasImageForTag"] = MethodMetadata {2, __hostFunction_NativeImageStoreIOSSpecJSI_hasImageForTag};
         
         
-        methodMap_["removeImageForTag"] = MethodMetadata {1, __hostFunction_NativeImageStoreSpecJSI_removeImageForTag};
+        methodMap_["removeImageForTag"] = MethodMetadata {1, __hostFunction_NativeImageStoreIOSSpecJSI_removeImageForTag};
         
         
-        methodMap_["addImageFromBase64"] = MethodMetadata {3, __hostFunction_NativeImageStoreSpecJSI_addImageFromBase64};
+        methodMap_["addImageFromBase64"] = MethodMetadata {3, __hostFunction_NativeImageStoreIOSSpecJSI_addImageFromBase64};
         
         
 
diff --git a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec.h b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec.h
index 940c22e2f62c94..49f97cc402c4d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec.h
+++ b/ReactAndroid/src/main/java/com/facebook/fbreact/specs/jni/FBReactNativeSpec.h
@@ -440,12 +440,26 @@ namespace facebook {
 namespace facebook {
   namespace react {
     /**
-     * C++ class for module 'ImageStore'
+     * C++ class for module 'ImageStoreAndroid'
      */
 
-    class JSI_EXPORT NativeImageStoreSpecJSI : public JavaTurboModule {
+    class JSI_EXPORT NativeImageStoreAndroidSpecJSI : public JavaTurboModule {
     public:
-      NativeImageStoreSpecJSI(const JavaTurboModule::InitParams &params);
+      NativeImageStoreAndroidSpecJSI(const JavaTurboModule::InitParams &params);
+
+    };
+  } // namespace react
+} // namespace facebook
+
+namespace facebook {
+  namespace react {
+    /**
+     * C++ class for module 'ImageStoreIOS'
+     */
+
+    class JSI_EXPORT NativeImageStoreIOSSpecJSI : public JavaTurboModule {
+    public:
+      NativeImageStoreIOSSpecJSI(const JavaTurboModule::InitParams &params);
 
     };
   } // namespace react
diff --git a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
index 8bf377cfb4cc13..0752be6e554cae 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/modules/camera/ImageStoreManager.java
@@ -12,7 +12,7 @@
 import android.os.AsyncTask;
 import android.util.Base64;
 import android.util.Base64OutputStream;
-import com.facebook.fbreact.specs.NativeImageStoreSpec;
+import com.facebook.fbreact.specs.NativeImageStoreAndroidSpec;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.GuardedAsyncTask;
 import com.facebook.react.bridge.ReactApplicationContext;
@@ -25,7 +25,7 @@
 import java.io.InputStream;
 
 @ReactModule(name = ImageStoreManager.NAME)
-public class ImageStoreManager extends NativeImageStoreSpec {
+public class ImageStoreManager extends NativeImageStoreAndroidSpec {
 
   public static final String NAME = "ImageStoreManager";
   private static final int BUFFER_SIZE = 8192;
@@ -105,20 +105,4 @@ private static void closeQuietly(Closeable closeable) {
       // shhh
     }
   }
-
-  @Override
-  public void hasImageForTag(String uri, Callback callback) {
-    // iOS only
-  }
-
-  @Override
-  public void removeImageForTag(String uri) {
-    // iOS only
-  }
-
-  @Override
-  public void addImageFromBase64(
-      String base64ImageData, Callback successCallback, Callback errorCallback) {
-    // iOS only
-  }
 }

From 341e05ff62e1c6e799f5c825fa44308cf1a48485 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 106/241] Allow NativeModule method return types to use type
 aliases

Summary:
We already support type-aliases in our NativeModule method params. This diff extends the support to NativeModule method returns.

**Note:** I need to see if I need to update the generators to handle this case. Will do that in this diff, after working through other higher priority stuff.

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D22828839

fbshipit-source-id: cf5c756d3cacf067df217cdb6212946320a2d4be
---
 packages/react-native-codegen/src/CodegenSchema.js       | 5 +++++
 .../parsers/flow/modules/__test_fixtures__/fixtures.js   | 2 +-
 .../__tests__/__snapshots__/module-parser-test.js.snap   | 3 ++-
 .../src/parsers/flow/modules/methods.js                  | 9 ++++++++-
 4 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index ffd3a1a4666173..f827018f020103 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -304,6 +304,11 @@ export type FunctionTypeAnnotationReturn =
       nullable: boolean,
       type: 'ObjectTypeAnnotation',
       properties: ?$ReadOnlyArray<ObjectParamTypeAnnotation>,
+    |}>
+  | $ReadOnly<{|
+      nullable: boolean,
+      type: 'TypeAliasTypeAnnotation',
+      name: string,
     |}>;
 
 export type FunctionTypeAnnotationReturnArrayElementType =
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
index a326be96accd23..c362d7f2ec0f8d 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
@@ -200,7 +200,7 @@ type Foo = {|
 
 export interface Spec extends TurboModule {
   // Exported methods.
-  foo1: (x: Foo) => void;
+  foo1: (x: Foo) => Foo;
   foo2: (x: Foo) => void;
 }
 
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
index 0aeb307d1b2201..08193385e0a985 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
@@ -940,8 +940,9 @@ Object {
                   },
                 ],
                 "returnTypeAnnotation": Object {
+                  "name": "Foo",
                   "nullable": false,
-                  "type": "VoidTypeAnnotation",
+                  "type": "TypeAliasTypeAnnotation",
                 },
                 "type": "FunctionTypeAnnotation",
               },
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/methods.js b/packages/react-native-codegen/src/parsers/flow/modules/methods.js
index c63fc903692d56..2445b5d38e551d 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/methods.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/methods.js
@@ -244,6 +244,13 @@ function getReturnTypeAnnotation(
         );
       }
     case 'ObjectTypeAnnotation':
+      if (returnType.type === 'GenericTypeAnnotation') {
+        return {
+          nullable,
+          type: 'TypeAliasTypeAnnotation',
+          name: returnType.id.name,
+        };
+      }
       return {
         nullable,
         type: 'ObjectTypeAnnotation',
@@ -323,7 +330,7 @@ function buildMethodSchema(
 
   const returnTypeAnnotation = getReturnTypeAnnotation(
     name,
-    getValueFromTypes(value.returnType, types),
+    value.returnType,
     types,
   );
   return {

From 5142e994374eac3e9bbc346796efdc73c61e3171 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 107/241] Delete NativeModuleSchemaBuilderConfig type

Summary:
Unecessary, since `NativeModuleShape` is the exact same thing.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D23119784

fbshipit-source-id: 8c4aded88a97a80aa977c13cc27e32fbe68150aa
---
 .../src/parsers/flow/modules/index.js               |  5 ++---
 .../src/parsers/flow/modules/schema.js              | 13 ++-----------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index c09c66acf47c51..d8f5e7d4cda476 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -10,7 +10,7 @@
 
 'use strict';
 
-import type {NativeModuleSchemaBuilderConfig} from './schema.js';
+import type {NativeModuleShape} from '../../../CodegenSchema';
 const {getAliases} = require('./aliases');
 const {getMethods} = require('./methods');
 
@@ -58,8 +58,7 @@ function getModuleAliases(types, aliasNames) {
   });
 }
 
-// $FlowFixMe there's no flowtype for AST
-function processModule(types): NativeModuleSchemaBuilderConfig {
+function processModule(types: $FlowFixMe): NativeModuleShape {
   const interfaceName = findInterfaceName(types);
   const moduleProperties = getModuleProperties(types, interfaceName);
   const properties = getMethods(moduleProperties, types);
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/schema.js b/packages/react-native-codegen/src/parsers/flow/modules/schema.js
index c1e4c80cfd5fed..34e6b1531050b3 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/schema.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/schema.js
@@ -10,19 +10,10 @@
 
 'use strict';
 
-import type {
-  SchemaType,
-  ObjectTypeAliasTypeShape,
-  NativeModuleMethodTypeShape,
-} from '../../../CodegenSchema.js';
-
-export type NativeModuleSchemaBuilderConfig = $ReadOnly<{|
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-  properties: $ReadOnlyArray<NativeModuleMethodTypeShape>,
-|}>;
+import type {SchemaType, NativeModuleShape} from '../../../CodegenSchema.js';
 
 function buildModuleSchema(
-  {aliases, properties}: NativeModuleSchemaBuilderConfig,
+  {aliases, properties}: NativeModuleShape,
   moduleName: string,
 ): SchemaType {
   return {

From 1435d654d787ef312f24abcd24f1cf6b2dbf03d7 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 108/241] Restructure getTypes function

Summary:
There are two types of types we care about:
- Type aliases
- Interface Declarations

These types can be exported.

I think we should build the types dictionary from only those types. Everything else should be ignored.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23120241

fbshipit-source-id: 9f023081d0f9c85b45407b180ae7c3e7391eb725
---
 .../src/parsers/flow/index.js                     | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index 4de02b0094393d..47342b8d87f9c1 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -20,10 +20,19 @@ const {buildComponentSchema} = require('./components/schema');
 const {processComponent} = require('./components');
 const {processModule} = require('./modules');
 
-function getTypes(ast) {
+/**
+ * This FlowFixMe is supposed to refer to an InterfaceDeclaration or TypeAlias
+ * declaration type. Unfortunately, we don't have those types, because flow-parser
+ * generates them, and flow-parser is not type-safe. In the future, we should find
+ * a way to get these types from our flow parser library.
+ */
+function getTypes(ast): {[declarationName: string]: $FlowFixMe} {
   return ast.body.reduce((types, node) => {
-    if (node.type === 'ExportNamedDeclaration') {
-      if (node.declaration && node.declaration.type !== 'VariableDeclaration') {
+    if (node.type === 'ExportNamedDeclaration' && node.exportKind === 'type') {
+      if (
+        node.declaration.type === 'TypeAlias' ||
+        node.declaration.type === 'InterfaceDeclaration'
+      ) {
         types[node.declaration.id.name] = node.declaration;
       }
     } else if (

From 22d6e04da12d7650a9bf0bcf00c2a5f86aaec62a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 109/241] Clean up Module/Component detection logic in Flow
 parser

Summary:
Just broke down getConfigType into two separate functions: `isModule` and `isComponent`.
- Cleaned up `isComponent`, to check for the the AST node types.
- Re-implemented `isModule`
- Improved error messages.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D23121896

fbshipit-source-id: 3df2b2e334c4cea8eabe2e73ecb9f1f1217e7be4
---
 .../src/parsers/flow/index.js                 | 83 ++++++++++++-------
 .../__snapshots__/module-parser-test.js.snap  |  7 +-
 2 files changed, 55 insertions(+), 35 deletions(-)

diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index 47342b8d87f9c1..aeca0a0a1adeb0 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -26,7 +26,9 @@ const {processModule} = require('./modules');
  * generates them, and flow-parser is not type-safe. In the future, we should find
  * a way to get these types from our flow parser library.
  */
-function getTypes(ast): {[declarationName: string]: $FlowFixMe} {
+type TypeDeclarations = {|[declarationName: string]: $FlowFixMe|};
+
+function getTypes(ast): TypeDeclarations {
   return ast.body.reduce((types, node) => {
     if (node.type === 'ExportNamedDeclaration' && node.exportKind === 'type') {
       if (
@@ -45,58 +47,79 @@ function getTypes(ast): {[declarationName: string]: $FlowFixMe} {
   }, {});
 }
 
-function getConfigType(ast, types): 'module' | 'component' {
+function isComponent(ast) {
   const defaultExports = ast.body.filter(
     node => node.type === 'ExportDefaultDeclaration',
   );
 
-  let isComponent = false;
+  if (defaultExports.length === 0) {
+    return false;
+  }
 
-  if (defaultExports.length > 0) {
-    let declaration = defaultExports[0].declaration;
-    // codegenNativeComponent can be nested inside a cast
-    // expression so we need to go one level deeper
-    if (declaration.type === 'TypeCastExpression') {
-      declaration = declaration.expression;
-    }
+  let declaration = defaultExports[0].declaration;
+  // codegenNativeComponent can be nested inside a cast
+  // expression so we need to go one level deeper
+  if (declaration.type === 'TypeCastExpression') {
+    declaration = declaration.expression;
+  }
 
-    isComponent =
-      declaration &&
-      declaration.callee &&
-      declaration.callee.name === 'codegenNativeComponent';
+  if (declaration.type !== 'CallExpression') {
+    return false;
   }
 
-  const typesExtendingTurboModule = Object.keys(types)
-    .map(typeName => types[typeName])
-    .filter(
-      type =>
-        type.extends &&
-        type.extends[0] &&
-        type.extends[0].id.name === 'TurboModule',
-    );
+  return (
+    declaration.callee.type === 'Identifier' &&
+    declaration.callee.name === 'codegenNativeComponent'
+  );
+}
 
-  if (typesExtendingTurboModule.length > 1) {
+function isModule(types: TypeDeclarations) {
+  const declaredModuleNames: Array<string> = Object.keys(types).filter(
+    (typeName: string) => {
+      const declaration = types[typeName];
+      return (
+        declaration.type === 'InterfaceDeclaration' &&
+        declaration.extends.length === 1 &&
+        declaration.extends[0].type === 'InterfaceExtends' &&
+        declaration.extends[0].id.name === 'TurboModule'
+      );
+    },
+  );
+
+  if (declaredModuleNames.length === 0) {
+    return false;
+  }
+
+  if (declaredModuleNames.length > 1) {
     throw new Error(
-      'Found two types extending "TurboModule" is one file. Split them into separated files.',
+      'File contains declarations of more than one module: ' +
+        declaredModuleNames.join(', ') +
+        '. Please declare exactly one module in this file.',
     );
   }
 
-  const isModule = typesExtendingTurboModule.length === 1;
+  return true;
+}
+
+function getConfigType(ast, types: TypeDeclarations): 'module' | 'component' {
+  const isConfigAComponent = isComponent(ast);
+  const isConfigAModule = isModule(types);
 
-  if (isModule && isComponent) {
+  if (isConfigAModule && isConfigAComponent) {
     throw new Error(
       'Found type extending "TurboModule" and exported "codegenNativeComponent" declaration in one file. Split them into separated files.',
     );
   }
 
-  if (isModule) {
+  if (isConfigAModule) {
     return 'module';
-  } else if (isComponent) {
+  } else if (isConfigAComponent) {
     return 'component';
   } else {
     throw new Error(
-      `Default export for module specified incorrectly. It should containts
-    either type extending "TurboModule" or "codegenNativeComponent".`,
+      'File neither contains a module declaration, nor a component declaration. ' +
+        'For module declarations, please make sure your file has an InterfaceDeclaration extending TurboModule. ' +
+        'For component declarations, please make sure your file has a default export calling the codegenNativeComponent<Props>(...) macro.',
     );
   }
 }
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
index 08193385e0a985..1fcaee4231a81e 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
@@ -12,12 +12,9 @@ exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_REA
 
 exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_UNNAMED_PARAMS 1`] = `"Unsupported type for getBool. Please provide a name for every parameter."`;
 
-exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_EXTENDING_TURBO_MODULE 1`] = `"Found two types extending \\"TurboModule\\" is one file. Split them into separated files."`;
+exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_EXTENDING_TURBO_MODULE 1`] = `"File contains declarations of more than one module: Spec, Spec2. Please declare exactly one module in this file."`;
 
-exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_MODULES_EXPORTED_WITH_DEFAULT 1`] = `
-"Default export for module specified incorrectly. It should containts
-    either type extending \\"TurboModule\\" or \\"codegenNativeComponent\\"."
-`;
+exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_MODULES_EXPORTED_WITH_DEFAULT 1`] = `"File neither contains a module declaration, nor a component declaration. For module declarations, please make sure your file has an InterfaceDeclaration extending TurboModule. For component declarations, please make sure your file has a default export calling the codegenNativeComponent<Props>(...) macro."`;
 
 exports[`RN Codegen Flow Parser can generate fixture EMPTY_NATIVE_MODULE 1`] = `
 Object {

From 8c138baf4e1957622724a998c467c62524d53e44 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 110/241] Fix parser's buildSchema's return type

Summary:
`buildSchema` delegates to two other functions: `buildComponentSchema`, or `buildComponentSchema`. Both return have a return type of *required* `SchemaType`. Therefore, `buildSchema` can have a return type of `SchemaType`.

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D23135499

fbshipit-source-id: f13db17549c93b965f372d9b68d06efc2a40c6cc
---
 .../react-native-codegen/src/parsers/flow/index.js     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index aeca0a0a1adeb0..c728418bde5a34 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -124,7 +124,7 @@ function getConfigType(ast, types: TypeDeclarations): 'module' | 'component' {
   }
 }
 
-function buildSchema(contents: string, filename: ?string): ?SchemaType {
+function buildSchema(contents: string, filename: ?string): SchemaType {
   const ast = flowParser.parse(contents);
 
   const types = getTypes(ast);
@@ -142,20 +142,20 @@ function buildSchema(contents: string, filename: ?string): ?SchemaType {
   }
 }
 
-function parseFile(filename: string): ?SchemaType {
+function parseFile(filename: string): SchemaType {
   const contents = fs.readFileSync(filename, 'utf8');
 
   return buildSchema(contents, filename);
 }
 
-function parseModuleFixture(filename: string): ?SchemaType {
+function parseModuleFixture(filename: string): SchemaType {
   const contents = fs.readFileSync(filename, 'utf8');
 
   return buildSchema(contents, 'path/NativeSampleTurboModule.js');
 }
 
-function parseString(contents: string): ?SchemaType {
-  return buildSchema(contents);
+function parseString(contents: string, filename: ?string): SchemaType {
+  return buildSchema(contents, filename);
 }
 
 module.exports = {

From 78057729cebf2335edc0ff7520e91c6f15729e94 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 111/241] Clean up parsers/flow/modules/index.js

Summary:
Changes:
- Adding type annotations, where possible
- Delete unnecessary functions

Changelog: [Internal]

Reviewed By: mdvacca

Differential Revision: D23138227

fbshipit-source-id: b4b47492ddef49f496ed9fcb61ef1c000e3e8f18
---
 .../src/parsers/flow/index.js                 |  4 +-
 .../src/parsers/flow/modules/index.js         | 75 ++++++++-----------
 2 files changed, 36 insertions(+), 43 deletions(-)

diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index c728418bde5a34..5058a155bdc3d0 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -25,8 +25,10 @@ const {processModule} = require('./modules');
  * declaration type. Unfortunately, we don't have those types, because flow-parser
  * generates them, and flow-parser is not type-safe. In the future, we should find
  * a way to get these types from our flow parser library.
+ *
+ * TODO(T71778680): Flow type AST Nodes
  */
-type TypeDeclarations = {|[declarationName: string]: $FlowFixMe|};
+export type TypeDeclarations = {|[declarationName: string]: $FlowFixMe|};
 
 function getTypes(ast): TypeDeclarations {
   return ast.body.reduce((types, node) => {
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index d8f5e7d4cda476..8f9e81a9d0bec1 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -14,57 +14,48 @@ import type {NativeModuleShape} from '../../../CodegenSchema';
 const {getAliases} = require('./aliases');
 const {getMethods} = require('./methods');
 
-function getModuleProperties(types, interfaceName) {
-  if (types[interfaceName] && types[interfaceName].body) {
-    return types[interfaceName].body.properties;
-  }
-  throw new Error(
-    `Interface properties for "${interfaceName}" has been specified incorrectly.`,
+import type {TypeDeclarations} from '../index';
+
+// TODO(T71778680): Flow type AST Nodes
+function getModuleProperties(
+  types: TypeDeclarations,
+): $ReadOnlyArray<$FlowFixMe> {
+  const declaredModuleNames: Array<string> = Object.keys(types).filter(
+    (typeName: string) => {
+      const declaration = types[typeName];
+      return (
+        declaration.type === 'InterfaceDeclaration' &&
+        declaration.extends.length === 1 &&
+        declaration.extends[0].type === 'InterfaceExtends' &&
+        declaration.extends[0].id.name === 'TurboModule'
+      );
+    },
   );
-}
 
-function findInterfaceName(types) {
-  return Object.keys(types)
-    .map(typeName => types[typeName])
-    .filter(
-      type =>
-        type.extends &&
-        type.extends[0] &&
-        type.extends[0].id.name === 'TurboModule',
-    )[0].id.name;
+  return types[declaredModuleNames[0]].body.properties;
 }
 
-function findAliasNames(types) {
+// TODO(T71778680): Flow type AST Nodes
+function getModuleAliases(
+  types: TypeDeclarations,
+  aliasNames,
+): $ReadOnlyArray<{[aliasName: string]: $FlowFixMe}> {
   return Object.keys(types)
-    .map(typeName => types[typeName])
-    .filter(
-      type =>
-        type.type &&
-        type.type === 'TypeAlias' &&
-        type.right &&
-        type.right.type === 'ObjectTypeAnnotation',
-    )
-    .map(type => type.id.name);
-}
-
-function getModuleAliases(types, aliasNames) {
-  return aliasNames.map(aliasName => {
-    if (types[aliasName] && types[aliasName].right) {
-      return {[aliasName]: types[aliasName].right};
-    }
-    throw new Error(
-      `Interface properties for "${aliasName}" has been specified incorrectly.`,
-    );
-  });
+    .filter((typeName: string) => {
+      const declaration = types[typeName];
+      return (
+        declaration.type === 'TypeAlias' &&
+        declaration.right.type === 'ObjectTypeAnnotation'
+      );
+    })
+    .map(aliasName => ({[aliasName]: types[aliasName].right}));
 }
 
-function processModule(types: $FlowFixMe): NativeModuleShape {
-  const interfaceName = findInterfaceName(types);
-  const moduleProperties = getModuleProperties(types, interfaceName);
+function processModule(types: TypeDeclarations): NativeModuleShape {
+  const moduleProperties = getModuleProperties(types);
   const properties = getMethods(moduleProperties, types);
 
-  const aliasNames = findAliasNames(types);
-  const moduleAliases = getModuleAliases(types, aliasNames);
+  const moduleAliases = getModuleAliases(types);
   const aliases = getAliases(moduleAliases, types);
 
   return {aliases, properties};

From 747f493febfb8e6ea6e1e5ada6406ca4b3931519 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 112/241] Colocate alias/method generation logic

Summary:
## Changes
- Generating the aliases was split over `parsers/flow/modules/index.js`, and `parsers/flow/modules/aliases.js`. I moved everything to the latter file.
- Generating methods was split over `parsers/flow/modules/index.js` and `parsers/flow/modules/methods.js`. I moved everything to the latter file.
- More type-safety

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23143382

fbshipit-source-id: e11b76bee7917a7db37ae7f1af64da5f046c5d1e
---
 .../react-native-codegen/src/CodegenSchema.js |  8 +-
 .../src/parsers/flow/components/commands.js   |  6 +-
 .../src/parsers/flow/components/extends.js    |  8 +-
 .../src/parsers/flow/components/props.js      | 13 ++--
 .../src/parsers/flow/index.js                 | 16 +---
 .../src/parsers/flow/modules/aliases.js       | 75 +++++++------------
 .../src/parsers/flow/modules/index.js         | 47 +-----------
 .../src/parsers/flow/modules/methods.js       | 32 ++++++--
 .../src/parsers/flow/modules/properties.js    |  6 +-
 .../src/parsers/flow/utils.js                 | 13 +++-
 10 files changed, 94 insertions(+), 130 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index f827018f020103..36e08a6bb6eb58 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -261,10 +261,16 @@ export type SchemaType = $ReadOnly<{|
  */
 export type NativeModuleShape = $ReadOnly<{|
   // We only support aliases to Objects
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
+  aliases: NativeModuleAliasMap,
   properties: $ReadOnlyArray<NativeModuleMethodTypeShape>,
 |}>;
 
+export type NativeModuleAliasMap = $ReadOnly<{
+  [aliasName: string]: NativeModuleAlias,
+}>;
+
+export type NativeModuleAlias = ObjectTypeAliasTypeShape;
+
 export type ObjectTypeAliasTypeShape = $ReadOnly<{|
   type: 'ObjectTypeAnnotation',
   properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
diff --git a/packages/react-native-codegen/src/parsers/flow/components/commands.js b/packages/react-native-codegen/src/parsers/flow/components/commands.js
index 769039be7a074d..92aef0a2ad0b18 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/commands.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/commands.js
@@ -11,13 +11,13 @@
 'use strict';
 
 import type {CommandTypeShape} from '../../../CodegenSchema.js';
-import type {TypeMap} from '../utils.js';
+import type {TypeDeclarationMap} from '../utils.js';
 
 const {getValueFromTypes} = require('../utils.js');
 
 type EventTypeAST = Object;
 
-function buildCommandSchema(property, types: TypeMap) {
+function buildCommandSchema(property, types: TypeDeclarationMap) {
   const name = property.key.name;
   const optional = property.optional;
   const value = getValueFromTypes(property.value, types);
@@ -98,7 +98,7 @@ function buildCommandSchema(property, types: TypeMap) {
 
 function getCommands(
   commandTypeAST: $ReadOnlyArray<EventTypeAST>,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): $ReadOnlyArray<CommandTypeShape> {
   return commandTypeAST
     .filter(property => property.type === 'ObjectTypeProperty')
diff --git a/packages/react-native-codegen/src/parsers/flow/components/extends.js b/packages/react-native-codegen/src/parsers/flow/components/extends.js
index 77081974a30a69..7d5e899b80828b 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/extends.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/extends.js
@@ -11,9 +11,9 @@
 'use strict';
 
 import type {ExtendsPropsShape} from '../../../CodegenSchema.js';
-import type {TypeMap} from '../utils.js';
+import type {TypeDeclarationMap} from '../utils.js';
 
-function extendsForProp(prop: PropsAST, types: TypeMap) {
+function extendsForProp(prop: PropsAST, types: TypeDeclarationMap) {
   if (!prop.argument) {
     console.log('null', prop);
   }
@@ -38,7 +38,7 @@ function extendsForProp(prop: PropsAST, types: TypeMap) {
 
 function removeKnownExtends(
   typeDefinition: $ReadOnlyArray<PropsAST>,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): $ReadOnlyArray<PropsAST> {
   return typeDefinition.filter(
     prop =>
@@ -52,7 +52,7 @@ type PropsAST = Object;
 
 function getExtendsProps(
   typeDefinition: $ReadOnlyArray<PropsAST>,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): $ReadOnlyArray<ExtendsPropsShape> {
   return typeDefinition
     .filter(prop => prop.type === 'ObjectTypeSpreadProperty')
diff --git a/packages/react-native-codegen/src/parsers/flow/components/props.js b/packages/react-native-codegen/src/parsers/flow/components/props.js
index 9b549ac2337acd..50e887bcd93b9e 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/props.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/props.js
@@ -13,9 +13,12 @@
 const {getValueFromTypes} = require('../utils.js');
 
 import type {PropTypeShape} from '../../../CodegenSchema.js';
-import type {TypeMap} from '../utils.js';
+import type {TypeDeclarationMap} from '../utils.js';
 
-function getPropProperties(propsTypeName: string, types: TypeMap): $FlowFixMe {
+function getPropProperties(
+  propsTypeName: string,
+  types: TypeDeclarationMap,
+): $FlowFixMe {
   const typeAlias = types[propsTypeName];
   try {
     return typeAlias.right.typeParameters.params[0].properties;
@@ -321,7 +324,7 @@ function getTypeAnnotation(
   }
 }
 
-function buildPropSchema(property, types: TypeMap): ?PropTypeShape {
+function buildPropSchema(property, types: TypeDeclarationMap): ?PropTypeShape {
   const name = property.key.name;
 
   const value = getValueFromTypes(property.value, types);
@@ -426,7 +429,7 @@ function verifyPropNotAlreadyDefined(
 
 function flattenProperties(
   typeDefinition: $ReadOnlyArray<PropAST>,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ) {
   return typeDefinition
     .map(property => {
@@ -456,7 +459,7 @@ function flattenProperties(
 
 function getProps(
   typeDefinition: $ReadOnlyArray<PropAST>,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): $ReadOnlyArray<PropTypeShape> {
   return flattenProperties(typeDefinition, types)
     .map(property => buildPropSchema(property, types))
diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index 5058a155bdc3d0..9e8bdb2603ae4d 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -20,17 +20,9 @@ const {buildComponentSchema} = require('./components/schema');
 const {processComponent} = require('./components');
 const {processModule} = require('./modules');
 
-/**
- * This FlowFixMe is supposed to refer to an InterfaceDeclaration or TypeAlias
- * declaration type. Unfortunately, we don't have those types, because flow-parser
- * generates them, and flow-parser is not type-safe. In the future, we should find
- * a way to get these types from our flow parser library.
- *
- * TODO(T71778680): Flow type AST Nodes
- */
-export type TypeDeclarations = {|[declarationName: string]: $FlowFixMe|};
+import type {TypeDeclarationMap} from './utils';
 
-function getTypes(ast): TypeDeclarations {
+function getTypes(ast): TypeDeclarationMap {
   return ast.body.reduce((types, node) => {
     if (node.type === 'ExportNamedDeclaration' && node.exportKind === 'type') {
       if (
@@ -75,7 +67,7 @@ function isComponent(ast) {
   );
 }
 
-function isModule(types: TypeDeclarations) {
+function isModule(types: TypeDeclarationMap) {
   const declaredModuleNames: Array<string> = Object.keys(types).filter(
     (typeName: string) => {
       const declaration = types[typeName];
@@ -103,7 +95,7 @@ function isModule(types: TypeDeclarations) {
   return true;
 }
 
-function getConfigType(ast, types: TypeDeclarations): 'module' | 'component' {
+function getConfigType(ast, types: TypeDeclarationMap): 'module' | 'component' {
   const isConfigAComponent = isComponent(ast);
   const isConfigAModule = isModule(types);
 
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/aliases.js b/packages/react-native-codegen/src/parsers/flow/modules/aliases.js
index 7c55e4d9ff61a6..b21326d8e51110 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/aliases.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/aliases.js
@@ -10,59 +10,36 @@
 
 'use strict';
 
-import type {ObjectTypeAliasTypeShape} from '../../../CodegenSchema.js';
-
-import type {TypeMap} from '../utils.js';
+import type {NativeModuleAliasMap} from '../../../CodegenSchema.js';
+import type {TypeDeclarationMap} from '../utils';
 
 const {getObjectProperties} = require('./properties');
 
-// $FlowFixMe there's no flowtype for ASTs
-type MethodAST = Object;
-
-function getAliases(
-  typeDefinition: $ReadOnlyArray<MethodAST>,
-  types: TypeMap,
-): $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}> {
-  const aliases = {};
-  typeDefinition.map(moduleAlias => {
-    const aliasName = Object.keys(moduleAlias)[0];
-    const typeAnnotation = moduleAlias[Object.keys(moduleAlias)[0]];
-
-    switch (typeAnnotation.type) {
-      case 'ObjectTypeAnnotation':
-        aliases[aliasName] = {
+function getAliases(types: TypeDeclarationMap): NativeModuleAliasMap {
+  const typeNames: Array<string> = Object.keys(types);
+  return typeNames
+    .filter((typeName: string) => {
+      const declaration = types[typeName];
+      return (
+        declaration.type === 'TypeAlias' &&
+        declaration.right.type === 'ObjectTypeAnnotation'
+      );
+    })
+    .reduce((aliases: NativeModuleAliasMap, aliasName: string) => {
+      const alias = types[aliasName];
+      return {
+        ...aliases,
+        [aliasName]: {
           type: 'ObjectTypeAnnotation',
-          ...(typeAnnotation.properties && {
-            properties: getObjectProperties(
-              aliasName,
-              {properties: typeAnnotation.properties},
-              aliasName,
-              types,
-            ),
-          }),
-        };
-        return;
-      case 'GenericTypeAnnotation':
-        if (typeAnnotation.id.name && typeAnnotation.id.name !== '') {
-          aliases[aliasName] = {
-            type: 'TypeAliasTypeAnnotation',
-            name: typeAnnotation.id.name,
-          };
-          return;
-        } else {
-          throw new Error(
-            `Cannot use "${typeAnnotation.type}" type annotation for "${aliasName}": must specify a type alias name`,
-          );
-        }
-      default:
-        // TODO (T65847278): Figure out why this does not work.
-        // (typeAnnotation.type: empty);
-        throw new Error(
-          `Unknown prop type, found "${typeAnnotation.type}" in "${aliasName}"`,
-        );
-    }
-  });
-  return aliases;
+          properties: getObjectProperties(
+            aliasName,
+            {properties: alias.right.properties},
+            aliasName,
+            types,
+          ),
+        },
+      };
+    }, ({}: NativeModuleAliasMap));
 }
 
 module.exports = {
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index 8f9e81a9d0bec1..1b52cb7da220d2 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -14,50 +14,11 @@ import type {NativeModuleShape} from '../../../CodegenSchema';
 const {getAliases} = require('./aliases');
 const {getMethods} = require('./methods');
 
-import type {TypeDeclarations} from '../index';
-
-// TODO(T71778680): Flow type AST Nodes
-function getModuleProperties(
-  types: TypeDeclarations,
-): $ReadOnlyArray<$FlowFixMe> {
-  const declaredModuleNames: Array<string> = Object.keys(types).filter(
-    (typeName: string) => {
-      const declaration = types[typeName];
-      return (
-        declaration.type === 'InterfaceDeclaration' &&
-        declaration.extends.length === 1 &&
-        declaration.extends[0].type === 'InterfaceExtends' &&
-        declaration.extends[0].id.name === 'TurboModule'
-      );
-    },
-  );
-
-  return types[declaredModuleNames[0]].body.properties;
-}
-
-// TODO(T71778680): Flow type AST Nodes
-function getModuleAliases(
-  types: TypeDeclarations,
-  aliasNames,
-): $ReadOnlyArray<{[aliasName: string]: $FlowFixMe}> {
-  return Object.keys(types)
-    .filter((typeName: string) => {
-      const declaration = types[typeName];
-      return (
-        declaration.type === 'TypeAlias' &&
-        declaration.right.type === 'ObjectTypeAnnotation'
-      );
-    })
-    .map(aliasName => ({[aliasName]: types[aliasName].right}));
-}
-
-function processModule(types: TypeDeclarations): NativeModuleShape {
-  const moduleProperties = getModuleProperties(types);
-  const properties = getMethods(moduleProperties, types);
-
-  const moduleAliases = getModuleAliases(types);
-  const aliases = getAliases(moduleAliases, types);
+import type {TypeDeclarationMap} from '../utils';
 
+function processModule(types: TypeDeclarationMap): NativeModuleShape {
+  const properties = getMethods(types);
+  const aliases = getAliases(types);
   return {aliases, properties};
 }
 
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/methods.js b/packages/react-native-codegen/src/parsers/flow/modules/methods.js
index 2445b5d38e551d..17764051194e23 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/methods.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/methods.js
@@ -16,12 +16,13 @@ import type {
   FunctionTypeAnnotationReturn,
 } from '../../../CodegenSchema.js';
 
-import type {ASTNode, TypeMap} from '../utils.js';
+import type {ASTNode, TypeDeclarationMap} from '../utils.js';
 const {getValueFromTypes} = require('../utils.js');
 const {
   getElementTypeForArrayOrObject,
   getObjectProperties,
 } = require('./properties');
+const invariant = require('invariant');
 
 // $FlowFixMe there's no flowtype for ASTs
 type MethodAST = Object;
@@ -29,7 +30,7 @@ type MethodAST = Object;
 function getTypeAnnotationForParam(
   name: string,
   paramAnnotation: ASTNode,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): FunctionTypeAnnotationParam {
   let param = paramAnnotation;
   if (param.name === null) {
@@ -188,7 +189,7 @@ function getTypeAnnotationForParam(
 function getReturnTypeAnnotation(
   methodName: string,
   returnType,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): FunctionTypeAnnotationReturn {
   let typeAnnotation = getValueFromTypes(returnType, types);
   let nullable = false;
@@ -315,7 +316,7 @@ function getReturnTypeAnnotation(
 
 function buildMethodSchema(
   property: MethodAST,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): NativeModuleMethodTypeShape {
   const name: string = property.key.name;
   const value = getValueFromTypes(property.value, types);
@@ -345,10 +346,27 @@ function buildMethodSchema(
 }
 
 function getMethods(
-  typeDefinition: $ReadOnlyArray<MethodAST>,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): $ReadOnlyArray<NativeModuleMethodTypeShape> {
-  return typeDefinition
+  const moduleInterfaceNames = Object.keys(types).filter((typeName: string) => {
+    const declaration = types[typeName];
+    return (
+      declaration.type === 'InterfaceDeclaration' &&
+      declaration.extends.length === 1 &&
+      declaration.extends[0].type === 'InterfaceExtends' &&
+      declaration.extends[0].id.name === 'TurboModule'
+    );
+  });
+
+  invariant(
+    moduleInterfaceNames.length === 1,
+    'There must be exactly one module declaration per file',
+  );
+
+  const [moduleInterfaceName] = moduleInterfaceNames;
+
+  const declaration = types[moduleInterfaceName];
+  return declaration.body.properties
     .filter(property => property.type === 'ObjectTypeProperty')
     .map(property => buildMethodSchema(property, types))
     .filter(Boolean);
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/properties.js b/packages/react-native-codegen/src/parsers/flow/modules/properties.js
index f1e8c51e7fe443..b1c1bbb11ed16c 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/properties.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/properties.js
@@ -16,14 +16,14 @@ import type {
   TypeAliasTypeAnnotation,
 } from '../../../CodegenSchema.js';
 
-import type {ASTNode, TypeMap} from '../utils.js';
+import type {ASTNode, TypeDeclarationMap} from '../utils.js';
 const {getValueFromTypes} = require('../utils.js');
 
 function getObjectProperties(
   name: string,
   objectParam: ASTNode,
   paramName: string,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ): $ReadOnlyArray<ObjectParamTypeAnnotation> {
   return objectParam.properties.map(objectTypeProperty => {
     let optional = objectTypeProperty.optional;
@@ -53,7 +53,7 @@ function getElementTypeForArrayOrObject(
   name: string,
   arrayParam: ASTNode,
   paramName: string,
-  types: TypeMap,
+  types: TypeDeclarationMap,
 ):
   | FunctionTypeAnnotationParamTypeAnnotation
   | TypeAliasTypeAnnotation
diff --git a/packages/react-native-codegen/src/parsers/flow/utils.js b/packages/react-native-codegen/src/parsers/flow/utils.js
index 663b6b90bb941a..7e1e57f2989c7f 100644
--- a/packages/react-native-codegen/src/parsers/flow/utils.js
+++ b/packages/react-native-codegen/src/parsers/flow/utils.js
@@ -10,13 +10,20 @@
 
 'use strict';
 
-// $FlowFixMe there's no flowtype for ASTs
-export type TypeMap = $ReadOnly<{|[name: string]: Object|}>;
+/**
+ * This FlowFixMe is supposed to refer to an InterfaceDeclaration or TypeAlias
+ * declaration type. Unfortunately, we don't have those types, because flow-parser
+ * generates them, and flow-parser is not type-safe. In the future, we should find
+ * a way to get these types from our flow parser library.
+ *
+ * TODO(T71778680): Flow type AST Nodes
+ */
+export type TypeDeclarationMap = {|[declarationName: string]: $FlowFixMe|};
 
 // $FlowFixMe there's no flowtype for ASTs
 export type ASTNode = Object;
 
-function getValueFromTypes(value: ASTNode, types: TypeMap): ASTNode {
+function getValueFromTypes(value: ASTNode, types: TypeDeclarationMap): ASTNode {
   if (value.type === 'GenericTypeAnnotation' && types[value.id.name]) {
     return getValueFromTypes(types[value.id.name].right, types);
   }

From f9ea52574ebec71e2c39bf486b979c243512486b Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 113/241] Cleanup buildMethodSchema and introduce nullable
 methods

Summary:
## Changes
- Started doing cleanup under `/parsers/flow/modules/methods.js`
- Rename `NativeModuleMethodTypeShape` -> `NativeModulePropertyShape`
- Moved optional property from `FunctionTypeAnnotation` to the `NativeModulePropertyShape`
- Introduced a nullable property inside what was once `FunctionTypeAnnotation`.

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23146050

fbshipit-source-id: 2fe97bb9c0736242682133e4923131a54bbea54b
---
 .../react-native-codegen/src/CodegenSchema.js | 17 ++--
 .../modules/GenerateModuleJavaSpec.js         |  4 +-
 .../modules/__test_fixtures__/fixtures.js     | 96 ++++++++++++-------
 .../__snapshots__/module-parser-test.js.snap  | 93 ++++++++++++------
 .../src/parsers/flow/modules/methods.js       | 41 +++++---
 5 files changed, 165 insertions(+), 86 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 36e08a6bb6eb58..0e2a5ec60dca4a 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -262,7 +262,7 @@ export type SchemaType = $ReadOnly<{|
 export type NativeModuleShape = $ReadOnly<{|
   // We only support aliases to Objects
   aliases: NativeModuleAliasMap,
-  properties: $ReadOnlyArray<NativeModuleMethodTypeShape>,
+  properties: $ReadOnlyArray<NativeModulePropertyShape>,
 |}>;
 
 export type NativeModuleAliasMap = $ReadOnly<{
@@ -276,16 +276,15 @@ export type ObjectTypeAliasTypeShape = $ReadOnly<{|
   properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
 |}>;
 
-export type NativeModuleMethodTypeShape = $ReadOnly<{|
+export type NativeModulePropertyShape = $ReadOnly<{|
   name: string,
-  typeAnnotation: FunctionTypeAnnotation,
-|}>;
-
-export type FunctionTypeAnnotation = $ReadOnly<{|
-  type: 'FunctionTypeAnnotation',
-  params: $ReadOnlyArray<FunctionTypeAnnotationParam>,
-  returnTypeAnnotation: FunctionTypeAnnotationReturn,
   optional: boolean,
+  typeAnnotation: $ReadOnly<{|
+    type: 'FunctionTypeAnnotation',
+    params: $ReadOnlyArray<FunctionTypeAnnotationParam>,
+    returnTypeAnnotation: FunctionTypeAnnotationReturn,
+    nullable: boolean,
+  |}>,
 |}>;
 
 export type FunctionTypeAnnotationReturn =
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
index 5054146e4ffc56..43937022e4f52c 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
@@ -13,7 +13,7 @@
 import type {
   FunctionTypeAnnotationParam,
   FunctionTypeAnnotationReturn,
-  NativeModuleMethodTypeShape,
+  NativeModulePropertyShape,
   ObjectTypeAliasTypeShape,
   SchemaType,
 } from '../../CodegenSchema';
@@ -156,7 +156,7 @@ function translateFunctionReturnTypeToJavaType(
 
 // Build special-cased runtime check for getConstants().
 function buildGetConstantsMethod(
-  method: NativeModuleMethodTypeShape,
+  method: NativeModulePropertyShape,
   imports: Set<string>,
 ): string {
   if (
diff --git a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
index cea663c8b1b425..1c5a3b9127da42 100644
--- a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
@@ -34,6 +34,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
           properties: [
             {
               name: 'getConstants',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -64,11 +65,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                   ],
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'voidFunc',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -76,11 +78,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getBool',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -96,11 +99,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getNumber',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -116,11 +120,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getString',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -136,11 +141,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getArray',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -162,11 +168,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getObject',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -182,11 +189,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getRootTag',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -204,11 +212,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getValue',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -238,11 +247,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getValueWithCallback',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -258,11 +268,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getValueWithPromise',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -278,7 +289,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -297,6 +308,7 @@ const TWO_MODULES_SAME_FILE: SchemaType = {
           properties: [
             {
               name: 'voidFunc',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -304,7 +316,7 @@ const TWO_MODULES_SAME_FILE: SchemaType = {
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -314,6 +326,7 @@ const TWO_MODULES_SAME_FILE: SchemaType = {
           properties: [
             {
               name: 'voidFunc',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -321,7 +334,7 @@ const TWO_MODULES_SAME_FILE: SchemaType = {
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -340,6 +353,7 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
           properties: [
             {
               name: 'voidFunc',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -347,7 +361,7 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -361,6 +375,7 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
           properties: [
             {
               name: 'getConstants',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -369,11 +384,12 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
                   properties: [],
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'voidFunc',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -381,7 +397,7 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -400,6 +416,7 @@ const COMPLEX_OBJECTS: SchemaType = {
           properties: [
             {
               name: 'difficult',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -491,11 +508,12 @@ const COMPLEX_OBJECTS: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'optionals',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -567,11 +585,12 @@ const COMPLEX_OBJECTS: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'optionalMethod',
+              optional: true,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -617,11 +636,12 @@ const COMPLEX_OBJECTS: SchemaType = {
                     },
                   },
                 ],
-                optional: true,
+                nullable: true,
               },
             },
             {
               name: 'getArrays',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -698,7 +718,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -806,6 +826,7 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
           properties: [
             {
               name: 'getConstants',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -814,11 +835,12 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   properties: [],
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'cropImage',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -835,7 +857,7 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -1092,6 +1114,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
           properties: [
             {
               name: 'getConstants',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1100,11 +1123,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   properties: [],
                 },
                 params: [],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'getPhotos',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1121,11 +1145,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'saveToCameraRoll',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1148,11 +1173,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'deletePhotos',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1171,7 +1197,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -1185,6 +1211,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
           properties: [
             {
               name: 'openCameraDialog',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1230,7 +1257,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
           ],
@@ -1350,6 +1377,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
           properties: [
             {
               name: 'reportFatalException',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1383,11 +1411,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'reportSoftException',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1421,11 +1450,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'reportException',
+              optional: true,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1442,11 +1472,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: true,
+                nullable: true,
               },
             },
             {
               name: 'updateExceptionMessage',
+              optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1480,11 +1511,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     },
                   },
                 ],
-                optional: false,
+                nullable: false,
               },
             },
             {
               name: 'dismissRedbox',
+              optional: true,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
@@ -1492,7 +1524,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                optional: true,
+                nullable: true,
               },
             },
           ],
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
index 1fcaee4231a81e..54ae74f6566db6 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
@@ -75,8 +75,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getNumber",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -95,8 +96,9 @@ Object {
             },
             Object {
               "name": "getVoid",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
@@ -107,8 +109,9 @@ Object {
             },
             Object {
               "name": "getArray",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "a",
@@ -139,8 +142,9 @@ Object {
             },
             Object {
               "name": "getStringFromAlias",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "a",
@@ -176,8 +180,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getArray",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -218,8 +223,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getArray",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -256,8 +262,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getArray",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -282,8 +289,9 @@ Object {
             },
             Object {
               "name": "getArray",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -324,8 +332,9 @@ Object {
           "properties": Array [
             Object {
               "name": "passBool",
+              "optional": true,
               "typeAnnotation": Object {
-                "optional": true,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -344,8 +353,9 @@ Object {
             },
             Object {
               "name": "passNumber",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -364,8 +374,9 @@ Object {
             },
             Object {
               "name": "passString",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -384,8 +395,9 @@ Object {
             },
             Object {
               "name": "passStringish",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -420,8 +432,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getValueWithCallback",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "callback",
@@ -456,8 +469,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getArray",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -516,8 +530,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getObject",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -572,8 +587,9 @@ Object {
             },
             Object {
               "name": "getReadOnlyObject",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -628,8 +644,9 @@ Object {
             },
             Object {
               "name": "getObject2",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -657,8 +674,9 @@ Object {
             },
             Object {
               "name": "getObjectInArray",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -732,8 +750,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getConstants",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
@@ -834,8 +853,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getInt",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -854,8 +874,9 @@ Object {
             },
             Object {
               "name": "getFloat",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -924,8 +945,9 @@ Object {
           "properties": Array [
             Object {
               "name": "foo1",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "x",
@@ -946,8 +968,9 @@ Object {
             },
             Object {
               "name": "foo2",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "x",
@@ -983,8 +1006,9 @@ Object {
           "properties": Array [
             Object {
               "name": "voidFunc",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "arg",
@@ -1032,8 +1056,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getConstants",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
@@ -1063,8 +1088,9 @@ Object {
             },
             Object {
               "name": "getConstants2",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
@@ -1123,8 +1149,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getValueWithPromise",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
@@ -1135,8 +1162,9 @@ Object {
             },
             Object {
               "name": "getValueWithPromiseDefinedSomewhereElse",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
@@ -1147,8 +1175,9 @@ Object {
             },
             Object {
               "name": "getValueWithPromiseObjDefinedSomewhereElse",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
@@ -1175,8 +1204,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getRootTag",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "rootTag",
@@ -1213,8 +1243,9 @@ Object {
           "properties": Array [
             Object {
               "name": "getObject",
+              "optional": false,
               "typeAnnotation": Object {
-                "optional": false,
+                "nullable": false,
                 "params": Array [
                   Object {
                     "name": "o",
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/methods.js b/packages/react-native-codegen/src/parsers/flow/modules/methods.js
index 17764051194e23..e3773c01215874 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/methods.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/methods.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import type {
-  NativeModuleMethodTypeShape,
+  NativeModulePropertyShape,
   FunctionTypeAnnotationParam,
   FunctionTypeAnnotationReturn,
 } from '../../../CodegenSchema.js';
@@ -24,9 +24,6 @@ const {
 } = require('./properties');
 const invariant = require('invariant');
 
-// $FlowFixMe there's no flowtype for ASTs
-type MethodAST = Object;
-
 function getTypeAnnotationForParam(
   name: string,
   paramAnnotation: ASTNode,
@@ -315,16 +312,35 @@ function getReturnTypeAnnotation(
 }
 
 function buildMethodSchema(
-  property: MethodAST,
+  // TODO(T71778680): This is an ObjectTypeProperty containing either:
+  // - a FunctionTypeAnnotation or GenericTypeAnnotation
+  // - a NullableTypeAnnoation containing a FunctionTypeAnnotation or GenericTypeAnnotation
+  // Flow type this node
+  property: $FlowFixMe,
   types: TypeDeclarationMap,
-): NativeModuleMethodTypeShape {
-  const name: string = property.key.name;
-  const value = getValueFromTypes(property.value, types);
+): NativeModulePropertyShape {
+  let nullable = false;
+  let {key, value} = property;
+
+  // Unwrap Nullable types
+  if (value.type === 'NullableTypeAnnotation') {
+    nullable = true;
+    value = value.typeAnnotation;
+  }
+
+  const name: string = key.name;
+
+  // Resolve type aliases
+  if (value.type === 'GenericTypeAnnotation') {
+    value = getValueFromTypes(value, types);
+  }
+
   if (value.type !== 'FunctionTypeAnnotation') {
     throw new Error(
       `Only methods are supported as module properties. Found ${value.type} in ${property.key.name}`,
     );
   }
+
   const params = value.params.map(param =>
     getTypeAnnotationForParam(name, param, types),
   );
@@ -334,20 +350,22 @@ function buildMethodSchema(
     value.returnType,
     types,
   );
+
   return {
     name,
+    optional: property.optional,
     typeAnnotation: {
       type: 'FunctionTypeAnnotation',
       returnTypeAnnotation,
       params,
-      optional: property.optional,
+      nullable,
     },
   };
 }
 
 function getMethods(
   types: TypeDeclarationMap,
-): $ReadOnlyArray<NativeModuleMethodTypeShape> {
+): $ReadOnlyArray<NativeModulePropertyShape> {
   const moduleInterfaceNames = Object.keys(types).filter((typeName: string) => {
     const declaration = types[typeName];
     return (
@@ -368,8 +386,7 @@ function getMethods(
   const declaration = types[moduleInterfaceName];
   return declaration.body.properties
     .filter(property => property.type === 'ObjectTypeProperty')
-    .map(property => buildMethodSchema(property, types))
-    .filter(Boolean);
+    .map(property => buildMethodSchema(property, types));
 }
 
 module.exports = {

From 2d19037041defb765a80bc417215229ff120ba3a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 114/241] Rewrite Flow module parser

Summary:
This diff:
1. Simplifies the NativeModule schema Flow types.
2. Simplifies the NativeModule Flow parser, to accomodate the modified schema, and to reduce code duplication.

**Notes:**
- If the parser detects an unrecognized type within the context of parsing an Array's element type, it'll omit the `elementType` property of the `ArrayTypeAnnotation`. Details: T72031674. **Rationale:** Basically, when an array element type is supported, we use it in our generators. When it's unsupported, we ignore it. In the unsupported case, there's no point in trying to parse the Array element type, which is why I decided to omit the `elementType` property. Ideally, our NativeModule specs would never use unsupported types, in any context. This would allow us to always parse and use the elementType. However, that seems like a it could be a hefty migration: we have > 400 specs. Since, this isn't a battle we need to fight right now, I left a TODO at the relevant lines instead.
- The legacy codegen would generate structs for each object literal type in the file. In this re-implementation of the parser, I only insert into the aliases array when we detect a usage of a type-alias to an ObjectLiteral type annotation. With this decision, we won't be able to generate these unnecessary structs. This is good because we get rid of dead code. It's bad because it might make our migration to this codegen bit more difficult.

[WARNING] This diff produces flow failures that will be addressed in subsequent diffs.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23201387

fbshipit-source-id: 55ce0df925a8bae0e7d5bb2a9b63167607eba461
---
 .../NativeOptionalObjectTurboModule.js        |   1 -
 .../react-native-codegen/src/CodegenSchema.js | 160 ++++---
 .../src/parsers/flow/components/index.js      |   4 +-
 .../src/parsers/flow/components/schema.js     |   4 +-
 .../src/parsers/flow/index.js                 |  12 +-
 .../modules/__test_fixtures__/fixtures.js     |   3 +-
 .../__snapshots__/module-parser-test.js.snap  | 189 ++++++--
 .../src/parsers/flow/modules/aliases.js       |  47 --
 .../src/parsers/flow/modules/errors.js        | 112 +++++
 .../src/parsers/flow/modules/index.js         | 415 +++++++++++++++++-
 .../src/parsers/flow/modules/methods.js       | 394 -----------------
 .../src/parsers/flow/modules/properties.js    | 159 -------
 .../src/parsers/flow/modules/schema.js        |   8 +-
 .../src/parsers/flow/utils.js                 |  42 ++
 14 files changed, 797 insertions(+), 753 deletions(-)
 delete mode 100644 packages/react-native-codegen/src/parsers/flow/modules/aliases.js
 create mode 100644 packages/react-native-codegen/src/parsers/flow/modules/errors.js
 delete mode 100644 packages/react-native-codegen/src/parsers/flow/modules/methods.js
 delete mode 100644 packages/react-native-codegen/src/parsers/flow/modules/properties.js

diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js
index b697ab954dd573..02784457c3bdfb 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeOptionalObjectTurboModule.js
@@ -17,7 +17,6 @@ export interface Spec extends TurboModule {
   +getConstants: () => {|
     D?: ?boolean,
     A?: Array<any>,
-    G?: any,
     E?: ?{|
       D?: ?boolean,
       E?: ?{|
diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 0e2a5ec60dca4a..425662967a2c6e 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -248,7 +248,7 @@ export type SchemaType = $ReadOnly<{|
     [module: string]: $ReadOnly<{|
       components?: $ReadOnly<{[component: string]: ComponentShape, ...}>,
       nativeModules?: $ReadOnly<{
-        [nativeModule: string]: NativeModuleShape,
+        [nativeModule: string]: NativeModuleSchema,
         ...,
       }>,
     |}>,
@@ -259,121 +259,119 @@ export type SchemaType = $ReadOnly<{|
 /**
  * NativeModule Types
  */
-export type NativeModuleShape = $ReadOnly<{|
+export type NativeModuleSchema = $ReadOnly<{|
   // We only support aliases to Objects
-  aliases: NativeModuleAliasMap,
-  properties: $ReadOnlyArray<NativeModulePropertyShape>,
+  aliases: $ReadOnly<NativeModuleAliasMap>,
+  properties: $ReadOnlyArray<NativeModulePropertySchema>,
 |}>;
 
-export type NativeModuleAliasMap = $ReadOnly<{
-  [aliasName: string]: NativeModuleAlias,
-}>;
+export type NativeModuleAliasMap = {
+  [aliasName: string]: NativeModuleObjectTypeAnnotation,
+};
 
-export type NativeModuleAlias = ObjectTypeAliasTypeShape;
-
-export type ObjectTypeAliasTypeShape = $ReadOnly<{|
-  type: 'ObjectTypeAnnotation',
-  properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
+export type NativeModulePropertySchema = $ReadOnly<{|
+  name: string,
+  optional: boolean,
+  typeAnnotation: NativeModuleFunctionTypeAnnotation,
 |}>;
 
-export type NativeModulePropertyShape = $ReadOnly<{|
+export type NativeModuleMethodParamSchema = $ReadOnly<{|
   name: string,
   optional: boolean,
-  typeAnnotation: $ReadOnly<{|
-    type: 'FunctionTypeAnnotation',
-    params: $ReadOnlyArray<FunctionTypeAnnotationParam>,
-    returnTypeAnnotation: FunctionTypeAnnotationReturn,
-    nullable: boolean,
-  |}>,
+  typeAnnotation: NativeModuleParamTypeAnnotation,
+|}>;
+
+export type NativeModuleFunctionTypeAnnotation = $ReadOnly<{|
+  type: 'FunctionTypeAnnotation',
+  params: $ReadOnlyArray<NativeModuleMethodParamSchema>,
+  returnTypeAnnotation: NativeModuleReturnTypeAnnotation,
+  nullable: boolean,
+|}>;
+
+export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
+  type: 'ObjectTypeAnnotation',
+  properties: $ReadOnlyArray<
+    $ReadOnly<{|
+      optional: boolean,
+      name: string,
+      typeAnnotation: NativeModuleParamTypeAnnotation,
+    |}>,
+  >,
+  nullable: boolean,
 |}>;
 
-export type FunctionTypeAnnotationReturn =
+export type NativeModuleBaseTypeAnnotation =
   | $ReadOnly<{|
+      type: 'StringTypeAnnotation',
       nullable: boolean,
-      type:
-        | 'GenericPromiseTypeAnnotation'
-        | 'VoidTypeAnnotation'
-        | PrimitiveTypeAnnotationType,
     |}>
   | $ReadOnly<{|
+      type: 'NumberTypeAnnotation',
       nullable: boolean,
-      type: 'ReservedFunctionValueTypeAnnotation',
-      name: ReservedFunctionValueTypeName,
     |}>
   | $ReadOnly<{|
+      type: 'Int32TypeAnnotation',
       nullable: boolean,
-      type: 'ArrayTypeAnnotation',
-      elementType: ?FunctionTypeAnnotationReturnArrayElementType,
     |}>
   | $ReadOnly<{|
+      type: 'DoubleTypeAnnotation',
       nullable: boolean,
-      type: 'ObjectTypeAnnotation',
-      properties: ?$ReadOnlyArray<ObjectParamTypeAnnotation>,
     |}>
   | $ReadOnly<{|
+      type: 'FloatTypeAnnotation',
       nullable: boolean,
-      type: 'TypeAliasTypeAnnotation',
-      name: string,
-    |}>;
-
-export type FunctionTypeAnnotationReturnArrayElementType =
-  | FunctionTypeAnnotationParamTypeAnnotation // TODO: What does FunctionTypeAnnotationParamTypeAnnotation have to do with function returns?
-  | TypeAliasTypeAnnotation;
-
-export type TypeAliasTypeAnnotation = $ReadOnly<{|
-  type: 'TypeAliasTypeAnnotation',
-  name: string,
-|}>;
-
-export type FunctionTypeAnnotationParam = $ReadOnly<{|
-  nullable: boolean,
-  name: string,
-  typeAnnotation:
-    | FunctionTypeAnnotationParamTypeAnnotation
-    | TypeAliasTypeAnnotation,
-|}>;
-
-export type FunctionTypeAnnotationParamTypeAnnotation =
+    |}>
+  | $ReadOnly<{|
+      type: 'BooleanTypeAnnotation',
+      nullable: boolean,
+    |}>
   | $ReadOnly<{|
-      type:
-        | 'AnyTypeAnnotation'
-        | 'FunctionTypeAnnotation'
-        | PrimitiveTypeAnnotationType,
+      type: 'GenericObjectTypeAnnotation',
+      nullable: boolean,
     |}>
   | $ReadOnly<{|
       type: 'ReservedFunctionValueTypeAnnotation',
       name: ReservedFunctionValueTypeName,
+      nullable: boolean,
     |}>
   | $ReadOnly<{|
       type: 'ArrayTypeAnnotation',
-      elementType:
-        | ?FunctionTypeAnnotationParamTypeAnnotation
-        | ?TypeAliasTypeAnnotation,
+      /**
+       * TODO(T72031674): Migrate all our NativeModule specs to not use
+       * invalid Array ElementTypes. Then, make the elementType required.
+       */
+      elementType?: NativeModuleBaseTypeAnnotation,
+      nullable: boolean,
     |}>
   | $ReadOnly<{|
-      type: 'ObjectTypeAnnotation',
-      properties: ?$ReadOnlyArray<ObjectParamTypeAnnotation>,
+      type: 'TypeAliasTypeAnnotation',
+      name: string,
+      nullable: boolean,
+    |}>
+  | NativeModuleObjectTypeAnnotation;
+
+export type NativeModuleParamOnlyTypeAnnotation = NativeModuleFunctionTypeAnnotation;
+export type NativeModuleReturnOnlyTypeAnnotation =
+  | $ReadOnly<{|
+      nullable: boolean,
+      type: 'GenericPromiseTypeAnnotation',
+    |}>
+  | $ReadOnly<{|
+      nullable: boolean,
+      type: 'VoidTypeAnnotation',
     |}>;
 
-export type PrimitiveTypeAnnotationType =
-  | 'StringTypeAnnotation'
-  | 'NumberTypeAnnotation'
-  | 'Int32TypeAnnotation'
-  | 'DoubleTypeAnnotation'
-  | 'FloatTypeAnnotation'
-  | 'BooleanTypeAnnotation'
-  | 'GenericObjectTypeAnnotation';
-
-export type PrimitiveTypeAnnotation = $ReadOnly<{|
-  type: PrimitiveTypeAnnotationType,
-|}>;
+export type NativeModuleParamTypeAnnotation =
+  | NativeModuleBaseTypeAnnotation
+  | NativeModuleParamOnlyTypeAnnotation;
 
-export type ReservedFunctionValueTypeName = 'RootTag'; // Union with more custom types.
+export type NativeModuleReturnTypeAnnotation =
+  | NativeModuleBaseTypeAnnotation
+  | NativeModuleReturnOnlyTypeAnnotation;
 
-export type ObjectParamTypeAnnotation = $ReadOnly<{|
-  optional: boolean,
-  name: string,
-  typeAnnotation?:
-    | FunctionTypeAnnotationParamTypeAnnotation
-    | TypeAliasTypeAnnotation, // TODO (T67898313): Workaround for NativeLinking's use of union type, typeAnnotations should not be optional
-|}>;
+export type NativeModuleTypeAnnotation =
+  | NativeModuleBaseTypeAnnotation
+  | NativeModuleParamOnlyTypeAnnotation
+  | NativeModuleReturnOnlyTypeAnnotation;
+
+export type ReservedFunctionValueTypeName = 'RootTag'; // Union with more custom types.
diff --git a/packages/react-native-codegen/src/parsers/flow/components/index.js b/packages/react-native-codegen/src/parsers/flow/components/index.js
index eb8867401d5372..f3b9f4770fb87b 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/index.js
@@ -167,7 +167,7 @@ function getCommandProperties(commandTypeName, types, commandOptions) {
 }
 
 // $FlowFixMe there's no flowtype for AST
-function processComponent(ast, types): ComponentSchemaBuilderConfig {
+function buildComponentSchema(ast, types): ComponentSchemaBuilderConfig {
   const {
     componentName,
     propsTypeName,
@@ -205,5 +205,5 @@ function processComponent(ast, types): ComponentSchemaBuilderConfig {
 }
 
 module.exports = {
-  processComponent,
+  buildComponentSchema,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/components/schema.js b/packages/react-native-codegen/src/parsers/flow/components/schema.js
index f55e77f162753a..c561f9e0b182fe 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/schema.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/schema.js
@@ -29,7 +29,7 @@ export type ComponentSchemaBuilderConfig = $ReadOnly<{|
   options?: ?OptionsShape,
 |}>;
 
-function buildComponentSchema({
+function wrapComponentSchema({
   filename,
   componentName,
   extendsProps,
@@ -56,5 +56,5 @@ function buildComponentSchema({
 }
 
 module.exports = {
-  buildComponentSchema,
+  wrapComponentSchema,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/index.js b/packages/react-native-codegen/src/parsers/flow/index.js
index 9e8bdb2603ae4d..6f0669f998de7e 100644
--- a/packages/react-native-codegen/src/parsers/flow/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/index.js
@@ -15,10 +15,10 @@ import type {SchemaType} from '../../CodegenSchema.js';
 const flowParser = require('flow-parser');
 const fs = require('fs');
 const path = require('path');
-const {buildModuleSchema} = require('./modules/schema');
-const {buildComponentSchema} = require('./components/schema');
-const {processComponent} = require('./components');
-const {processModule} = require('./modules');
+const {buildComponentSchema} = require('./components');
+const {wrapComponentSchema} = require('./components/schema');
+const {buildModuleSchema} = require('./modules');
+const {wrapModuleSchema} = require('./modules/schema');
 
 import type {TypeDeclarationMap} from './utils';
 
@@ -126,13 +126,13 @@ function buildSchema(contents: string, filename: ?string): SchemaType {
   const configType = getConfigType(ast, types);
 
   if (configType === 'component') {
-    return buildComponentSchema(processComponent(ast, types));
+    return wrapComponentSchema(buildComponentSchema(ast, types));
   } else {
     if (filename === undefined || filename === null) {
       throw new Error('Filepath expected while parasing a module');
     }
     const moduleName = path.basename(filename).slice(6, -3);
-    return buildModuleSchema(processModule(types), moduleName);
+    return wrapModuleSchema(buildModuleSchema(moduleName, types), moduleName);
   }
 }
 
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
index c362d7f2ec0f8d..7a9b29a3d868c9 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/fixtures.js
@@ -367,6 +367,7 @@ export interface Spec extends TurboModule {
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 
 `;
+
 const NATIVE_MODULE_WITH_ARRAY_WITH_UNION_AND_TOUPLE = `
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
@@ -434,7 +435,7 @@ import type {TurboModule} from '../RCTExport';
 import * as TurboModuleRegistry from '../TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
-  +getArray: (arg: Array<Array<Array<Array<Array<any>>>>>) => Array<Array<Array<string>>>;
+  +getArray: (arg: Array<Array<Array<Array<Array<string>>>>>) => Array<Array<Array<string>>>;
 }
 
 export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
index 54ae74f6566db6..96cbea8e38d1e2 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
@@ -1,16 +1,16 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT 1`] = `"Unsupported return type for getString: expected to find annotation for type of array contents"`;
+exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT 1`] = `"Module SampleTurboModule: Detected a type of Array, without type parameters."`;
 
-exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT_AS_PARAM 1`] = `"Unsupported type for getString, param: \\"arg\\": expected to find annotation for type of array contents"`;
+exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT_AS_PARAM 1`] = `"Module SampleTurboModule: Detected a type of Array, without type parameters."`;
 
 exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_NOT_ONLY_METHODS 1`] = `"Only methods are supported as module properties. Found BooleanTypeAnnotation in sampleBool"`;
 
-exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_PROMISE_WITHOUT_TYPE 1`] = `"Unsupported return promise type for getBool: expected to find annotation for type of promise content"`;
+exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_PROMISE_WITHOUT_TYPE 1`] = `"Module SampleTurboModule: Detected a type of Promise, without type parameters."`;
 
-exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_READ_ONLY_OBJECT_NO_TYPE_FOR_CONTENT 1`] = `"Unsupported param for method \\"getString\\", param \\"arg\\". No type specified for $ReadOnly"`;
+exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_READ_ONLY_OBJECT_NO_TYPE_FOR_CONTENT 1`] = `"Module SampleTurboModule: Detected a type of $ReadOnly, with 0 type parameters specified. Expected exactly 1."`;
 
-exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_UNNAMED_PARAMS 1`] = `"Unsupported type for getBool. Please provide a name for every parameter."`;
+exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_UNNAMED_PARAMS 1`] = `"Module SampleTurboModule: Detected a FunctionTypeAnnotation with an unnamed param. Please name all params."`;
 
 exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_EXTENDING_TURBO_MODULE 1`] = `"File contains declarations of more than one module: Spec, Spec2. Please declare exactly one module in this file."`;
 
@@ -39,11 +39,13 @@ Object {
         "SampleTurboModule": Object {
           "aliases": Object {
             "ObjectAlias": Object {
+              "nullable": false,
               "properties": Array [
                 Object {
                   "name": "x",
                   "optional": false,
                   "typeAnnotation": Object {
+                    "nullable": false,
                     "type": "NumberTypeAnnotation",
                   },
                 },
@@ -51,6 +53,7 @@ Object {
                   "name": "y",
                   "optional": false,
                   "typeAnnotation": Object {
+                    "nullable": false,
                     "type": "NumberTypeAnnotation",
                   },
                 },
@@ -58,6 +61,7 @@ Object {
                   "name": "label",
                   "optional": false,
                   "typeAnnotation": Object {
+                    "nullable": false,
                     "type": "StringTypeAnnotation",
                   },
                 },
@@ -65,6 +69,7 @@ Object {
                   "name": "truthy",
                   "optional": false,
                   "typeAnnotation": Object {
+                    "nullable": false,
                     "type": "BooleanTypeAnnotation",
                   },
                 },
@@ -81,8 +86,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "NumberTypeAnnotation",
                     },
                   },
@@ -115,11 +121,13 @@ Object {
                 "params": Array [
                   Object {
                     "name": "a",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "elementType": Object {
+                        "nullable": false,
                         "type": "NumberTypeAnnotation",
                       },
+                      "nullable": false,
                       "type": "ArrayTypeAnnotation",
                     },
                   },
@@ -131,6 +139,7 @@ Object {
                       "name": "a",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "type": "NumberTypeAnnotation",
                       },
                     },
@@ -148,9 +157,10 @@ Object {
                 "params": Array [
                   Object {
                     "name": "a",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "name": "ObjectAlias",
+                      "nullable": false,
                       "type": "TypeAliasTypeAnnotation",
                     },
                   },
@@ -186,17 +196,20 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "elementType": Object {
+                        "nullable": false,
                         "type": "StringTypeAnnotation",
                       },
+                      "nullable": false,
                       "type": "ArrayTypeAnnotation",
                     },
                   },
                 ],
                 "returnTypeAnnotation": Object {
                   "elementType": Object {
+                    "nullable": false,
                     "type": "StringTypeAnnotation",
                   },
                   "nullable": false,
@@ -229,15 +242,14 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
-                      "elementType": undefined,
+                      "nullable": false,
                       "type": "ArrayTypeAnnotation",
                     },
                   },
                 ],
                 "returnTypeAnnotation": Object {
-                  "elementType": undefined,
                   "nullable": false,
                   "type": "ArrayTypeAnnotation",
                 },
@@ -268,17 +280,20 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "elementType": Object {
+                        "nullable": false,
                         "type": "StringTypeAnnotation",
                       },
+                      "nullable": false,
                       "type": "ArrayTypeAnnotation",
                     },
                   },
                 ],
                 "returnTypeAnnotation": Object {
                   "elementType": Object {
+                    "nullable": false,
                     "type": "StringTypeAnnotation",
                   },
                   "nullable": false,
@@ -295,17 +310,20 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "elementType": Object {
+                        "nullable": false,
                         "type": "StringTypeAnnotation",
                       },
+                      "nullable": false,
                       "type": "ArrayTypeAnnotation",
                     },
                   },
                 ],
                 "returnTypeAnnotation": Object {
                   "elementType": Object {
+                    "nullable": false,
                     "type": "StringTypeAnnotation",
                   },
                   "nullable": false,
@@ -338,8 +356,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "BooleanTypeAnnotation",
                     },
                   },
@@ -359,8 +378,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "NumberTypeAnnotation",
                     },
                   },
@@ -380,8 +400,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "StringTypeAnnotation",
                     },
                   },
@@ -401,8 +422,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "StringTypeAnnotation",
                     },
                   },
@@ -438,8 +460,39 @@ Object {
                 "params": Array [
                   Object {
                     "name": "callback",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
+                      "params": Array [
+                        Object {
+                          "name": "value",
+                          "optional": false,
+                          "typeAnnotation": Object {
+                            "nullable": false,
+                            "type": "StringTypeAnnotation",
+                          },
+                        },
+                        Object {
+                          "name": "arr",
+                          "optional": false,
+                          "typeAnnotation": Object {
+                            "elementType": Object {
+                              "elementType": Object {
+                                "nullable": false,
+                                "type": "StringTypeAnnotation",
+                              },
+                              "nullable": false,
+                              "type": "ArrayTypeAnnotation",
+                            },
+                            "nullable": false,
+                            "type": "ArrayTypeAnnotation",
+                          },
+                        },
+                      ],
+                      "returnTypeAnnotation": Object {
+                        "nullable": false,
+                        "type": "VoidTypeAnnotation",
+                      },
                       "type": "FunctionTypeAnnotation",
                     },
                   },
@@ -475,23 +528,29 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "elementType": Object {
                         "elementType": Object {
                           "elementType": Object {
                             "elementType": Object {
                               "elementType": Object {
-                                "type": "AnyTypeAnnotation",
+                                "nullable": false,
+                                "type": "StringTypeAnnotation",
                               },
+                              "nullable": false,
                               "type": "ArrayTypeAnnotation",
                             },
+                            "nullable": false,
                             "type": "ArrayTypeAnnotation",
                           },
+                          "nullable": false,
                           "type": "ArrayTypeAnnotation",
                         },
+                        "nullable": false,
                         "type": "ArrayTypeAnnotation",
                       },
+                      "nullable": false,
                       "type": "ArrayTypeAnnotation",
                     },
                   },
@@ -500,10 +559,13 @@ Object {
                   "elementType": Object {
                     "elementType": Object {
                       "elementType": Object {
+                        "nullable": false,
                         "type": "StringTypeAnnotation",
                       },
+                      "nullable": false,
                       "type": "ArrayTypeAnnotation",
                     },
+                    "nullable": false,
                     "type": "ArrayTypeAnnotation",
                   },
                   "nullable": false,
@@ -536,18 +598,21 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "properties": Array [
                         Object {
                           "name": "const1",
                           "optional": false,
                           "typeAnnotation": Object {
+                            "nullable": false,
                             "properties": Array [
                               Object {
                                 "name": "const1",
                                 "optional": false,
                                 "typeAnnotation": Object {
+                                  "nullable": false,
                                   "type": "BooleanTypeAnnotation",
                                 },
                               },
@@ -567,11 +632,13 @@ Object {
                       "name": "const1",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "properties": Array [
                           Object {
                             "name": "const1",
                             "optional": false,
                             "typeAnnotation": Object {
+                              "nullable": false,
                               "type": "BooleanTypeAnnotation",
                             },
                           },
@@ -593,18 +660,21 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "properties": Array [
                         Object {
                           "name": "const1",
                           "optional": false,
                           "typeAnnotation": Object {
+                            "nullable": false,
                             "properties": Array [
                               Object {
                                 "name": "const1",
                                 "optional": false,
                                 "typeAnnotation": Object {
+                                  "nullable": false,
                                   "type": "BooleanTypeAnnotation",
                                 },
                               },
@@ -624,11 +694,13 @@ Object {
                       "name": "const1",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "properties": Array [
                           Object {
                             "name": "const1",
                             "optional": false,
                             "typeAnnotation": Object {
+                              "nullable": false,
                               "type": "BooleanTypeAnnotation",
                             },
                           },
@@ -650,13 +722,15 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "properties": Array [
                         Object {
                           "name": "a",
                           "optional": false,
                           "typeAnnotation": Object {
+                            "nullable": false,
                             "type": "StringTypeAnnotation",
                           },
                         },
@@ -680,18 +754,21 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "properties": Array [
                         Object {
                           "name": "const1",
                           "optional": false,
                           "typeAnnotation": Object {
+                            "nullable": false,
                             "properties": Array [
                               Object {
                                 "name": "const1",
                                 "optional": false,
                                 "typeAnnotation": Object {
+                                  "nullable": false,
                                   "type": "BooleanTypeAnnotation",
                                 },
                               },
@@ -706,16 +783,19 @@ Object {
                 ],
                 "returnTypeAnnotation": Object {
                   "elementType": Object {
+                    "nullable": false,
                     "properties": Array [
                       Object {
                         "name": "const1",
                         "optional": false,
                         "typeAnnotation": Object {
+                          "nullable": false,
                           "properties": Array [
                             Object {
                               "name": "const1",
                               "optional": false,
                               "typeAnnotation": Object {
+                                "nullable": false,
                                 "type": "BooleanTypeAnnotation",
                               },
                             },
@@ -761,6 +841,7 @@ Object {
                       "name": "isTesting",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "type": "BooleanTypeAnnotation",
                       },
                     },
@@ -768,11 +849,13 @@ Object {
                       "name": "reactNativeVersion",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "properties": Array [
                           Object {
                             "name": "major",
                             "optional": false,
                             "typeAnnotation": Object {
+                              "nullable": false,
                               "type": "NumberTypeAnnotation",
                             },
                           },
@@ -780,6 +863,7 @@ Object {
                             "name": "minor",
                             "optional": false,
                             "typeAnnotation": Object {
+                              "nullable": false,
                               "type": "NumberTypeAnnotation",
                             },
                           },
@@ -787,13 +871,15 @@ Object {
                             "name": "patch",
                             "optional": true,
                             "typeAnnotation": Object {
+                              "nullable": false,
                               "type": "NumberTypeAnnotation",
                             },
                           },
                           Object {
                             "name": "prerelease",
-                            "optional": true,
+                            "optional": false,
                             "typeAnnotation": Object {
+                              "nullable": true,
                               "type": "NumberTypeAnnotation",
                             },
                           },
@@ -805,6 +891,7 @@ Object {
                       "name": "forceTouchAvailable",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "type": "BooleanTypeAnnotation",
                       },
                     },
@@ -812,6 +899,7 @@ Object {
                       "name": "osVersion",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "type": "StringTypeAnnotation",
                       },
                     },
@@ -819,6 +907,7 @@ Object {
                       "name": "systemName",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "type": "StringTypeAnnotation",
                       },
                     },
@@ -826,6 +915,7 @@ Object {
                       "name": "interfaceIdiom",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "type": "StringTypeAnnotation",
                       },
                     },
@@ -859,8 +949,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "Int32TypeAnnotation",
                     },
                   },
@@ -880,8 +971,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "FloatTypeAnnotation",
                     },
                   },
@@ -909,11 +1001,13 @@ Object {
         "SampleTurboModule": Object {
           "aliases": Object {
             "Bar": Object {
+              "nullable": false,
               "properties": Array [
                 Object {
                   "name": "z",
                   "optional": false,
                   "typeAnnotation": Object {
+                    "nullable": false,
                     "type": "NumberTypeAnnotation",
                   },
                 },
@@ -921,12 +1015,14 @@ Object {
               "type": "ObjectTypeAnnotation",
             },
             "Foo": Object {
+              "nullable": false,
               "properties": Array [
                 Object {
                   "name": "bar1",
                   "optional": false,
                   "typeAnnotation": Object {
                     "name": "Bar",
+                    "nullable": false,
                     "type": "TypeAliasTypeAnnotation",
                   },
                 },
@@ -935,6 +1031,7 @@ Object {
                   "optional": false,
                   "typeAnnotation": Object {
                     "name": "Bar",
+                    "nullable": false,
                     "type": "TypeAliasTypeAnnotation",
                   },
                 },
@@ -951,9 +1048,10 @@ Object {
                 "params": Array [
                   Object {
                     "name": "x",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "name": "Foo",
+                      "nullable": false,
                       "type": "TypeAliasTypeAnnotation",
                     },
                   },
@@ -974,9 +1072,10 @@ Object {
                 "params": Array [
                   Object {
                     "name": "x",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "name": "Foo",
+                      "nullable": false,
                       "type": "TypeAliasTypeAnnotation",
                     },
                   },
@@ -1012,8 +1111,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "arg",
-                    "nullable": true,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": true,
                       "type": "StringTypeAnnotation",
                     },
                   },
@@ -1041,11 +1141,13 @@ Object {
         "SampleTurboModule": Object {
           "aliases": Object {
             "DisplayMetricsAndroid": Object {
+              "nullable": false,
               "properties": Array [
                 Object {
                   "name": "width",
                   "optional": false,
                   "typeAnnotation": Object {
+                    "nullable": false,
                     "type": "NumberTypeAnnotation",
                   },
                 },
@@ -1067,12 +1169,14 @@ Object {
                       "name": "Dimensions",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "properties": Array [
                           Object {
                             "name": "windowPhysicalPixels",
                             "optional": false,
                             "typeAnnotation": Object {
                               "name": "DisplayMetricsAndroid",
+                              "nullable": false,
                               "type": "TypeAliasTypeAnnotation",
                             },
                           },
@@ -1099,12 +1203,14 @@ Object {
                       "name": "Dimensions",
                       "optional": false,
                       "typeAnnotation": Object {
+                        "nullable": false,
                         "properties": Array [
                           Object {
                             "name": "windowPhysicalPixels",
                             "optional": false,
                             "typeAnnotation": Object {
                               "name": "DisplayMetricsAndroid",
+                              "nullable": false,
                               "type": "TypeAliasTypeAnnotation",
                             },
                           },
@@ -1132,20 +1238,7 @@ Object {
     "NativeSampleTurboModule": Object {
       "nativeModules": Object {
         "SampleTurboModule": Object {
-          "aliases": Object {
-            "SomeObj": Object {
-              "properties": Array [
-                Object {
-                  "name": "a",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "type": "StringTypeAnnotation",
-                  },
-                },
-              ],
-              "type": "ObjectTypeAnnotation",
-            },
-          },
+          "aliases": Object {},
           "properties": Array [
             Object {
               "name": "getValueWithPromise",
@@ -1210,9 +1303,10 @@ Object {
                 "params": Array [
                   Object {
                     "name": "rootTag",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
                       "name": "RootTag",
+                      "nullable": false,
                       "type": "ReservedFunctionValueTypeAnnotation",
                     },
                   },
@@ -1249,8 +1343,9 @@ Object {
                 "params": Array [
                   Object {
                     "name": "o",
-                    "nullable": false,
+                    "optional": false,
                     "typeAnnotation": Object {
+                      "nullable": false,
                       "type": "GenericObjectTypeAnnotation",
                     },
                   },
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/aliases.js b/packages/react-native-codegen/src/parsers/flow/modules/aliases.js
deleted file mode 100644
index b21326d8e51110..00000000000000
--- a/packages/react-native-codegen/src/parsers/flow/modules/aliases.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-import type {NativeModuleAliasMap} from '../../../CodegenSchema.js';
-import type {TypeDeclarationMap} from '../utils';
-
-const {getObjectProperties} = require('./properties');
-
-function getAliases(types: TypeDeclarationMap): NativeModuleAliasMap {
-  const typeNames: Array<string> = Object.keys(types);
-  return typeNames
-    .filter((typeName: string) => {
-      const declaration = types[typeName];
-      return (
-        declaration.type === 'TypeAlias' &&
-        declaration.right.type === 'ObjectTypeAnnotation'
-      );
-    })
-    .reduce((aliases: NativeModuleAliasMap, aliasName: string) => {
-      const alias = types[aliasName];
-      return {
-        ...aliases,
-        [aliasName]: {
-          type: 'ObjectTypeAnnotation',
-          properties: getObjectProperties(
-            aliasName,
-            {properties: alias.right.properties},
-            aliasName,
-            types,
-          ),
-        },
-      };
-    }, ({}: NativeModuleAliasMap));
-}
-
-module.exports = {
-  getAliases,
-};
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/errors.js b/packages/react-native-codegen/src/parsers/flow/modules/errors.js
new file mode 100644
index 00000000000000..537e4b1aedb78f
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/flow/modules/errors.js
@@ -0,0 +1,112 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+const invariant = require('invariant');
+
+class UnrecognizedFlowTypeAnnotationParserError extends Error {
+  +typeAnnotationType: string;
+  constructor(moduleName: string, typeAnnotationType: string) {
+    super(
+      `Module ${moduleName}: Detected unsupported type annotation of type '${typeAnnotationType}'`,
+    );
+
+    // assign the error class name in your custom error (as a shortcut)
+    this.name = this.constructor.name;
+
+    // capturing the stack trace keeps the reference to your error class
+    Error.captureStackTrace(this, this.constructor);
+    this.typeAnnotationType = typeAnnotationType;
+  }
+}
+
+class UnrecognizedFlowGenericParserError extends Error {
+  +genericName: string;
+  constructor(moduleName: string, genericName: string) {
+    super(
+      `Module ${moduleName}: Detected unsupported generic type '${genericName}'`,
+    );
+
+    // assign the error class name in your custom error (as a shortcut)
+    this.name = this.constructor.name;
+
+    // capturing the stack trace keeps the reference to your error class
+    Error.captureStackTrace(this, this.constructor);
+    this.genericName = genericName;
+  }
+}
+
+class FlowGenericNotTypeParameterizedParserError extends Error {
+  +genericName: string;
+  constructor(moduleName: string, genericName: string) {
+    super(
+      `Module ${moduleName}: Detected a type of ${genericName}, without type parameters.`,
+    );
+
+    // assign the error class name in your custom error (as a shortcut)
+    this.name = this.constructor.name;
+
+    // capturing the stack trace keeps the reference to your error class
+    Error.captureStackTrace(this, this.constructor);
+    this.genericName = genericName;
+  }
+}
+
+class FlowGenericTypeParameterCountMismatchParserError extends Error {
+  +genericName: string;
+  +numTypeParameters: number;
+
+  constructor(
+    moduleName: string,
+    genericName: string,
+    numTypeParameters: number,
+    expectedNumTypeParameters: number,
+  ) {
+    invariant(
+      numTypeParameters !== expectedNumTypeParameters,
+      `FlowGenericNotTypeParameterizedWithExactlyOneTypeParserError can only be created with numTypeParameters != ${expectedNumTypeParameters}`,
+    );
+
+    super(
+      `Module ${moduleName}: Detected a type of ${genericName}, with ${numTypeParameters} type parameters specified. Expected exactly ${expectedNumTypeParameters}.`,
+    );
+
+    // assign the error class name in your custom error (as a shortcut)
+    this.name = this.constructor.name;
+
+    // capturing the stack trace keeps the reference to your error class
+    Error.captureStackTrace(this, this.constructor);
+    this.genericName = genericName;
+    this.numTypeParameters = numTypeParameters;
+  }
+}
+
+class UnnamedFunctionTypeAnnotationParamError extends Error {
+  constructor(moduleName: string) {
+    super(
+      `Module ${moduleName}: Detected a FunctionTypeAnnotation with an unnamed param. Please name all params.`,
+    );
+
+    // assign the error class name in your custom error (as a shortcut)
+    this.name = this.constructor.name;
+
+    // capturing the stack trace keeps the reference to your error class
+    Error.captureStackTrace(this, this.constructor);
+  }
+}
+
+module.exports = {
+  FlowGenericNotTypeParameterizedParserError,
+  FlowGenericTypeParameterCountMismatchParserError,
+  UnrecognizedFlowTypeAnnotationParserError,
+  UnrecognizedFlowGenericParserError,
+  UnnamedFunctionTypeAnnotationParamError,
+};
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index 1b52cb7da220d2..98dc32c5abdba1 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -10,18 +10,415 @@
 
 'use strict';
 
-import type {NativeModuleShape} from '../../../CodegenSchema';
-const {getAliases} = require('./aliases');
-const {getMethods} = require('./methods');
+import type {
+  NativeModulePropertySchema,
+  NativeModuleMethodParamSchema,
+  NativeModuleAliasMap,
+  NativeModuleSchema,
+  NativeModuleFunctionTypeAnnotation,
+} from '../../../CodegenSchema.js';
 
-import type {TypeDeclarationMap} from '../utils';
+import type {TypeDeclarationMap} from '../utils.js';
+const {resolveTypeAnnotation} = require('../utils.js');
+const {
+  FlowGenericNotTypeParameterizedParserError,
+  FlowGenericTypeParameterCountMismatchParserError,
+  UnrecognizedFlowTypeAnnotationParserError,
+  UnrecognizedFlowGenericParserError,
+  UnnamedFunctionTypeAnnotationParamError,
+} = require('./errors.js');
+const invariant = require('invariant');
 
-function processModule(types: TypeDeclarationMap): NativeModuleShape {
-  const properties = getMethods(types);
-  const aliases = getAliases(types);
-  return {aliases, properties};
+import type {NativeModuleTypeAnnotation} from '../../../CodegenSchema.js';
+
+function translateTypeAnnotation(
+  moduleName: string,
+  /**
+   * TODO(T71778680): Flow-type this node.
+   */
+  flowTypeAnnotation: $FlowFixMe,
+  types: TypeDeclarationMap,
+  aliasMap: NativeModuleAliasMap,
+): NativeModuleTypeAnnotation {
+  const {nullable, typeAnnotation} = resolveTypeAnnotation(
+    flowTypeAnnotation,
+    types,
+  );
+
+  switch (typeAnnotation.type) {
+    case 'GenericTypeAnnotation': {
+      switch (typeAnnotation.id.name) {
+        case 'RootTag':
+          return {
+            nullable,
+            type: 'ReservedFunctionValueTypeAnnotation',
+            name: 'RootTag',
+          };
+        case 'Promise': {
+          assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+            moduleName,
+            typeAnnotation,
+          );
+          return {
+            nullable,
+            type: 'GenericPromiseTypeAnnotation',
+          };
+        }
+        case 'Array':
+        case '$ReadOnlyArray': {
+          assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+            moduleName,
+            typeAnnotation,
+          );
+
+          try {
+            /**
+             * TODO(T72031674): Migrate all our NativeModule specs to not use
+             * invalid Array ElementTypes. Then, make the elementType a required
+             * parameter.
+             */
+            const elementType = translateTypeAnnotation(
+              moduleName,
+              typeAnnotation.typeParameters.params[0],
+              types,
+              aliasMap,
+            );
+
+            invariant(
+              elementType.type !== 'VoidTypeAnnotation',
+              `${typeAnnotation.id.name} element type cannot be 'void'.`,
+            );
+            invariant(
+              elementType.type !== 'GenericPromiseTypeAnnotation',
+              `${typeAnnotation.id.name} element type cannot be 'Promise'.`,
+            );
+
+            invariant(
+              elementType.type !== 'FunctionTypeAnnotation',
+              `${typeAnnotation.id.name} element type cannot be a function.`,
+            );
+
+            return {
+              nullable,
+              type: 'ArrayTypeAnnotation',
+              elementType: elementType,
+            };
+          } catch (ex) {
+            return {
+              nullable,
+              type: 'ArrayTypeAnnotation',
+            };
+          }
+        }
+        case '$ReadOnly': {
+          assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+            moduleName,
+            typeAnnotation,
+          );
+          return translateTypeAnnotation(
+            moduleName,
+            typeAnnotation.typeParameters.params[0],
+            types,
+            aliasMap,
+          );
+        }
+        case 'Stringish': {
+          return {
+            nullable,
+            type: 'StringTypeAnnotation',
+          };
+        }
+        case 'Int32': {
+          return {
+            nullable,
+            type: 'Int32TypeAnnotation',
+          };
+        }
+        case 'Double': {
+          return {
+            nullable,
+            type: 'DoubleTypeAnnotation',
+          };
+        }
+        case 'Float': {
+          return {
+            nullable,
+            type: 'FloatTypeAnnotation',
+          };
+        }
+        case 'Object': {
+          return {
+            nullable,
+            type: 'GenericObjectTypeAnnotation',
+          };
+        }
+        default: {
+          throw new UnrecognizedFlowGenericParserError(
+            moduleName,
+            typeAnnotation.id.name,
+          );
+        }
+      }
+    }
+    case 'ObjectTypeAnnotation': {
+      const objectTypeAnnotation = {
+        nullable,
+        type: 'ObjectTypeAnnotation',
+        properties: typeAnnotation.properties.map(property => {
+          const {optional} = property;
+          return {
+            name: property.key.name,
+            optional,
+            typeAnnotation: translateTypeAnnotation(
+              moduleName,
+              property.value,
+              types,
+              aliasMap,
+            ),
+          };
+        }),
+      };
+
+      if (flowTypeAnnotation.type === 'GenericTypeAnnotation') {
+        aliasMap[flowTypeAnnotation.id.name] = objectTypeAnnotation;
+        return {
+          nullable: false,
+          type: 'TypeAliasTypeAnnotation',
+          name: flowTypeAnnotation.id.name,
+        };
+      }
+
+      if (
+        flowTypeAnnotation.type === 'NullableTypeAnnotation' &&
+        flowTypeAnnotation.typeAnnotation.type === 'GenericTypeAnnotation'
+      ) {
+        aliasMap[
+          flowTypeAnnotation.typeAnnotation.id.name
+        ] = objectTypeAnnotation;
+        return {
+          nullable: true,
+          type: 'TypeAliasTypeAnnotation',
+          name: flowTypeAnnotation.typeAnnotation.id.name,
+        };
+      }
+
+      return objectTypeAnnotation;
+    }
+    case 'BooleanTypeAnnotation': {
+      return {
+        nullable,
+        type: 'BooleanTypeAnnotation',
+      };
+    }
+    case 'NumberTypeAnnotation': {
+      return {
+        nullable,
+        type: 'NumberTypeAnnotation',
+      };
+    }
+    case 'VoidTypeAnnotation': {
+      return {
+        nullable,
+        type: 'VoidTypeAnnotation',
+      };
+    }
+    case 'StringTypeAnnotation': {
+      return {
+        nullable,
+        type: 'StringTypeAnnotation',
+      };
+    }
+    case 'FunctionTypeAnnotation': {
+      return translateFunctionTypeAnnotation(
+        moduleName,
+        typeAnnotation,
+        types,
+        nullable,
+        aliasMap,
+      );
+    }
+    default: {
+      throw new UnrecognizedFlowTypeAnnotationParserError(
+        moduleName,
+        typeAnnotation.type,
+      );
+    }
+  }
+}
+
+function assertGenericTypeAnnotationHasExactlyOneTypeParameter(
+  moduleName: string,
+  /**
+   * TODO(T71778680): This is a GenericTypeAnnotation. Flow type this node
+   */
+  typeAnnotation: $FlowFixMe,
+) {
+  if (typeAnnotation.typeParameters == null) {
+    throw new FlowGenericNotTypeParameterizedParserError(
+      moduleName,
+      typeAnnotation.id.name,
+    );
+  }
+
+  invariant(
+    typeAnnotation.typeParameters.type === 'TypeParameterInstantiation',
+    "assertGenericTypeAnnotationHasExactlyOneTypeParameter: Type parameters must be an AST node of type 'TypeParameterInstantiation'",
+  );
+
+  if (typeAnnotation.typeParameters.params.length !== 1) {
+    throw new FlowGenericTypeParameterCountMismatchParserError(
+      moduleName,
+      typeAnnotation.id.name,
+      (typeAnnotation.typeParameters.params.length: number),
+      1,
+    );
+  }
+}
+
+function translateFunctionTypeAnnotation(
+  moduleName: string,
+  // TODO(T71778680): This is a FunctionTypeAnnotation. Type this.
+  flowFunctionTypeAnnotation: $FlowFixMe,
+  types: TypeDeclarationMap,
+  nullable: boolean,
+  aliasMap: NativeModuleAliasMap,
+): NativeModuleFunctionTypeAnnotation {
+  const params: Array<NativeModuleMethodParamSchema> = [];
+  for (const flowParam of (flowFunctionTypeAnnotation.params: $ReadOnlyArray<$FlowFixMe>)) {
+    if (flowParam.name == null) {
+      throw new UnnamedFunctionTypeAnnotationParamError(moduleName);
+    }
+
+    const paramName = flowParam.name.name;
+    const paramTypeAnnotation = translateTypeAnnotation(
+      moduleName,
+      flowParam.typeAnnotation,
+      types,
+      aliasMap,
+    );
+
+    invariant(
+      paramTypeAnnotation.type !== 'VoidTypeAnnotation',
+      `Parameter ${paramName} cannot have type 'void'.`,
+    );
+
+    invariant(
+      paramTypeAnnotation.type !== 'GenericPromiseTypeAnnotation',
+      `Parameter ${paramName} cannot have type 'Promise'.`,
+    );
+
+    params.push({
+      name: flowParam.name.name,
+      optional: flowParam.optional,
+      typeAnnotation: paramTypeAnnotation,
+    });
+  }
+
+  const returnTypeAnnotation = translateTypeAnnotation(
+    moduleName,
+    flowFunctionTypeAnnotation.returnType,
+    types,
+    aliasMap,
+  );
+
+  invariant(
+    returnTypeAnnotation.type !== 'FunctionTypeAnnotation',
+    "Return cannot have type 'Promise'.",
+  );
+
+  return {
+    type: 'FunctionTypeAnnotation',
+    returnTypeAnnotation,
+    params,
+    nullable,
+  };
+}
+
+function buildPropertySchema(
+  moduleName: string,
+  // TODO(T71778680): This is an ObjectTypeProperty containing either:
+  // - a FunctionTypeAnnotation or GenericTypeAnnotation
+  // - a NullableTypeAnnoation containing a FunctionTypeAnnotation or GenericTypeAnnotation
+  // Flow type this node
+  property: $FlowFixMe,
+  types: TypeDeclarationMap,
+  aliasMap: NativeModuleAliasMap,
+): NativeModulePropertySchema {
+  let nullable = false;
+  let {key, value} = property;
+
+  const methodName: string = key.name;
+
+  ({nullable, typeAnnotation: value} = resolveTypeAnnotation(value, types));
+
+  if (value.type !== 'FunctionTypeAnnotation') {
+    throw new Error(
+      `Only methods are supported as module properties. Found ${value.type} in ${property.key.name}`,
+    );
+  }
+
+  return {
+    name: methodName,
+    optional: property.optional,
+    typeAnnotation: translateFunctionTypeAnnotation(
+      moduleName,
+      value,
+      types,
+      nullable,
+      aliasMap,
+    ),
+  };
+}
+
+function buildModuleSchema(
+  moduleName: string,
+  types: TypeDeclarationMap,
+): NativeModuleSchema {
+  const moduleInterfaceNames = (Object.keys(
+    types,
+  ): $ReadOnlyArray<string>).filter((typeName: string) => {
+    const declaration = types[typeName];
+    return (
+      declaration.type === 'InterfaceDeclaration' &&
+      declaration.extends.length === 1 &&
+      declaration.extends[0].type === 'InterfaceExtends' &&
+      declaration.extends[0].id.name === 'TurboModule'
+    );
+  });
+
+  invariant(
+    moduleInterfaceNames.length === 1,
+    'There must be exactly one module declaration per file.',
+  );
+
+  const [moduleInterfaceName] = moduleInterfaceNames;
+
+  const declaration = types[moduleInterfaceName];
+  return (declaration.body.properties: $ReadOnlyArray<$FlowFixMe>)
+    .filter(property => property.type === 'ObjectTypeProperty')
+    .map(property => {
+      const aliasMap: NativeModuleAliasMap = {};
+      return {
+        aliasMap: aliasMap,
+        propertySchema: buildPropertySchema(
+          moduleName,
+          property,
+          types,
+          aliasMap,
+        ),
+      };
+    })
+    .reduce(
+      (moduleSchema: NativeModuleSchema, {aliasMap, propertySchema}) => {
+        return {
+          aliases: {...moduleSchema.aliases, ...aliasMap},
+          properties: [...moduleSchema.properties, propertySchema],
+        };
+      },
+      {aliases: {}, properties: []},
+    );
 }
 
 module.exports = {
-  processModule,
+  buildModuleSchema,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/methods.js b/packages/react-native-codegen/src/parsers/flow/modules/methods.js
deleted file mode 100644
index e3773c01215874..00000000000000
--- a/packages/react-native-codegen/src/parsers/flow/modules/methods.js
+++ /dev/null
@@ -1,394 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-import type {
-  NativeModulePropertyShape,
-  FunctionTypeAnnotationParam,
-  FunctionTypeAnnotationReturn,
-} from '../../../CodegenSchema.js';
-
-import type {ASTNode, TypeDeclarationMap} from '../utils.js';
-const {getValueFromTypes} = require('../utils.js');
-const {
-  getElementTypeForArrayOrObject,
-  getObjectProperties,
-} = require('./properties');
-const invariant = require('invariant');
-
-function getTypeAnnotationForParam(
-  name: string,
-  paramAnnotation: ASTNode,
-  types: TypeDeclarationMap,
-): FunctionTypeAnnotationParam {
-  let param = paramAnnotation;
-  if (param.name === null) {
-    throw new Error(
-      `Unsupported type for ${name}. Please provide a name for every parameter.`,
-    );
-  }
-  let paramName = param.name.name;
-  let nullable = false;
-  if (param.typeAnnotation.type === 'NullableTypeAnnotation') {
-    nullable = true;
-    param = paramAnnotation.typeAnnotation;
-  }
-
-  const typeAnnotation = getValueFromTypes(param.typeAnnotation, types);
-  const type =
-    typeAnnotation.type === 'GenericTypeAnnotation'
-      ? typeAnnotation.id.name
-      : typeAnnotation.type;
-
-  switch (type) {
-    case 'RootTag':
-      return {
-        name: paramName,
-        nullable,
-        typeAnnotation: {
-          type: 'ReservedFunctionValueTypeAnnotation',
-          name: 'RootTag',
-        },
-      };
-    case 'Array':
-    case '$ReadOnlyArray':
-      if (
-        typeAnnotation.typeParameters &&
-        typeAnnotation.typeParameters.params[0]
-      ) {
-        return {
-          name: paramName,
-          nullable,
-          typeAnnotation: {
-            type: 'ArrayTypeAnnotation',
-            elementType: getElementTypeForArrayOrObject(
-              name,
-              typeAnnotation.typeParameters.params[0],
-              paramName,
-              types,
-            ),
-          },
-        };
-      } else {
-        throw new Error(
-          `Unsupported type for ${name}, param: "${paramName}": expected to find annotation for type of array contents`,
-        );
-      }
-    case 'ObjectTypeAnnotation':
-      if (param.typeAnnotation.type === 'GenericTypeAnnotation') {
-        return {
-          nullable,
-          name: paramName,
-          typeAnnotation: {
-            type: 'TypeAliasTypeAnnotation',
-            name: param.typeAnnotation.id.name,
-          },
-        };
-      }
-      return {
-        nullable,
-        name: paramName,
-        typeAnnotation: {
-          type: 'ObjectTypeAnnotation',
-          properties: getObjectProperties(
-            name,
-            typeAnnotation,
-            paramName,
-            types,
-          ),
-        },
-      };
-    case '$ReadOnly':
-      if (
-        typeAnnotation.typeParameters.params &&
-        typeAnnotation.typeParameters.params[0]
-      ) {
-        return {
-          nullable,
-          name: paramName,
-          typeAnnotation: {
-            type: 'ObjectTypeAnnotation',
-            properties: getObjectProperties(
-              name,
-              typeAnnotation.typeParameters.params[0],
-              paramName,
-              types,
-            ),
-          },
-        };
-      } else {
-        throw new Error(
-          `Unsupported param for method "${name}", param "${paramName}". No type specified for $ReadOnly`,
-        );
-      }
-    case 'FunctionTypeAnnotation':
-      return {
-        name: paramName,
-        nullable,
-        typeAnnotation: {
-          type: 'FunctionTypeAnnotation',
-        },
-      };
-    case 'NumberTypeAnnotation':
-    case 'BooleanTypeAnnotation':
-      return {
-        nullable,
-        name: paramName,
-        typeAnnotation: {
-          type,
-        },
-      };
-
-    case 'StringTypeAnnotation':
-    case 'Stringish':
-      return {
-        nullable,
-        name: paramName,
-        typeAnnotation: {
-          type: 'StringTypeAnnotation',
-        },
-      };
-    case 'Int32':
-      return {
-        nullable,
-        name: paramName,
-        typeAnnotation: {
-          type: 'Int32TypeAnnotation',
-        },
-      };
-    case 'Float':
-      return {
-        nullable,
-        name: paramName,
-        typeAnnotation: {
-          type: 'FloatTypeAnnotation',
-        },
-      };
-    default:
-      return {
-        nullable,
-        name: paramName,
-        typeAnnotation: {
-          type: 'GenericObjectTypeAnnotation',
-        },
-      };
-  }
-}
-
-function getReturnTypeAnnotation(
-  methodName: string,
-  returnType,
-  types: TypeDeclarationMap,
-): FunctionTypeAnnotationReturn {
-  let typeAnnotation = getValueFromTypes(returnType, types);
-  let nullable = false;
-  if (typeAnnotation.type === 'NullableTypeAnnotation') {
-    nullable = true;
-    typeAnnotation = typeAnnotation.typeAnnotation;
-  }
-  let type =
-    typeAnnotation.type === 'GenericTypeAnnotation'
-      ? typeAnnotation.id.name
-      : typeAnnotation.type;
-
-  switch (type) {
-    case 'RootTag':
-      return {
-        nullable,
-        type: 'ReservedFunctionValueTypeAnnotation',
-        name: 'RootTag',
-      };
-    case 'Promise':
-      if (
-        typeAnnotation.typeParameters &&
-        typeAnnotation.typeParameters.params[0]
-      ) {
-        return {
-          type: 'GenericPromiseTypeAnnotation',
-          nullable,
-        };
-      } else {
-        throw new Error(
-          `Unsupported return promise type for ${methodName}: expected to find annotation for type of promise content`,
-        );
-      }
-    case 'Array':
-    case '$ReadOnlyArray':
-      if (
-        typeAnnotation.typeParameters &&
-        typeAnnotation.typeParameters.params[0]
-      ) {
-        return {
-          nullable,
-          type: 'ArrayTypeAnnotation',
-          elementType: getElementTypeForArrayOrObject(
-            methodName,
-            typeAnnotation.typeParameters.params[0],
-            'returning value',
-            types,
-          ),
-        };
-      } else {
-        throw new Error(
-          `Unsupported return type for ${methodName}: expected to find annotation for type of array contents`,
-        );
-      }
-    case 'ObjectTypeAnnotation':
-      if (returnType.type === 'GenericTypeAnnotation') {
-        return {
-          nullable,
-          type: 'TypeAliasTypeAnnotation',
-          name: returnType.id.name,
-        };
-      }
-      return {
-        nullable,
-        type: 'ObjectTypeAnnotation',
-        properties: getObjectProperties(
-          methodName,
-          typeAnnotation,
-          'returning value',
-          types,
-        ),
-      };
-    case '$ReadOnly':
-      if (
-        typeAnnotation.typeParameters.params &&
-        typeAnnotation.typeParameters.params[0]
-      ) {
-        return {
-          nullable,
-          type: 'ObjectTypeAnnotation',
-          properties: getObjectProperties(
-            methodName,
-            typeAnnotation.typeParameters.params[0],
-            'returning value',
-            types,
-          ),
-        };
-      } else {
-        throw new Error(
-          `Unsupported return type for method "${methodName}", No type specified for $ReadOnly`,
-        );
-      }
-    case 'BooleanTypeAnnotation':
-    case 'NumberTypeAnnotation':
-    case 'VoidTypeAnnotation':
-      return {
-        nullable,
-        type,
-      };
-    case 'StringTypeAnnotation':
-    case 'Stringish':
-      return {
-        nullable,
-        type: 'StringTypeAnnotation',
-      };
-
-    case 'Int32':
-      return {
-        nullable,
-        type: 'Int32TypeAnnotation',
-      };
-    case 'Float':
-      return {
-        nullable,
-        type: 'FloatTypeAnnotation',
-      };
-    default:
-      return {
-        type: 'GenericObjectTypeAnnotation',
-        nullable,
-      };
-  }
-}
-
-function buildMethodSchema(
-  // TODO(T71778680): This is an ObjectTypeProperty containing either:
-  // - a FunctionTypeAnnotation or GenericTypeAnnotation
-  // - a NullableTypeAnnoation containing a FunctionTypeAnnotation or GenericTypeAnnotation
-  // Flow type this node
-  property: $FlowFixMe,
-  types: TypeDeclarationMap,
-): NativeModulePropertyShape {
-  let nullable = false;
-  let {key, value} = property;
-
-  // Unwrap Nullable types
-  if (value.type === 'NullableTypeAnnotation') {
-    nullable = true;
-    value = value.typeAnnotation;
-  }
-
-  const name: string = key.name;
-
-  // Resolve type aliases
-  if (value.type === 'GenericTypeAnnotation') {
-    value = getValueFromTypes(value, types);
-  }
-
-  if (value.type !== 'FunctionTypeAnnotation') {
-    throw new Error(
-      `Only methods are supported as module properties. Found ${value.type} in ${property.key.name}`,
-    );
-  }
-
-  const params = value.params.map(param =>
-    getTypeAnnotationForParam(name, param, types),
-  );
-
-  const returnTypeAnnotation = getReturnTypeAnnotation(
-    name,
-    value.returnType,
-    types,
-  );
-
-  return {
-    name,
-    optional: property.optional,
-    typeAnnotation: {
-      type: 'FunctionTypeAnnotation',
-      returnTypeAnnotation,
-      params,
-      nullable,
-    },
-  };
-}
-
-function getMethods(
-  types: TypeDeclarationMap,
-): $ReadOnlyArray<NativeModulePropertyShape> {
-  const moduleInterfaceNames = Object.keys(types).filter((typeName: string) => {
-    const declaration = types[typeName];
-    return (
-      declaration.type === 'InterfaceDeclaration' &&
-      declaration.extends.length === 1 &&
-      declaration.extends[0].type === 'InterfaceExtends' &&
-      declaration.extends[0].id.name === 'TurboModule'
-    );
-  });
-
-  invariant(
-    moduleInterfaceNames.length === 1,
-    'There must be exactly one module declaration per file',
-  );
-
-  const [moduleInterfaceName] = moduleInterfaceNames;
-
-  const declaration = types[moduleInterfaceName];
-  return declaration.body.properties
-    .filter(property => property.type === 'ObjectTypeProperty')
-    .map(property => buildMethodSchema(property, types));
-}
-
-module.exports = {
-  getMethods,
-};
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/properties.js b/packages/react-native-codegen/src/parsers/flow/modules/properties.js
deleted file mode 100644
index b1c1bbb11ed16c..00000000000000
--- a/packages/react-native-codegen/src/parsers/flow/modules/properties.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-import type {
-  FunctionTypeAnnotationParamTypeAnnotation,
-  ObjectParamTypeAnnotation,
-  TypeAliasTypeAnnotation,
-} from '../../../CodegenSchema.js';
-
-import type {ASTNode, TypeDeclarationMap} from '../utils.js';
-const {getValueFromTypes} = require('../utils.js');
-
-function getObjectProperties(
-  name: string,
-  objectParam: ASTNode,
-  paramName: string,
-  types: TypeDeclarationMap,
-): $ReadOnlyArray<ObjectParamTypeAnnotation> {
-  return objectParam.properties.map(objectTypeProperty => {
-    let optional = objectTypeProperty.optional;
-    let value = objectTypeProperty.value;
-    if (value.type === 'NullableTypeAnnotation') {
-      if (
-        objectTypeProperty.value.typeAnnotation.type !== 'StringTypeAnnotation'
-      ) {
-        optional = true;
-      }
-      value = objectTypeProperty.value.typeAnnotation;
-    }
-    return {
-      optional,
-      name: objectTypeProperty.key.name,
-      typeAnnotation: getElementTypeForArrayOrObject(
-        name,
-        value,
-        paramName,
-        types,
-      ),
-    };
-  });
-}
-
-function getElementTypeForArrayOrObject(
-  name: string,
-  arrayParam: ASTNode,
-  paramName: string,
-  types: TypeDeclarationMap,
-):
-  | FunctionTypeAnnotationParamTypeAnnotation
-  | TypeAliasTypeAnnotation
-  | typeof undefined {
-  const typeAnnotation = getValueFromTypes(arrayParam, types);
-  const type =
-    typeAnnotation.type === 'GenericTypeAnnotation'
-      ? typeAnnotation.id.name
-      : typeAnnotation.type;
-
-  switch (type) {
-    case 'RootTag':
-      return {
-        type: 'ReservedFunctionValueTypeAnnotation',
-        name: 'RootTag',
-      };
-    case 'Array':
-    case '$ReadOnlyArray':
-      if (
-        typeAnnotation.typeParameters &&
-        typeAnnotation.typeParameters.params[0]
-      ) {
-        return {
-          type: 'ArrayTypeAnnotation',
-          elementType: getElementTypeForArrayOrObject(
-            name,
-            typeAnnotation.typeParameters.params[0],
-            'returning value',
-            types,
-          ),
-        };
-      } else {
-        throw new Error(
-          `Unsupported type for "${name}", param: "${paramName}": expected to find annotation for type of nested array contents`,
-        );
-      }
-    case 'ObjectTypeAnnotation':
-      if (arrayParam.id) {
-        return {
-          type: 'TypeAliasTypeAnnotation',
-          name: arrayParam.id.name,
-        };
-      }
-      return {
-        type: 'ObjectTypeAnnotation',
-        properties: getObjectProperties(name, typeAnnotation, paramName, types),
-      };
-    case '$ReadOnly':
-      if (
-        typeAnnotation.typeParameters.params &&
-        typeAnnotation.typeParameters.params[0]
-      ) {
-        return {
-          type: 'ObjectTypeAnnotation',
-          properties: getObjectProperties(
-            name,
-            typeAnnotation.typeParameters.params[0],
-            paramName,
-            types,
-          ),
-        };
-      } else {
-        throw new Error(
-          `Unsupported param for method "${name}", param "${paramName}". No type specified for $ReadOnly`,
-        );
-      }
-    case 'AnyTypeAnnotation':
-      return {
-        type,
-      };
-    case 'NumberTypeAnnotation':
-    case 'BooleanTypeAnnotation':
-      return {
-        type,
-      };
-    case 'StringTypeAnnotation':
-    case 'Stringish':
-      return {
-        type: 'StringTypeAnnotation',
-      };
-    case 'Int32':
-      return {
-        type: 'Int32TypeAnnotation',
-      };
-    case 'Float':
-      return {
-        type: 'FloatTypeAnnotation',
-      };
-    case 'TupleTypeAnnotation':
-    case 'UnionTypeAnnotation':
-      return undefined;
-    default:
-      // TODO T67565166: Generic objects are not type safe and should be disallowed in the schema.
-      return {
-        type: 'GenericObjectTypeAnnotation',
-      };
-  }
-}
-
-module.exports = {
-  getElementTypeForArrayOrObject,
-  getObjectProperties,
-};
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/schema.js b/packages/react-native-codegen/src/parsers/flow/modules/schema.js
index 34e6b1531050b3..f54053a0c86d84 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/schema.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/schema.js
@@ -10,10 +10,10 @@
 
 'use strict';
 
-import type {SchemaType, NativeModuleShape} from '../../../CodegenSchema.js';
+import type {SchemaType, NativeModuleSchema} from '../../../CodegenSchema.js';
 
-function buildModuleSchema(
-  {aliases, properties}: NativeModuleShape,
+function wrapModuleSchema(
+  {aliases, properties}: NativeModuleSchema,
   moduleName: string,
 ): SchemaType {
   return {
@@ -31,5 +31,5 @@ function buildModuleSchema(
 }
 
 module.exports = {
-  buildModuleSchema,
+  wrapModuleSchema,
 };
diff --git a/packages/react-native-codegen/src/parsers/flow/utils.js b/packages/react-native-codegen/src/parsers/flow/utils.js
index 7e1e57f2989c7f..87ec1894c068db 100644
--- a/packages/react-native-codegen/src/parsers/flow/utils.js
+++ b/packages/react-native-codegen/src/parsers/flow/utils.js
@@ -23,6 +23,47 @@ export type TypeDeclarationMap = {|[declarationName: string]: $FlowFixMe|};
 // $FlowFixMe there's no flowtype for ASTs
 export type ASTNode = Object;
 
+const invariant = require('invariant');
+
+function resolveTypeAnnotation(
+  // TODO(T71778680): This is an Flow TypeAnnotation. Flow-type this
+  typeAnnotation: $FlowFixMe,
+  types: TypeDeclarationMap,
+): {nullable: boolean, typeAnnotation: $FlowFixMe} {
+  invariant(
+    typeAnnotation != null,
+    'resolveTypeAnnotation(): typeAnnotation cannot be null',
+  );
+
+  let node = typeAnnotation;
+  let nullable = false;
+
+  for (;;) {
+    if (node.type === 'NullableTypeAnnotation') {
+      nullable = true;
+      node = node.typeAnnotation;
+    } else if (node.type === 'GenericTypeAnnotation') {
+      const resolvedTypeAnnotation = types[node.id.name];
+      if (resolvedTypeAnnotation == null) {
+        break;
+      }
+
+      invariant(
+        resolvedTypeAnnotation.type === 'TypeAlias',
+        `GenericTypeAnnotation '${node.id.name}' must resolve to a TypeAlias. Instead, it resolved to a '${resolvedTypeAnnotation.type}'`,
+      );
+      node = resolvedTypeAnnotation.right;
+    } else {
+      break;
+    }
+  }
+
+  return {
+    nullable: nullable,
+    typeAnnotation: node,
+  };
+}
+
 function getValueFromTypes(value: ASTNode, types: TypeDeclarationMap): ASTNode {
   if (value.type === 'GenericTypeAnnotation' && types[value.id.name]) {
     return getValueFromTypes(types[value.id.name].right, types);
@@ -32,4 +73,5 @@ function getValueFromTypes(value: ASTNode, types: TypeDeclarationMap): ASTNode {
 
 module.exports = {
   getValueFromTypes,
+  resolveTypeAnnotation,
 };

From aba4e878734b073230244d331a8a83b2fb8c8bf4 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 115/241] Add unit tests to validate module parser

Summary:
## Test Structure
- Parameter Parsing
  - For type in [optional, nullable, optional and nullable, required]:
    - Can parse Primitives
    - Can parse Object
    - Can parse Arrays
      - Can parse primitive element types
      - Can parse Object element types
      - Can parse Array element types
      - Can parse Reserved Type element types
      - Can parse Type alias element types
      - Can parse Object Literals
    - Can parse Function
    - Can parse Reserved Types (e.g: RootTag)
    - Can parse Type alias
    - Can parse Object Literals
      - For prop type in [optional, nullable, optional and nullable, required]:
        - Can parse primitive prop types
        - Can parse Object prop types
        - Can parse Array prop types
        - Can parse Reserved Type prop types
        - Can parse Type alias prop types
        - Can parse Object Literal prop types
- Return Parsing
  - For type in [nullable, required]:
    - Can parse Promises
    - Can parse Primitives
    - Can parse Object
    - Can parse Arrays
      - Can parse primitive element types
      - Can parse Object element types
      - Can parse Array element types
      - Can parse Reserved Type element types
      - Can parse Type alias element types
      - Can parse Object Literals
    - Can parse Function
    - Can parse Reserved Types (e.g: RootTag)
    - Can parse Type aliases
    - Can parse Object Literals
      - For prop type in [optional, nullable, optional and nullable, required]:
        - Can parse primitive prop types
        - Can parse Object prop types
        - Can parse Array prop types
        - Can parse Reserved Type prop types
        - Can parse Type alias prop types
        - Can parse Object Literal prop types

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23089925

fbshipit-source-id: 73c3b1ef33b402265c14f0ac9e364414a5d54dca
---
 ...ap => module-parser-snapshot-test.js.snap} |    0
 .../__tests__/module-parser-e2e-test.js       | 1083 +++++++++++++++++
 ...test.js => module-parser-snapshot-test.js} |    0
 3 files changed, 1083 insertions(+)
 rename packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/{module-parser-test.js.snap => module-parser-snapshot-test.js.snap} (100%)
 create mode 100644 packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
 rename packages/react-native-codegen/src/parsers/flow/modules/__tests__/{module-parser-test.js => module-parser-snapshot-test.js} (100%)

diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
similarity index 100%
rename from packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-test.js.snap
rename to packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
new file mode 100644
index 00000000000000..734e456922f510
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
@@ -0,0 +1,1083 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+import type {ReservedFunctionValueTypeName} from '../../../../CodegenSchema';
+const {parseString} = require('../../index.js');
+const {
+  FlowGenericNotTypeParameterizedParserError,
+  UnrecognizedFlowTypeAnnotationParserError,
+  UnrecognizedFlowGenericParserError,
+  UnnamedFunctionTypeAnnotationParamError,
+} = require('../errors.js');
+const invariant = require('invariant');
+
+type PrimitiveTypeAnnotationType =
+  | 'StringTypeAnnotation'
+  | 'NumberTypeAnnotation'
+  | 'Int32TypeAnnotation'
+  | 'DoubleTypeAnnotation'
+  | 'FloatTypeAnnotation'
+  | 'BooleanTypeAnnotation';
+
+const PRIMITIVES: $ReadOnlyArray<[string, PrimitiveTypeAnnotationType]> = [
+  ['string', 'StringTypeAnnotation'],
+  ['number', 'NumberTypeAnnotation'],
+  ['Int32', 'Int32TypeAnnotation'],
+  ['Double', 'DoubleTypeAnnotation'],
+  ['Float', 'FloatTypeAnnotation'],
+  ['boolean', 'BooleanTypeAnnotation'],
+];
+
+const RESERVED_FUNCTION_VALUE_TYPE_NAME: $ReadOnlyArray<ReservedFunctionValueTypeName> = [
+  'RootTag',
+];
+
+const MODULE_NAME = 'Foo';
+
+describe('Flow Module Parser', () => {
+  describe('Parameter Parsing', () => {
+    it("should fail parsing when a method has an parameter of type 'any'", () => {
+      const parser = () =>
+        parseModule(`
+          import type {TurboModule} from 'RCTExport';
+          import * as TurboModuleRegistry from 'TurboModuleRegistry';
+          export interface Spec extends TurboModule {
+            +useArg(arg: any): void;
+          }
+          export default TurboModuleRegistry.get<Spec>('Foo');
+        `);
+
+      expect(parser).toThrow(
+        new UnrecognizedFlowTypeAnnotationParserError(
+          MODULE_NAME,
+          'AnyTypeAnnotation',
+        ),
+      );
+    });
+
+    it('should fail parsing when a function param type is unamed', () => {
+      const parser = () =>
+        parseModule(`
+          import type {TurboModule} from 'RCTExport';
+          import * as TurboModuleRegistry from 'TurboModuleRegistry';
+          export interface Spec extends TurboModule {
+            +useArg(boolean): void;
+          }
+          export default TurboModuleRegistry.get<Spec>('Foo');
+        `);
+
+      expect(parser).toThrow(
+        new UnnamedFunctionTypeAnnotationParamError(MODULE_NAME),
+      );
+    });
+
+    [
+      {nullable: false, optional: false},
+      {nullable: false, optional: true},
+      {nullable: true, optional: false},
+      {nullable: true, optional: true},
+    ].forEach(({nullable, optional}) => {
+      const PARAM_TYPE_DESCRIPTION =
+        nullable && optional
+          ? 'a nullable and optional'
+          : nullable
+          ? 'a nullable'
+          : optional
+          ? 'an optional'
+          : 'a required';
+
+      function annotateArg(paramName: string, paramType: string) {
+        if (nullable && optional) {
+          return `${paramName}?: ?${paramType}`;
+        }
+        if (nullable) {
+          return `${paramName}: ?${paramType}`;
+        }
+        if (optional) {
+          return `${paramName}?: ${paramType}`;
+        }
+        return `${paramName}: ${paramType}`;
+      }
+
+      function parseParamType(paramName: string, paramType: string) {
+        const module = parseModule(`
+          import type {TurboModule} from 'RCTExport';
+          import * as TurboModuleRegistry from 'TurboModuleRegistry';
+
+          type Animal = {|
+            name: string,
+          |};
+
+          export interface Spec extends TurboModule {
+            +useArg(${annotateArg(paramName, paramType)}): void;
+          }
+          export default TurboModuleRegistry.get<Spec>('Foo');
+        `);
+
+        expect(module.properties[0]).not.toBe(null);
+        const param = module.properties[0].typeAnnotation.params[0];
+        expect(param).not.toBe(null);
+        expect(param.name).toBe(paramName);
+        expect(param.optional).toBe(optional);
+        expect(param.typeAnnotation.nullable).toBe(nullable);
+
+        return param;
+      }
+
+      describe(
+        (nullable && optional
+          ? 'Nullable and Optional'
+          : nullable
+          ? 'Nullable'
+          : optional
+          ? 'Optional'
+          : 'Required') + ' Parameter',
+        () => {
+          it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Function'`, () => {
+            expect(() => parseParamType('arg', 'Function')).toThrow(
+              new UnrecognizedFlowGenericParserError(MODULE_NAME, 'Function'),
+            );
+          });
+
+          describe('Primitive types', () => {
+            PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+              it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} primitive parameter of type '${FLOW_TYPE}'`, () => {
+                const param = parseParamType('arg', FLOW_TYPE);
+                expect(param.typeAnnotation.type).toBe(PARSED_TYPE_NAME);
+              });
+            });
+          });
+
+          it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Object'`, () => {
+            const param = parseParamType('arg', 'Object');
+            expect(param.typeAnnotation.type).toBe(
+              'GenericObjectTypeAnnotation',
+            );
+          });
+
+          describe('Reserved Types', () => {
+            RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+              it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of reserved type '${FLOW_TYPE}'`, () => {
+                const param = parseParamType('arg', FLOW_TYPE);
+
+                expect(param.typeAnnotation.type).toBe(
+                  'ReservedFunctionValueTypeAnnotation',
+                );
+                invariant(
+                  param.typeAnnotation.type ===
+                    'ReservedFunctionValueTypeAnnotation',
+                  'Param must be a Reserved type',
+                );
+
+                expect(param.typeAnnotation.name).toBe(FLOW_TYPE);
+              });
+            });
+          });
+
+          describe('Array Types', () => {
+            it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array'`, () => {
+              expect(() => parseParamType('arg', 'Array')).toThrow(
+                new FlowGenericNotTypeParameterizedParserError(
+                  MODULE_NAME,
+                  'Array',
+                ),
+              );
+            });
+
+            function parseParamArrayElementType(
+              paramName: string,
+              paramType: string,
+            ) {
+              const param = parseParamType(paramName, `Array<${paramType}>`);
+
+              expect(param.typeAnnotation.type).toBe('ArrayTypeAnnotation');
+              invariant(
+                param.typeAnnotation.type === 'ArrayTypeAnnotation',
+                '',
+              );
+
+              expect(param.typeAnnotation.elementType).not.toBe(null);
+              invariant(param.typeAnnotation.elementType != null, '');
+              return param.typeAnnotation.elementType;
+            }
+
+            // TODO: Do we support nullable element types?
+
+            describe('Primitive Element Types', () => {
+              PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+                it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<${FLOW_TYPE}>'`, () => {
+                  const elementType = parseParamArrayElementType(
+                    'arg',
+                    FLOW_TYPE,
+                  );
+                  expect(elementType.type).toBe(PARSED_TYPE_NAME);
+                });
+              });
+            });
+
+            describe('Reserved Element Types', () => {
+              RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+                it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<${FLOW_TYPE}>'`, () => {
+                  const elementType = parseParamArrayElementType(
+                    'arg',
+                    FLOW_TYPE,
+                  );
+                  expect(elementType.type).toBe(
+                    'ReservedFunctionValueTypeAnnotation',
+                  );
+                  invariant(
+                    elementType.type === 'ReservedFunctionValueTypeAnnotation',
+                    '',
+                  );
+
+                  expect(elementType.name).toBe(FLOW_TYPE);
+                });
+              });
+            });
+
+            it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<Object>'`, () => {
+              const elementType = parseParamArrayElementType('arg', 'Object');
+              expect(elementType.type).toBe('GenericObjectTypeAnnotation');
+            });
+
+            it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some array of an alias`, () => {
+              const elementType = parseParamArrayElementType('arg', 'Animal');
+              expect(elementType.type).toBe('TypeAliasTypeAnnotation');
+              invariant(elementType.type === 'TypeAliasTypeAnnotation', '');
+
+              expect(elementType.name).toBe('Animal');
+            });
+
+            it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<{|foo: ?string|}>'`, () => {
+              const elementType = parseParamArrayElementType(
+                'arg',
+                '{|foo: ?string|}',
+              );
+              expect(elementType).not.toBe(null);
+
+              expect(elementType.type).toBe('ObjectTypeAnnotation');
+              invariant(elementType.type === 'ObjectTypeAnnotation', '');
+
+              const {properties} = elementType;
+              invariant(properties != null, '');
+
+              expect(properties).not.toBe(null);
+              expect(properties[0]).not.toBe(null);
+              expect(properties[0].name).toBe('foo');
+              expect(properties[0].typeAnnotation).not.toBe(null);
+              expect(properties[0].typeAnnotation?.type).toBe(
+                'StringTypeAnnotation',
+              );
+              expect(properties[0].typeAnnotation?.nullable).toBe(true);
+              expect(properties[0].optional).toBe(false);
+            });
+          });
+
+          it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some type alias`, () => {
+            const param = parseParamType('arg', 'Animal');
+            expect(param.typeAnnotation.type).toBe('TypeAliasTypeAnnotation');
+            invariant(
+              param.typeAnnotation.type === 'TypeAliasTypeAnnotation',
+              '',
+            );
+
+            expect(param.typeAnnotation.name).toBe('Animal');
+          });
+
+          [
+            {nullable: false, optional: false},
+            {nullable: false, optional: true},
+            {nullable: true, optional: false},
+            {nullable: true, optional: true},
+          ].forEach(({nullable: isPropNullable, optional: isPropOptional}) => {
+            const PROP_TYPE_DESCRIPTION =
+              isPropNullable && isPropOptional
+                ? 'a nullable and optional'
+                : isPropNullable
+                ? 'a nullable'
+                : isPropOptional
+                ? 'an optional'
+                : 'a required';
+
+            function annotateProp(propName: string, propType: string) {
+              if (isPropNullable && isPropOptional) {
+                return `${propName}?: ?${propType}`;
+              }
+              if (isPropNullable) {
+                return `${propName}: ?${propType}`;
+              }
+              if (isPropOptional) {
+                return `${propName}?: ${propType}`;
+              }
+              return `${propName}: ${propType}`;
+            }
+
+            function parseParamTypeObjectLiteralProp(
+              propName: string,
+              propType: string,
+            ) {
+              const param = parseParamType(
+                'arg',
+                `{|${annotateProp(propName, propType)}|}`,
+              );
+
+              expect(param.typeAnnotation.type).toBe('ObjectTypeAnnotation');
+              invariant(
+                param.typeAnnotation.type === 'ObjectTypeAnnotation',
+                '',
+              );
+
+              const {properties} = param.typeAnnotation;
+
+              expect(properties).not.toBe(null);
+              invariant(properties != null, '');
+
+              expect(properties.length).toBe(1);
+              expect(properties[0].name).toBe(propName);
+              expect(properties[0].optional).toBe(isPropOptional);
+              expect(properties[0].typeAnnotation).not.toBe(null);
+              expect(properties[0].typeAnnotation.nullable).toBe(
+                isPropNullable,
+              );
+              invariant(properties[0].typeAnnotation != null, '');
+
+              return {
+                ...properties[0],
+                typeAnnotation: properties[0].typeAnnotation,
+              };
+            }
+
+            describe(
+              (isPropNullable && isPropOptional
+                ? 'Nullable and Optional'
+                : isPropNullable
+                ? 'Nullable'
+                : isPropOptional
+                ? 'Optional'
+                : 'Required') + ' Property',
+              () => {
+                describe('Props with Primitive Types', () => {
+                  PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+                    it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of primitive type '${FLOW_TYPE}'`, () => {
+                      const prop = parseParamTypeObjectLiteralProp(
+                        'prop',
+                        FLOW_TYPE,
+                      );
+                      expect(prop.typeAnnotation.type).toBe(PARSED_TYPE_NAME);
+                    });
+                  });
+                });
+
+                it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Object'`, () => {
+                  const prop = parseParamTypeObjectLiteralProp(
+                    'prop',
+                    'Object',
+                  );
+                  expect(prop.typeAnnotation.type).toBe(
+                    'GenericObjectTypeAnnotation',
+                  );
+                });
+
+                describe('Props with Reserved Types', () => {
+                  RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+                    it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of reserved type '${FLOW_TYPE}'`, () => {
+                      const prop = parseParamTypeObjectLiteralProp(
+                        'prop',
+                        FLOW_TYPE,
+                      );
+                      expect(prop.typeAnnotation.type).toBe(
+                        'ReservedFunctionValueTypeAnnotation',
+                      );
+                      invariant(
+                        prop.typeAnnotation.type ===
+                          'ReservedFunctionValueTypeAnnotation',
+                        '',
+                      );
+
+                      expect(prop.typeAnnotation.name).toBe(FLOW_TYPE);
+                    });
+                  });
+                });
+
+                describe('Props with Array Types', () => {
+                  it(`should not parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array`, () => {
+                    expect(() =>
+                      parseParamTypeObjectLiteralProp('prop', 'Array'),
+                    ).toThrow(
+                      new FlowGenericNotTypeParameterizedParserError(
+                        MODULE_NAME,
+                        'Array',
+                      ),
+                    );
+                  });
+
+                  function parseArrayElementType(
+                    propName: string,
+                    arrayElementType: string,
+                  ) {
+                    const property = parseParamTypeObjectLiteralProp(
+                      'propName',
+                      `Array<${arrayElementType}>`,
+                    );
+                    expect(property.typeAnnotation.type).toBe(
+                      'ArrayTypeAnnotation',
+                    );
+                    invariant(
+                      property.typeAnnotation.type === 'ArrayTypeAnnotation',
+                      '',
+                    );
+
+                    const {elementType} = property.typeAnnotation;
+                    expect(elementType).not.toBe(null);
+                    invariant(elementType != null, '');
+                    return elementType;
+                  }
+
+                  PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+                    it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
+                      const elementType = parseArrayElementType(
+                        'prop',
+                        FLOW_TYPE,
+                      );
+
+                      expect(elementType.type).toBe(PARSED_TYPE_NAME);
+                    });
+                  });
+
+                  RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+                    it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
+                      const elementType = parseArrayElementType(
+                        'prop',
+                        FLOW_TYPE,
+                      );
+
+                      expect(elementType.type).toBe(
+                        'ReservedFunctionValueTypeAnnotation',
+                      );
+                      invariant(
+                        elementType.type ===
+                          'ReservedFunctionValueTypeAnnotation',
+                        '',
+                      );
+                      expect(elementType.name).toBe(FLOW_TYPE);
+                    });
+                  });
+
+                  it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<Object>'`, () => {
+                    const elementType = parseArrayElementType('prop', 'Object');
+                    expect(elementType.type).toBe(
+                      'GenericObjectTypeAnnotation',
+                    );
+                  });
+
+                  it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type of some array of an aliase`, () => {
+                    const elementType = parseArrayElementType('prop', 'Animal');
+
+                    expect(elementType.type).toBe('TypeAliasTypeAnnotation');
+                    invariant(
+                      elementType.type === 'TypeAliasTypeAnnotation',
+                      '',
+                    );
+
+                    expect(elementType.name).toBe('Animal');
+                  });
+
+                  it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of 'Array<{|foo: ?string|}>'`, () => {
+                    const elementType = parseArrayElementType(
+                      'prop',
+                      '{|foo: ?string|}',
+                    );
+
+                    expect(elementType.type).toBe('ObjectTypeAnnotation');
+                    invariant(elementType.type === 'ObjectTypeAnnotation', '');
+
+                    const {properties} = elementType;
+                    expect(properties).not.toBe(null);
+                    invariant(properties != null, '');
+
+                    expect(properties[0]).not.toBe(null);
+                    expect(properties[0].name).toBe('foo');
+                    expect(properties[0].typeAnnotation).not.toBe(null);
+                    expect(properties[0].typeAnnotation?.type).toBe(
+                      'StringTypeAnnotation',
+                    );
+                    expect(properties[0].typeAnnotation?.nullable).toBe(true);
+                    expect(properties[0].optional).toBe(false);
+                  });
+                });
+
+                it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type '{|foo: ?string|}'`, () => {
+                  const property = parseParamTypeObjectLiteralProp(
+                    'prop',
+                    '{|foo: ?string|}',
+                  );
+
+                  expect(property.typeAnnotation.type).toBe(
+                    'ObjectTypeAnnotation',
+                  );
+                  invariant(
+                    property.typeAnnotation.type === 'ObjectTypeAnnotation',
+                    '',
+                  );
+
+                  const {properties} = property.typeAnnotation;
+                  expect(properties).not.toBe(null);
+                  invariant(properties != null, '');
+
+                  expect(properties[0]).not.toBe(null);
+                  expect(properties[0].name).toBe('foo');
+                  expect(properties[0].typeAnnotation).not.toBe(null);
+                  expect(properties[0].typeAnnotation?.type).toBe(
+                    'StringTypeAnnotation',
+                  );
+                  expect(properties[0].typeAnnotation?.nullable).toBe(true);
+                  expect(properties[0].optional).toBe(false);
+                });
+
+                it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of some type alias`, () => {
+                  const property = parseParamTypeObjectLiteralProp(
+                    'prop',
+                    'Animal',
+                  );
+
+                  expect(property.typeAnnotation.type).toBe(
+                    'TypeAliasTypeAnnotation',
+                  );
+                  invariant(
+                    property.typeAnnotation.type === 'TypeAliasTypeAnnotation',
+                    '',
+                  );
+
+                  expect(property.typeAnnotation.name).toBe('Animal');
+                });
+              },
+            );
+          });
+        },
+      );
+    });
+  });
+
+  describe('Return Parsing', () => {
+    it('should parse methods that have a return type of void', () => {
+      const module = parseModule(`
+        import type {TurboModule} from 'RCTExport';
+        import * as TurboModuleRegistry from 'TurboModuleRegistry';
+        export interface Spec extends TurboModule {
+          +useArg(): void;
+        }
+        export default TurboModuleRegistry.get<Spec>('Foo');
+      `);
+
+      expect(module.properties[0]).not.toBe(null);
+      const {returnTypeAnnotation} = module.properties[0].typeAnnotation;
+      expect(returnTypeAnnotation).not.toBe(null);
+      expect(returnTypeAnnotation.type).toBe('VoidTypeAnnotation');
+      expect(returnTypeAnnotation.nullable).toBe(false);
+    });
+
+    [true, false].forEach(IS_RETURN_TYPE_NULLABLE => {
+      const RETURN_TYPE_DESCRIPTION = IS_RETURN_TYPE_NULLABLE
+        ? 'a nullable'
+        : 'a non-nullable';
+      const annotateRet = retType =>
+        IS_RETURN_TYPE_NULLABLE ? `?${retType}` : retType;
+
+      function parseReturnType(flowType: string) {
+        const module = parseModule(`
+          import type {TurboModule} from 'RCTExport';
+          import * as TurboModuleRegistry from 'TurboModuleRegistry';
+          type Animal = {|
+            name: string,
+          |};
+          export interface Spec extends TurboModule {
+            +useArg(): ${annotateRet(flowType)};
+          }
+          export default TurboModuleRegistry.get<Spec>('Foo');
+        `);
+
+        expect(module.properties[0]).not.toBe(null);
+        const {returnTypeAnnotation} = module.properties[0].typeAnnotation;
+        expect(returnTypeAnnotation).not.toBe(null);
+        expect(returnTypeAnnotation.nullable).toBe(IS_RETURN_TYPE_NULLABLE);
+        return returnTypeAnnotation;
+      }
+
+      describe(
+        IS_RETURN_TYPE_NULLABLE ? 'Nullable Returns' : 'Non-Nullable Returns',
+        () => {
+          ['Promise<void>', 'Promise<{||}>', 'Promise<*>'].forEach(
+            promiseFlowType => {
+              it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type '${promiseFlowType}'`, () => {
+                const returnTypeAnnotation = parseReturnType(promiseFlowType);
+                expect(returnTypeAnnotation.type).toBe(
+                  'GenericPromiseTypeAnnotation',
+                );
+              });
+            },
+          );
+
+          describe('Primitive Types', () => {
+            PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+              it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} primitive return of type '${FLOW_TYPE}'`, () => {
+                const returnTypeAnnotation = parseReturnType(FLOW_TYPE);
+                expect(returnTypeAnnotation.type).toBe(PARSED_TYPE_NAME);
+              });
+            });
+          });
+
+          describe('Reserved Types', () => {
+            RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+              it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} reserved return of type '${FLOW_TYPE}'`, () => {
+                const returnTypeAnnotation = parseReturnType(FLOW_TYPE);
+                expect(returnTypeAnnotation.type).toBe(
+                  'ReservedFunctionValueTypeAnnotation',
+                );
+                invariant(
+                  returnTypeAnnotation.type ===
+                    'ReservedFunctionValueTypeAnnotation',
+                  '',
+                );
+                expect(returnTypeAnnotation.name).toBe(FLOW_TYPE);
+              });
+            });
+          });
+
+          describe('Array Types', () => {
+            it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array'`, () => {
+              expect(() => parseReturnType('Array')).toThrow(
+                new FlowGenericNotTypeParameterizedParserError(
+                  MODULE_NAME,
+                  'Array',
+                ),
+              );
+            });
+
+            function parseArrayElementReturnType(flowType: string) {
+              const returnTypeAnnotation = parseReturnType(
+                'Array' + (flowType != null ? `<${flowType}>` : ''),
+              );
+              expect(returnTypeAnnotation.type).toBe('ArrayTypeAnnotation');
+              invariant(
+                returnTypeAnnotation.type === 'ArrayTypeAnnotation',
+                '',
+              );
+
+              const {elementType} = returnTypeAnnotation;
+              expect(elementType).not.toBe(null);
+              invariant(elementType != null, '');
+              return elementType;
+            }
+
+            // TODO: Do we support nullable element types?
+
+            describe('Primitive Element Types', () => {
+              PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+                it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<${FLOW_TYPE}>'`, () => {
+                  const elementType = parseArrayElementReturnType(FLOW_TYPE);
+                  expect(elementType.type).toBe(PARSED_TYPE_NAME);
+                });
+              });
+            });
+
+            describe('Reserved Element Types', () => {
+              RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+                it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<${FLOW_TYPE}>'`, () => {
+                  const elementType = parseArrayElementReturnType(FLOW_TYPE);
+                  expect(elementType.type).toBe(
+                    'ReservedFunctionValueTypeAnnotation',
+                  );
+                  invariant(
+                    elementType.type === 'ReservedFunctionValueTypeAnnotation',
+                    '',
+                  );
+
+                  expect(elementType.name).toBe(FLOW_TYPE);
+                });
+              });
+            });
+
+            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<Object>'`, () => {
+              const elementType = parseArrayElementReturnType('Object');
+              expect(elementType.type).toBe('GenericObjectTypeAnnotation');
+            });
+
+            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of some array of an aliase`, () => {
+              const elementType = parseArrayElementReturnType('Animal');
+              expect(elementType.type).toBe('TypeAliasTypeAnnotation');
+              invariant(elementType.type === 'TypeAliasTypeAnnotation', '');
+              expect(elementType.name).toBe('Animal');
+            });
+
+            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<{|foo: ?string|}>'`, () => {
+              const elementType = parseArrayElementReturnType(
+                '{|foo: ?string|}',
+              );
+              expect(elementType.type).toBe('ObjectTypeAnnotation');
+              invariant(elementType.type === 'ObjectTypeAnnotation', '');
+
+              const {properties} = elementType;
+              expect(properties).not.toBe(null);
+              invariant(properties != null, '');
+
+              expect(properties[0]).not.toBe(null);
+              expect(properties[0].name).toBe('foo');
+              expect(properties[0].typeAnnotation).not.toBe(null);
+              expect(properties[0].typeAnnotation?.type).toBe(
+                'StringTypeAnnotation',
+              );
+              expect(properties[0].typeAnnotation?.nullable).toBe(true);
+              expect(properties[0].optional).toBe(false);
+            });
+          });
+
+          it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of some type alias`, () => {
+            const returnTypeAnnotation = parseReturnType('Animal');
+            expect(returnTypeAnnotation.type).toBe('TypeAliasTypeAnnotation');
+            invariant(
+              returnTypeAnnotation.type === 'TypeAliasTypeAnnotation',
+              '',
+            );
+            expect(returnTypeAnnotation.name).toBe('Animal');
+          });
+
+          it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Function'`, () => {
+            expect(() => parseReturnType('Function')).toThrow(
+              new UnrecognizedFlowGenericParserError(MODULE_NAME, 'Function'),
+            );
+          });
+
+          it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Object'`, () => {
+            const returnTypeAnnotation = parseReturnType('Object');
+            expect(returnTypeAnnotation.type).toBe(
+              'GenericObjectTypeAnnotation',
+            );
+          });
+
+          describe('Object Literals Types', () => {
+            // TODO: Inexact vs exact object literals?
+
+            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an empty object literal`, () => {
+              const returnTypeAnnotation = parseReturnType('{||}');
+              expect(returnTypeAnnotation.type).toBe('ObjectTypeAnnotation');
+              invariant(
+                returnTypeAnnotation.type === 'ObjectTypeAnnotation',
+                '',
+              );
+
+              // Validate properties of object literal
+              expect(returnTypeAnnotation.properties).not.toBe(null);
+              expect(returnTypeAnnotation.properties?.length).toBe(0);
+            });
+
+            [
+              {nullable: false, optional: false},
+              {nullable: false, optional: true},
+              {nullable: true, optional: false},
+              {nullable: true, optional: true},
+            ].forEach(({nullable, optional}) => {
+              const PROP_TYPE_DESCRIPTION =
+                nullable && optional
+                  ? 'a nullable and optional'
+                  : nullable
+                  ? 'a nullable'
+                  : optional
+                  ? 'an optional'
+                  : 'a required';
+
+              function annotateProp(propName, propType) {
+                if (nullable && optional) {
+                  return `${propName}?: ?${propType}`;
+                }
+                if (nullable) {
+                  return `${propName}: ?${propType}`;
+                }
+                if (optional) {
+                  return `${propName}?: ${propType}`;
+                }
+                return `${propName}: ${propType}`;
+              }
+
+              function parseObjectLiteralReturnTypeProp(
+                propName: string,
+                propType: string,
+              ) {
+                const returnTypeAnnotation = parseReturnType(
+                  `{|${annotateProp(propName, propType)}|}`,
+                );
+                expect(returnTypeAnnotation.type).toBe('ObjectTypeAnnotation');
+                invariant(
+                  returnTypeAnnotation.type === 'ObjectTypeAnnotation',
+                  '',
+                );
+
+                const properties = returnTypeAnnotation.properties;
+                expect(properties).not.toBe(null);
+                invariant(properties != null, '');
+
+                expect(properties.length).toBe(1);
+
+                // Validate property
+                const property = properties[0];
+                expect(property.name).toBe(propName);
+                expect(property.optional).toBe(optional);
+                expect(property.typeAnnotation).not.toBe(null);
+                expect(property.typeAnnotation?.nullable).toBe(nullable);
+                invariant(property.typeAnnotation != null, '');
+                return {
+                  ...property,
+                  typeAnnotation: property.typeAnnotation,
+                };
+              }
+
+              describe(
+                (nullable && optional
+                  ? 'Nullable and Optional'
+                  : nullable
+                  ? 'Nullable'
+                  : optional
+                  ? 'Optional'
+                  : 'Required') + ' Property',
+                () => {
+                  /**
+                   * TODO: Fill out props in promise
+                   */
+
+                  describe('Props with Primitive Types', () => {
+                    PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+                      it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of primitive type '${FLOW_TYPE}'`, () => {
+                        const property = parseObjectLiteralReturnTypeProp(
+                          'prop',
+                          FLOW_TYPE,
+                        );
+                        expect(property.typeAnnotation.type).toBe(
+                          PARSED_TYPE_NAME,
+                        );
+                      });
+                    });
+                  });
+
+                  it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Object'`, () => {
+                    const property = parseObjectLiteralReturnTypeProp(
+                      'prop',
+                      'Object',
+                    );
+
+                    expect(property.typeAnnotation.type).toBe(
+                      'GenericObjectTypeAnnotation',
+                    );
+                  });
+
+                  describe('Props with Reserved Types', () => {
+                    RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+                      it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of reserved type '${FLOW_TYPE}'`, () => {
+                        const property = parseObjectLiteralReturnTypeProp(
+                          'prop',
+                          FLOW_TYPE,
+                        );
+
+                        expect(property.typeAnnotation.type).toBe(
+                          'ReservedFunctionValueTypeAnnotation',
+                        );
+                        invariant(
+                          property.typeAnnotation.type ===
+                            'ReservedFunctionValueTypeAnnotation',
+                          '',
+                        );
+
+                        expect(property.typeAnnotation.name).toBe(FLOW_TYPE);
+                      });
+                    });
+                  });
+
+                  describe('Props with Array Types', () => {
+                    it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array`, () => {
+                      expect(() =>
+                        parseObjectLiteralReturnTypeProp('prop', 'Array'),
+                      ).toThrow(
+                        new FlowGenericNotTypeParameterizedParserError(
+                          MODULE_NAME,
+                          'Array',
+                        ),
+                      );
+                    });
+
+                    function parseArrayElementType(
+                      propName: string,
+                      arrayElementType: string,
+                    ) {
+                      const property = parseObjectLiteralReturnTypeProp(
+                        propName,
+                        `Array<${arrayElementType}>`,
+                      );
+                      expect(property.name).toBe(propName);
+                      expect(property.typeAnnotation.type).toBe(
+                        'ArrayTypeAnnotation',
+                      );
+                      invariant(
+                        property.typeAnnotation.type === 'ArrayTypeAnnotation',
+                        '',
+                      );
+
+                      const {elementType} = property.typeAnnotation;
+                      expect(elementType).not.toBe(null);
+                      invariant(elementType != null, '');
+                      return elementType;
+                    }
+
+                    PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
+                      it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
+                        const elementType = parseArrayElementType(
+                          'prop',
+                          FLOW_TYPE,
+                        );
+                        expect(elementType.type).toBe(PARSED_TYPE_NAME);
+                      });
+                    });
+
+                    RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
+                      it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
+                        const elementType = parseArrayElementType(
+                          'prop',
+                          FLOW_TYPE,
+                        );
+                        expect(elementType.type).toBe(
+                          'ReservedFunctionValueTypeAnnotation',
+                        );
+                        invariant(
+                          elementType.type ===
+                            'ReservedFunctionValueTypeAnnotation',
+                          '',
+                        );
+
+                        expect(elementType.name).toBe(FLOW_TYPE);
+                      });
+                    });
+
+                    it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<Object>'`, () => {
+                      const elementType = parseArrayElementType(
+                        'prop',
+                        'Object',
+                      );
+                      expect(elementType).not.toBe(null);
+                      expect(elementType.type).toBe(
+                        'GenericObjectTypeAnnotation',
+                      );
+                    });
+
+                    it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type of some array of an aliase`, () => {
+                      const elementType = parseArrayElementType(
+                        'prop',
+                        'Animal',
+                      );
+                      expect(elementType.type).toBe('TypeAliasTypeAnnotation');
+                      invariant(
+                        elementType.type === 'TypeAliasTypeAnnotation',
+                        '',
+                      );
+                      expect(elementType.name).toBe('Animal');
+                    });
+
+                    it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<{|foo: ?string|}>'`, () => {
+                      const elementType = parseArrayElementType(
+                        'prop',
+                        '{|foo: ?string|}',
+                      );
+                      expect(elementType.type).toBe('ObjectTypeAnnotation');
+                      invariant(
+                        elementType.type === 'ObjectTypeAnnotation',
+                        '',
+                      );
+
+                      const {properties} = elementType;
+                      invariant(properties != null, '');
+                      expect(properties).not.toBe(null);
+                      expect(properties[0]).not.toBe(null);
+                      expect(properties[0].name).toBe('foo');
+                      expect(properties[0].optional).toBe(false);
+
+                      expect(properties[0].typeAnnotation).not.toBe(null);
+                      invariant(properties[0].typeAnnotation != null, '');
+
+                      expect(properties[0].typeAnnotation.type).toBe(
+                        'StringTypeAnnotation',
+                      );
+                      expect(properties[0].typeAnnotation.nullable).toBe(true);
+                    });
+                  });
+
+                  it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of '{|foo: ?string|}'`, () => {
+                    const property = parseObjectLiteralReturnTypeProp(
+                      'prop',
+                      '{|foo: ?string|}',
+                    );
+
+                    expect(property.typeAnnotation.type).toBe(
+                      'ObjectTypeAnnotation',
+                    );
+                    invariant(
+                      property.typeAnnotation.type === 'ObjectTypeAnnotation',
+                      '',
+                    );
+
+                    const {properties} = property.typeAnnotation;
+
+                    expect(properties).not.toBe(null);
+                    invariant(properties != null, '');
+
+                    expect(properties[0]).not.toBe(null);
+                    expect(properties[0].name).toBe('foo');
+                    expect(properties[0].optional).toBe(false);
+
+                    expect(properties[0].typeAnnotation).not.toBe(null);
+                    invariant(properties[0].typeAnnotation != null, '');
+
+                    expect(properties[0].typeAnnotation.type).toBe(
+                      'StringTypeAnnotation',
+                    );
+                    expect(properties[0].typeAnnotation.nullable).toBe(true);
+                  });
+
+                  it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of some type alias`, () => {
+                    const property = parseObjectLiteralReturnTypeProp(
+                      'prop',
+                      'Animal',
+                    );
+
+                    expect(property.typeAnnotation.type).toBe(
+                      'TypeAliasTypeAnnotation',
+                    );
+                    invariant(
+                      property.typeAnnotation.type ===
+                        'TypeAliasTypeAnnotation',
+                      '',
+                    );
+
+                    expect(property.typeAnnotation.name).toBe('Animal');
+                  });
+                },
+              );
+            });
+          });
+        },
+      );
+    });
+  });
+});
+
+function parseModule(source) {
+  const schema = parseString(source, `Native${MODULE_NAME}.js`);
+  const {nativeModules} = schema.modules.NativeFoo;
+  invariant(
+    nativeModules,
+    "'nativeModules' in Spec NativeFoo shouldn't be null",
+  );
+  return nativeModules.Foo;
+}
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
similarity index 100%
rename from packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-test.js
rename to packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js

From 572e1da889f2db46360c8673a6b581950384240e Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 116/241] Fix type alias nullability resolution in module
 parser
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Consider this case:

```
type Animal = ?{|
  name: string,
|};

type B = Animal

export interface Spec extends TurboModule {
  +greet: (animal: B) => void;
}
```

The generated output for this spec is:

```
namespace JS {
  namespace NativeSampleTurboModule {
    struct Animal {
      NSString *name() const;

      Animal(NSDictionary *const v) : _v(v) {}
    private:
      NSDictionary *_v;
    };
  }
}

protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
- (void)greet:(JS::NativeSampleTurboModule::Animal &)animal;
end
```

Observations:
  1. The codegen looks as though we wrote `+greet: (animal: ?Animal) => void;` as opposed to `+greet: (animal: B) => void;`
  2. The generated struct is called `Animal`, not `B`.

## After this diff
Whenever we detect a usage of a type alias, we recursively resolve it, keeping a track of whether the resolution will be nullable. In this example, we follow B to Animal, and then Animal to ?{|name: string|}.

Then, we:
  1. Replace the `B` in `+greet: (animal: B) => void;` with `?Animal`,
  2. Pretend that `Animal = {|name: string|}`.

Why do we make all type alias RHSs required?
 2. This design is simpler than managing nullability in both the type alias usage, and the type alias RHS.
 3. What does it mean for a C++ struct, which is what this type alias RHS will generate, to be nullable? ¯\_(ツ)_/¯. Nullability is a concept that only makes sense when talking about instances (i.e: usages) of the C++ structs. Hence, it's better to manage nullability within the actual TypeAliasTypeAnnotation nodes, and not the associated ObjectTypeAnnotations.

## Other Changes
- Whenever we use the `Animal` type-alias, the e2e jest tests validate that the type alias exists in the module schema.

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23225934

fbshipit-source-id: 8316dea2ec6e2d50cad90e178963c6264044f7b7
---
 .../react-native-codegen/src/CodegenSchema.js |  20 +-
 .../__tests__/module-parser-e2e-test.js       | 243 +++++++++++++-----
 .../src/parsers/flow/modules/index.js         |  75 ++++--
 .../src/parsers/flow/utils.js                 |  23 +-
 4 files changed, 258 insertions(+), 103 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 425662967a2c6e..f0d8d30d14d512 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -266,7 +266,11 @@ export type NativeModuleSchema = $ReadOnly<{|
 |}>;
 
 export type NativeModuleAliasMap = {
-  [aliasName: string]: NativeModuleObjectTypeAnnotation,
+  [aliasName: string]: $ReadOnly<{|
+    type: 'ObjectTypeAnnotation',
+    properties: $ReadOnlyArray<NativeModuleObjectTypeAnnotationPropertySchema>,
+    nullable: false,
+  |}>,
 };
 
 export type NativeModulePropertySchema = $ReadOnly<{|
@@ -290,16 +294,16 @@ export type NativeModuleFunctionTypeAnnotation = $ReadOnly<{|
 
 export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
   type: 'ObjectTypeAnnotation',
-  properties: $ReadOnlyArray<
-    $ReadOnly<{|
-      optional: boolean,
-      name: string,
-      typeAnnotation: NativeModuleParamTypeAnnotation,
-    |}>,
-  >,
+  properties: $ReadOnlyArray<NativeModuleObjectTypeAnnotationPropertySchema>,
   nullable: boolean,
 |}>;
 
+export type NativeModuleObjectTypeAnnotationPropertySchema = $ReadOnly<{|
+  optional: boolean,
+  name: string,
+  typeAnnotation: NativeModuleBaseTypeAnnotation,
+|}>;
+
 export type NativeModuleBaseTypeAnnotation =
   | $ReadOnly<{|
       type: 'StringTypeAnnotation',
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
index 734e456922f510..e4647258fe32e3 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
@@ -8,7 +8,10 @@
  * @format
  */
 
-import type {ReservedFunctionValueTypeName} from '../../../../CodegenSchema';
+import type {
+  ReservedFunctionValueTypeName,
+  NativeModuleSchema,
+} from '../../../../CodegenSchema';
 const {parseString} = require('../../index.js');
 const {
   FlowGenericNotTypeParameterizedParserError,
@@ -41,6 +44,30 @@ const RESERVED_FUNCTION_VALUE_TYPE_NAME: $ReadOnlyArray<ReservedFunctionValueTyp
 
 const MODULE_NAME = 'Foo';
 
+const TYPE_ALIAS_DECLARATIONS = `
+type Animal = {|
+  name: string,
+|};
+
+type AnimalPointer = Animal;
+`;
+
+function expectAnimalTypeAliasToExist(module: NativeModuleSchema) {
+  const animalAlias = module.aliases.Animal;
+
+  expect(animalAlias).not.toBe(null);
+  invariant(animalAlias != null, '');
+  expect(animalAlias.type).toBe('ObjectTypeAnnotation');
+  expect(animalAlias.nullable).toBe(false);
+  expect(animalAlias.properties.length).toBe(1);
+  expect(animalAlias.properties[0].name).toBe('name');
+  expect(animalAlias.properties[0].optional).toBe(false);
+  expect(animalAlias.properties[0].typeAnnotation.type).toBe(
+    'StringTypeAnnotation',
+  );
+  expect(animalAlias.properties[0].typeAnnotation.nullable).toBe(false);
+}
+
 describe('Flow Module Parser', () => {
   describe('Parameter Parsing', () => {
     it("should fail parsing when a method has an parameter of type 'any'", () => {
@@ -111,9 +138,7 @@ describe('Flow Module Parser', () => {
           import type {TurboModule} from 'RCTExport';
           import * as TurboModuleRegistry from 'TurboModuleRegistry';
 
-          type Animal = {|
-            name: string,
-          |};
+          ${TYPE_ALIAS_DECLARATIONS}
 
           export interface Spec extends TurboModule {
             +useArg(${annotateArg(paramName, paramType)}): void;
@@ -128,7 +153,7 @@ describe('Flow Module Parser', () => {
         expect(param.optional).toBe(optional);
         expect(param.typeAnnotation.nullable).toBe(nullable);
 
-        return param;
+        return [param, module];
       }
 
       describe(
@@ -149,14 +174,14 @@ describe('Flow Module Parser', () => {
           describe('Primitive types', () => {
             PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
               it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} primitive parameter of type '${FLOW_TYPE}'`, () => {
-                const param = parseParamType('arg', FLOW_TYPE);
+                const [param] = parseParamType('arg', FLOW_TYPE);
                 expect(param.typeAnnotation.type).toBe(PARSED_TYPE_NAME);
               });
             });
           });
 
           it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Object'`, () => {
-            const param = parseParamType('arg', 'Object');
+            const [param] = parseParamType('arg', 'Object');
             expect(param.typeAnnotation.type).toBe(
               'GenericObjectTypeAnnotation',
             );
@@ -165,7 +190,7 @@ describe('Flow Module Parser', () => {
           describe('Reserved Types', () => {
             RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
               it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of reserved type '${FLOW_TYPE}'`, () => {
-                const param = parseParamType('arg', FLOW_TYPE);
+                const [param] = parseParamType('arg', FLOW_TYPE);
 
                 expect(param.typeAnnotation.type).toBe(
                   'ReservedFunctionValueTypeAnnotation',
@@ -195,7 +220,10 @@ describe('Flow Module Parser', () => {
               paramName: string,
               paramType: string,
             ) {
-              const param = parseParamType(paramName, `Array<${paramType}>`);
+              const [param, module] = parseParamType(
+                paramName,
+                `Array<${paramType}>`,
+              );
 
               expect(param.typeAnnotation.type).toBe('ArrayTypeAnnotation');
               invariant(
@@ -205,7 +233,7 @@ describe('Flow Module Parser', () => {
 
               expect(param.typeAnnotation.elementType).not.toBe(null);
               invariant(param.typeAnnotation.elementType != null, '');
-              return param.typeAnnotation.elementType;
+              return [param.typeAnnotation.elementType, module];
             }
 
             // TODO: Do we support nullable element types?
@@ -213,7 +241,7 @@ describe('Flow Module Parser', () => {
             describe('Primitive Element Types', () => {
               PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
                 it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<${FLOW_TYPE}>'`, () => {
-                  const elementType = parseParamArrayElementType(
+                  const [elementType] = parseParamArrayElementType(
                     'arg',
                     FLOW_TYPE,
                   );
@@ -225,7 +253,7 @@ describe('Flow Module Parser', () => {
             describe('Reserved Element Types', () => {
               RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
                 it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<${FLOW_TYPE}>'`, () => {
-                  const elementType = parseParamArrayElementType(
+                  const [elementType] = parseParamArrayElementType(
                     'arg',
                     FLOW_TYPE,
                   );
@@ -243,20 +271,24 @@ describe('Flow Module Parser', () => {
             });
 
             it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<Object>'`, () => {
-              const elementType = parseParamArrayElementType('arg', 'Object');
+              const [elementType] = parseParamArrayElementType('arg', 'Object');
               expect(elementType.type).toBe('GenericObjectTypeAnnotation');
             });
 
             it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some array of an alias`, () => {
-              const elementType = parseParamArrayElementType('arg', 'Animal');
+              const [elementType, module] = parseParamArrayElementType(
+                'arg',
+                'Animal',
+              );
               expect(elementType.type).toBe('TypeAliasTypeAnnotation');
               invariant(elementType.type === 'TypeAliasTypeAnnotation', '');
 
               expect(elementType.name).toBe('Animal');
+              expectAnimalTypeAliasToExist(module);
             });
 
             it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Array<{|foo: ?string|}>'`, () => {
-              const elementType = parseParamArrayElementType(
+              const [elementType] = parseParamArrayElementType(
                 'arg',
                 '{|foo: ?string|}',
               );
@@ -281,7 +313,7 @@ describe('Flow Module Parser', () => {
           });
 
           it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some type alias`, () => {
-            const param = parseParamType('arg', 'Animal');
+            const [param, module] = parseParamType('arg', 'Animal');
             expect(param.typeAnnotation.type).toBe('TypeAliasTypeAnnotation');
             invariant(
               param.typeAnnotation.type === 'TypeAliasTypeAnnotation',
@@ -289,6 +321,54 @@ describe('Flow Module Parser', () => {
             );
 
             expect(param.typeAnnotation.name).toBe('Animal');
+            expectAnimalTypeAliasToExist(module);
+          });
+
+          it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some type alias that points to another type alias`, () => {
+            const [param, module] = parseParamType('arg', 'AnimalPointer');
+            expect(param.typeAnnotation.type).toBe('TypeAliasTypeAnnotation');
+            invariant(
+              param.typeAnnotation.type === 'TypeAliasTypeAnnotation',
+              '',
+            );
+
+            expect(param.typeAnnotation.name).toBe('Animal');
+            expectAnimalTypeAliasToExist(module);
+          });
+
+          it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some type alias that points to another nullable type alias`, () => {
+            const module = parseModule(`
+              import type {TurboModule} from 'RCTExport';
+              import * as TurboModuleRegistry from 'TurboModuleRegistry';
+
+              type Animal = ?{|
+                name: string,
+              |};
+
+              type AnimalPointer = Animal;
+
+              export interface Spec extends TurboModule {
+                +useArg(${annotateArg('arg', 'AnimalPointer')}): void;
+              }
+              export default TurboModuleRegistry.get<Spec>('Foo');
+            `);
+
+            expect(module.properties[0]).not.toBe(null);
+            const param = module.properties[0].typeAnnotation.params[0];
+            expect(param.name).toBe('arg');
+            expect(param.optional).toBe(optional);
+
+            // The TypeAliasAnnotation is called Animal, and is nullable
+            expect(param.typeAnnotation.type).toBe('TypeAliasTypeAnnotation');
+            invariant(
+              param.typeAnnotation.type === 'TypeAliasTypeAnnotation',
+              '',
+            );
+            expect(param.typeAnnotation.name).toBe('Animal');
+            expect(param.typeAnnotation.nullable).toBe(true);
+
+            // The Animal type alias RHS is valid, and non-null
+            expectAnimalTypeAliasToExist(module);
           });
 
           [
@@ -323,7 +403,7 @@ describe('Flow Module Parser', () => {
               propName: string,
               propType: string,
             ) {
-              const param = parseParamType(
+              const [param, module] = parseParamType(
                 'arg',
                 `{|${annotateProp(propName, propType)}|}`,
               );
@@ -348,10 +428,13 @@ describe('Flow Module Parser', () => {
               );
               invariant(properties[0].typeAnnotation != null, '');
 
-              return {
-                ...properties[0],
-                typeAnnotation: properties[0].typeAnnotation,
-              };
+              return [
+                {
+                  ...properties[0],
+                  typeAnnotation: properties[0].typeAnnotation,
+                },
+                module,
+              ];
             }
 
             describe(
@@ -366,7 +449,7 @@ describe('Flow Module Parser', () => {
                 describe('Props with Primitive Types', () => {
                   PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
                     it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of primitive type '${FLOW_TYPE}'`, () => {
-                      const prop = parseParamTypeObjectLiteralProp(
+                      const [prop] = parseParamTypeObjectLiteralProp(
                         'prop',
                         FLOW_TYPE,
                       );
@@ -376,7 +459,7 @@ describe('Flow Module Parser', () => {
                 });
 
                 it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Object'`, () => {
-                  const prop = parseParamTypeObjectLiteralProp(
+                  const [prop] = parseParamTypeObjectLiteralProp(
                     'prop',
                     'Object',
                   );
@@ -388,7 +471,7 @@ describe('Flow Module Parser', () => {
                 describe('Props with Reserved Types', () => {
                   RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
                     it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of reserved type '${FLOW_TYPE}'`, () => {
-                      const prop = parseParamTypeObjectLiteralProp(
+                      const [prop] = parseParamTypeObjectLiteralProp(
                         'prop',
                         FLOW_TYPE,
                       );
@@ -422,7 +505,7 @@ describe('Flow Module Parser', () => {
                     propName: string,
                     arrayElementType: string,
                   ) {
-                    const property = parseParamTypeObjectLiteralProp(
+                    const [property, module] = parseParamTypeObjectLiteralProp(
                       'propName',
                       `Array<${arrayElementType}>`,
                     );
@@ -437,12 +520,12 @@ describe('Flow Module Parser', () => {
                     const {elementType} = property.typeAnnotation;
                     expect(elementType).not.toBe(null);
                     invariant(elementType != null, '');
-                    return elementType;
+                    return [elementType, module];
                   }
 
                   PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
                     it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
-                      const elementType = parseArrayElementType(
+                      const [elementType] = parseArrayElementType(
                         'prop',
                         FLOW_TYPE,
                       );
@@ -453,7 +536,7 @@ describe('Flow Module Parser', () => {
 
                   RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
                     it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
-                      const elementType = parseArrayElementType(
+                      const [elementType] = parseArrayElementType(
                         'prop',
                         FLOW_TYPE,
                       );
@@ -471,14 +554,20 @@ describe('Flow Module Parser', () => {
                   });
 
                   it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<Object>'`, () => {
-                    const elementType = parseArrayElementType('prop', 'Object');
+                    const [elementType] = parseArrayElementType(
+                      'prop',
+                      'Object',
+                    );
                     expect(elementType.type).toBe(
                       'GenericObjectTypeAnnotation',
                     );
                   });
 
-                  it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type of some array of an aliase`, () => {
-                    const elementType = parseArrayElementType('prop', 'Animal');
+                  it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type of some array of an alias`, () => {
+                    const [elementType, module] = parseArrayElementType(
+                      'prop',
+                      'Animal',
+                    );
 
                     expect(elementType.type).toBe('TypeAliasTypeAnnotation');
                     invariant(
@@ -487,10 +576,11 @@ describe('Flow Module Parser', () => {
                     );
 
                     expect(elementType.name).toBe('Animal');
+                    expectAnimalTypeAliasToExist(module);
                   });
 
                   it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of 'Array<{|foo: ?string|}>'`, () => {
-                    const elementType = parseArrayElementType(
+                    const [elementType] = parseArrayElementType(
                       'prop',
                       '{|foo: ?string|}',
                     );
@@ -514,7 +604,7 @@ describe('Flow Module Parser', () => {
                 });
 
                 it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type '{|foo: ?string|}'`, () => {
-                  const property = parseParamTypeObjectLiteralProp(
+                  const [property] = parseParamTypeObjectLiteralProp(
                     'prop',
                     '{|foo: ?string|}',
                   );
@@ -542,7 +632,7 @@ describe('Flow Module Parser', () => {
                 });
 
                 it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of some type alias`, () => {
-                  const property = parseParamTypeObjectLiteralProp(
+                  const [property, module] = parseParamTypeObjectLiteralProp(
                     'prop',
                     'Animal',
                   );
@@ -556,6 +646,7 @@ describe('Flow Module Parser', () => {
                   );
 
                   expect(property.typeAnnotation.name).toBe('Animal');
+                  expectAnimalTypeAliasToExist(module);
                 });
               },
             );
@@ -594,9 +685,9 @@ describe('Flow Module Parser', () => {
         const module = parseModule(`
           import type {TurboModule} from 'RCTExport';
           import * as TurboModuleRegistry from 'TurboModuleRegistry';
-          type Animal = {|
-            name: string,
-          |};
+
+          ${TYPE_ALIAS_DECLARATIONS}
+
           export interface Spec extends TurboModule {
             +useArg(): ${annotateRet(flowType)};
           }
@@ -607,7 +698,7 @@ describe('Flow Module Parser', () => {
         const {returnTypeAnnotation} = module.properties[0].typeAnnotation;
         expect(returnTypeAnnotation).not.toBe(null);
         expect(returnTypeAnnotation.nullable).toBe(IS_RETURN_TYPE_NULLABLE);
-        return returnTypeAnnotation;
+        return [returnTypeAnnotation, module];
       }
 
       describe(
@@ -616,7 +707,7 @@ describe('Flow Module Parser', () => {
           ['Promise<void>', 'Promise<{||}>', 'Promise<*>'].forEach(
             promiseFlowType => {
               it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type '${promiseFlowType}'`, () => {
-                const returnTypeAnnotation = parseReturnType(promiseFlowType);
+                const [returnTypeAnnotation] = parseReturnType(promiseFlowType);
                 expect(returnTypeAnnotation.type).toBe(
                   'GenericPromiseTypeAnnotation',
                 );
@@ -627,7 +718,7 @@ describe('Flow Module Parser', () => {
           describe('Primitive Types', () => {
             PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
               it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} primitive return of type '${FLOW_TYPE}'`, () => {
-                const returnTypeAnnotation = parseReturnType(FLOW_TYPE);
+                const [returnTypeAnnotation] = parseReturnType(FLOW_TYPE);
                 expect(returnTypeAnnotation.type).toBe(PARSED_TYPE_NAME);
               });
             });
@@ -636,7 +727,7 @@ describe('Flow Module Parser', () => {
           describe('Reserved Types', () => {
             RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
               it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} reserved return of type '${FLOW_TYPE}'`, () => {
-                const returnTypeAnnotation = parseReturnType(FLOW_TYPE);
+                const [returnTypeAnnotation] = parseReturnType(FLOW_TYPE);
                 expect(returnTypeAnnotation.type).toBe(
                   'ReservedFunctionValueTypeAnnotation',
                 );
@@ -661,7 +752,7 @@ describe('Flow Module Parser', () => {
             });
 
             function parseArrayElementReturnType(flowType: string) {
-              const returnTypeAnnotation = parseReturnType(
+              const [returnTypeAnnotation, module] = parseReturnType(
                 'Array' + (flowType != null ? `<${flowType}>` : ''),
               );
               expect(returnTypeAnnotation.type).toBe('ArrayTypeAnnotation');
@@ -673,7 +764,7 @@ describe('Flow Module Parser', () => {
               const {elementType} = returnTypeAnnotation;
               expect(elementType).not.toBe(null);
               invariant(elementType != null, '');
-              return elementType;
+              return [elementType, module];
             }
 
             // TODO: Do we support nullable element types?
@@ -681,7 +772,9 @@ describe('Flow Module Parser', () => {
             describe('Primitive Element Types', () => {
               PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
                 it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<${FLOW_TYPE}>'`, () => {
-                  const elementType = parseArrayElementReturnType(FLOW_TYPE);
+                  const [elementType, module] = parseArrayElementReturnType(
+                    FLOW_TYPE,
+                  );
                   expect(elementType.type).toBe(PARSED_TYPE_NAME);
                 });
               });
@@ -690,7 +783,7 @@ describe('Flow Module Parser', () => {
             describe('Reserved Element Types', () => {
               RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
                 it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<${FLOW_TYPE}>'`, () => {
-                  const elementType = parseArrayElementReturnType(FLOW_TYPE);
+                  const [elementType] = parseArrayElementReturnType(FLOW_TYPE);
                   expect(elementType.type).toBe(
                     'ReservedFunctionValueTypeAnnotation',
                   );
@@ -705,19 +798,22 @@ describe('Flow Module Parser', () => {
             });
 
             it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<Object>'`, () => {
-              const elementType = parseArrayElementReturnType('Object');
+              const [elementType] = parseArrayElementReturnType('Object');
               expect(elementType.type).toBe('GenericObjectTypeAnnotation');
             });
 
-            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of some array of an aliase`, () => {
-              const elementType = parseArrayElementReturnType('Animal');
+            it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of some array of an alias`, () => {
+              const [elementType, module] = parseArrayElementReturnType(
+                'Animal',
+              );
               expect(elementType.type).toBe('TypeAliasTypeAnnotation');
               invariant(elementType.type === 'TypeAliasTypeAnnotation', '');
               expect(elementType.name).toBe('Animal');
+              expectAnimalTypeAliasToExist(module);
             });
 
             it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Array<{|foo: ?string|}>'`, () => {
-              const elementType = parseArrayElementReturnType(
+              const [elementType] = parseArrayElementReturnType(
                 '{|foo: ?string|}',
               );
               expect(elementType.type).toBe('ObjectTypeAnnotation');
@@ -739,13 +835,14 @@ describe('Flow Module Parser', () => {
           });
 
           it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of some type alias`, () => {
-            const returnTypeAnnotation = parseReturnType('Animal');
+            const [returnTypeAnnotation, module] = parseReturnType('Animal');
             expect(returnTypeAnnotation.type).toBe('TypeAliasTypeAnnotation');
             invariant(
               returnTypeAnnotation.type === 'TypeAliasTypeAnnotation',
               '',
             );
             expect(returnTypeAnnotation.name).toBe('Animal');
+            expectAnimalTypeAliasToExist(module);
           });
 
           it(`should not parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Function'`, () => {
@@ -755,7 +852,7 @@ describe('Flow Module Parser', () => {
           });
 
           it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type 'Object'`, () => {
-            const returnTypeAnnotation = parseReturnType('Object');
+            const [returnTypeAnnotation] = parseReturnType('Object');
             expect(returnTypeAnnotation.type).toBe(
               'GenericObjectTypeAnnotation',
             );
@@ -765,7 +862,7 @@ describe('Flow Module Parser', () => {
             // TODO: Inexact vs exact object literals?
 
             it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an empty object literal`, () => {
-              const returnTypeAnnotation = parseReturnType('{||}');
+              const [returnTypeAnnotation] = parseReturnType('{||}');
               expect(returnTypeAnnotation.type).toBe('ObjectTypeAnnotation');
               invariant(
                 returnTypeAnnotation.type === 'ObjectTypeAnnotation',
@@ -809,7 +906,7 @@ describe('Flow Module Parser', () => {
                 propName: string,
                 propType: string,
               ) {
-                const returnTypeAnnotation = parseReturnType(
+                const [returnTypeAnnotation, module] = parseReturnType(
                   `{|${annotateProp(propName, propType)}|}`,
                 );
                 expect(returnTypeAnnotation.type).toBe('ObjectTypeAnnotation');
@@ -831,10 +928,13 @@ describe('Flow Module Parser', () => {
                 expect(property.typeAnnotation).not.toBe(null);
                 expect(property.typeAnnotation?.nullable).toBe(nullable);
                 invariant(property.typeAnnotation != null, '');
-                return {
-                  ...property,
-                  typeAnnotation: property.typeAnnotation,
-                };
+                return [
+                  {
+                    ...property,
+                    typeAnnotation: property.typeAnnotation,
+                  },
+                  module,
+                ];
               }
 
               describe(
@@ -853,7 +953,7 @@ describe('Flow Module Parser', () => {
                   describe('Props with Primitive Types', () => {
                     PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
                       it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of primitive type '${FLOW_TYPE}'`, () => {
-                        const property = parseObjectLiteralReturnTypeProp(
+                        const [property] = parseObjectLiteralReturnTypeProp(
                           'prop',
                           FLOW_TYPE,
                         );
@@ -865,7 +965,7 @@ describe('Flow Module Parser', () => {
                   });
 
                   it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Object'`, () => {
-                    const property = parseObjectLiteralReturnTypeProp(
+                    const [property] = parseObjectLiteralReturnTypeProp(
                       'prop',
                       'Object',
                     );
@@ -878,7 +978,7 @@ describe('Flow Module Parser', () => {
                   describe('Props with Reserved Types', () => {
                     RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
                       it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of reserved type '${FLOW_TYPE}'`, () => {
-                        const property = parseObjectLiteralReturnTypeProp(
+                        const [property] = parseObjectLiteralReturnTypeProp(
                           'prop',
                           FLOW_TYPE,
                         );
@@ -913,7 +1013,10 @@ describe('Flow Module Parser', () => {
                       propName: string,
                       arrayElementType: string,
                     ) {
-                      const property = parseObjectLiteralReturnTypeProp(
+                      const [
+                        property,
+                        module,
+                      ] = parseObjectLiteralReturnTypeProp(
                         propName,
                         `Array<${arrayElementType}>`,
                       );
@@ -929,12 +1032,12 @@ describe('Flow Module Parser', () => {
                       const {elementType} = property.typeAnnotation;
                       expect(elementType).not.toBe(null);
                       invariant(elementType != null, '');
-                      return elementType;
+                      return [elementType, module];
                     }
 
                     PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
                       it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
-                        const elementType = parseArrayElementType(
+                        const [elementType] = parseArrayElementType(
                           'prop',
                           FLOW_TYPE,
                         );
@@ -944,7 +1047,7 @@ describe('Flow Module Parser', () => {
 
                     RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
                       it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type 'Array<${FLOW_TYPE}>'`, () => {
-                        const elementType = parseArrayElementType(
+                        const [elementType] = parseArrayElementType(
                           'prop',
                           FLOW_TYPE,
                         );
@@ -962,7 +1065,7 @@ describe('Flow Module Parser', () => {
                     });
 
                     it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<Object>'`, () => {
-                      const elementType = parseArrayElementType(
+                      const [elementType] = parseArrayElementType(
                         'prop',
                         'Object',
                       );
@@ -973,7 +1076,7 @@ describe('Flow Module Parser', () => {
                     });
 
                     it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type of some array of an aliase`, () => {
-                      const elementType = parseArrayElementType(
+                      const [elementType, module] = parseArrayElementType(
                         'prop',
                         'Animal',
                       );
@@ -983,10 +1086,11 @@ describe('Flow Module Parser', () => {
                         '',
                       );
                       expect(elementType.name).toBe('Animal');
+                      expectAnimalTypeAliasToExist(module);
                     });
 
                     it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of type  'Array<{|foo: ?string|}>'`, () => {
-                      const elementType = parseArrayElementType(
+                      const [elementType] = parseArrayElementType(
                         'prop',
                         '{|foo: ?string|}',
                       );
@@ -1014,7 +1118,7 @@ describe('Flow Module Parser', () => {
                   });
 
                   it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of '{|foo: ?string|}'`, () => {
-                    const property = parseObjectLiteralReturnTypeProp(
+                    const [property] = parseObjectLiteralReturnTypeProp(
                       'prop',
                       '{|foo: ?string|}',
                     );
@@ -1046,7 +1150,7 @@ describe('Flow Module Parser', () => {
                   });
 
                   it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of some type alias`, () => {
-                    const property = parseObjectLiteralReturnTypeProp(
+                    const [property, module] = parseObjectLiteralReturnTypeProp(
                       'prop',
                       'Animal',
                     );
@@ -1061,6 +1165,7 @@ describe('Flow Module Parser', () => {
                     );
 
                     expect(property.typeAnnotation.name).toBe('Animal');
+                    expectAnimalTypeAliasToExist(module);
                   });
                 },
               );
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index 98dc32c5abdba1..31de4e511f8e85 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -40,10 +40,11 @@ function translateTypeAnnotation(
   types: TypeDeclarationMap,
   aliasMap: NativeModuleAliasMap,
 ): NativeModuleTypeAnnotation {
-  const {nullable, typeAnnotation} = resolveTypeAnnotation(
-    flowTypeAnnotation,
-    types,
-  );
+  const {
+    nullable,
+    typeAnnotation,
+    typeAliasResolutionStatus,
+  } = resolveTypeAnnotation(flowTypeAnnotation, types);
 
   switch (typeAnnotation.type) {
     case 'GenericTypeAnnotation': {
@@ -161,8 +162,7 @@ function translateTypeAnnotation(
       }
     }
     case 'ObjectTypeAnnotation': {
-      const objectTypeAnnotation = {
-        nullable,
+      const objectTypeAnnotationPartial = {
         type: 'ObjectTypeAnnotation',
         properties: typeAnnotation.properties.map(property => {
           const {optional} = property;
@@ -179,30 +179,55 @@ function translateTypeAnnotation(
         }),
       };
 
-      if (flowTypeAnnotation.type === 'GenericTypeAnnotation') {
-        aliasMap[flowTypeAnnotation.id.name] = objectTypeAnnotation;
+      if (!typeAliasResolutionStatus.successful) {
         return {
-          nullable: false,
-          type: 'TypeAliasTypeAnnotation',
-          name: flowTypeAnnotation.id.name,
+          nullable,
+          ...objectTypeAnnotationPartial,
         };
       }
 
-      if (
-        flowTypeAnnotation.type === 'NullableTypeAnnotation' &&
-        flowTypeAnnotation.typeAnnotation.type === 'GenericTypeAnnotation'
-      ) {
-        aliasMap[
-          flowTypeAnnotation.typeAnnotation.id.name
-        ] = objectTypeAnnotation;
-        return {
-          nullable: true,
-          type: 'TypeAliasTypeAnnotation',
-          name: flowTypeAnnotation.typeAnnotation.id.name,
-        };
-      }
+      /**
+       * All aliases RHS are required.
+       */
+      aliasMap[typeAliasResolutionStatus.aliasName] = {
+        nullable: false,
+        ...objectTypeAnnotationPartial,
+      };
 
-      return objectTypeAnnotation;
+      /**
+       * Nullability of type aliases is transitive.
+       *
+       * Consider this case:
+       *
+       * type Animal = ?{|
+       *   name: string,
+       * |};
+       *
+       * type B = Animal
+       *
+       * export interface Spec extends TurboModule {
+       *   +greet: (animal: B) => void;
+       * }
+       *
+       * In this case, we follow B to Animal, and then Animal to ?{|name: string|}.
+       *
+       * We:
+       *   1. Replace `+greet: (animal: B) => void;` with `+greet: (animal: ?Animal) => void;`,
+       *   2. Pretend that Animal = {|name: string|}.
+       *
+       * Why do we do this?
+       *  1. In ObjC, we need to generate a struct called Animal, not B.
+       *  2. This design is simpler than managing nullability within both the type alias usage, and the type alias RHS.
+       *  3. What does it mean for a C++ struct, which is what this type alias RHS will generate, to be nullable? ¯\_(ツ)_/¯
+       *     Nullability is a concept that only makes sense when talking about instances (i.e: usages) of the C++ structs.
+       *     Hence, it's better to manage nullability within the actual TypeAliasTypeAnnotation nodes, and not the
+       *     associated ObjectTypeAnnotations.
+       */
+      return {
+        nullable: nullable,
+        type: 'TypeAliasTypeAnnotation',
+        name: typeAliasResolutionStatus.aliasName,
+      };
     }
     case 'BooleanTypeAnnotation': {
       return {
diff --git a/packages/react-native-codegen/src/parsers/flow/utils.js b/packages/react-native-codegen/src/parsers/flow/utils.js
index 87ec1894c068db..15b13c5949975a 100644
--- a/packages/react-native-codegen/src/parsers/flow/utils.js
+++ b/packages/react-native-codegen/src/parsers/flow/utils.js
@@ -25,11 +25,24 @@ export type ASTNode = Object;
 
 const invariant = require('invariant');
 
+type TypeAliasResolutionStatus =
+  | $ReadOnly<{|
+      successful: true,
+      aliasName: string,
+    |}>
+  | $ReadOnly<{|
+      successful: false,
+    |}>;
+
 function resolveTypeAnnotation(
   // TODO(T71778680): This is an Flow TypeAnnotation. Flow-type this
   typeAnnotation: $FlowFixMe,
   types: TypeDeclarationMap,
-): {nullable: boolean, typeAnnotation: $FlowFixMe} {
+): {
+  nullable: boolean,
+  typeAnnotation: $FlowFixMe,
+  typeAliasResolutionStatus: TypeAliasResolutionStatus,
+} {
   invariant(
     typeAnnotation != null,
     'resolveTypeAnnotation(): typeAnnotation cannot be null',
@@ -37,12 +50,19 @@ function resolveTypeAnnotation(
 
   let node = typeAnnotation;
   let nullable = false;
+  let typeAliasResolutionStatus: TypeAliasResolutionStatus = {
+    successful: false,
+  };
 
   for (;;) {
     if (node.type === 'NullableTypeAnnotation') {
       nullable = true;
       node = node.typeAnnotation;
     } else if (node.type === 'GenericTypeAnnotation') {
+      typeAliasResolutionStatus = {
+        successful: true,
+        aliasName: node.id.name,
+      };
       const resolvedTypeAnnotation = types[node.id.name];
       if (resolvedTypeAnnotation == null) {
         break;
@@ -61,6 +81,7 @@ function resolveTypeAnnotation(
   return {
     nullable: nullable,
     typeAnnotation: node,
+    typeAliasResolutionStatus,
   };
 }
 

From 1194a36efa286469284481b945cb1a165d368f69 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 117/241] Export module type annotations from CodegenSchema

Summary:
This diff has a few changes:
- All type annotations are now declared top-level, and exported from `CodegenSchema.js`.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23616473

fbshipit-source-id: 1509c304305e56674bd76c44bc49f755dfeaa332
---
 .../react-native-codegen/src/CodegenSchema.js | 156 +++++++++++-------
 1 file changed, 92 insertions(+), 64 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index f0d8d30d14d512..2b26e7c0844814 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -258,6 +258,10 @@ export type SchemaType = $ReadOnly<{|
 
 /**
  * NativeModule Types
+ *
+ * TODO(T71923114): Remove nullable from NativeModule type annotations.
+ * This is necessary for us to start unifying the notion of a "type
+ * annotation" across the codegen schema as a whole.
  */
 export type NativeModuleSchema = $ReadOnly<{|
   // We only support aliases to Objects
@@ -279,12 +283,6 @@ export type NativeModulePropertySchema = $ReadOnly<{|
   typeAnnotation: NativeModuleFunctionTypeAnnotation,
 |}>;
 
-export type NativeModuleMethodParamSchema = $ReadOnly<{|
-  name: string,
-  optional: boolean,
-  typeAnnotation: NativeModuleParamTypeAnnotation,
-|}>;
-
 export type NativeModuleFunctionTypeAnnotation = $ReadOnly<{|
   type: 'FunctionTypeAnnotation',
   params: $ReadOnlyArray<NativeModuleMethodParamSchema>,
@@ -292,6 +290,12 @@ export type NativeModuleFunctionTypeAnnotation = $ReadOnly<{|
   nullable: boolean,
 |}>;
 
+export type NativeModuleMethodParamSchema = $ReadOnly<{|
+  name: string,
+  optional: boolean,
+  typeAnnotation: NativeModuleParamTypeAnnotation,
+|}>;
+
 export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
   type: 'ObjectTypeAnnotation',
   properties: $ReadOnlyArray<NativeModuleObjectTypeAnnotationPropertySchema>,
@@ -304,67 +308,86 @@ export type NativeModuleObjectTypeAnnotationPropertySchema = $ReadOnly<{|
   typeAnnotation: NativeModuleBaseTypeAnnotation,
 |}>;
 
+export type NativeModuleArrayTypeAnnotation = $ReadOnly<{|
+  type: 'ArrayTypeAnnotation',
+  /**
+   * TODO(T72031674): Migrate all our NativeModule specs to not use
+   * invalid Array ElementTypes. Then, make the elementType required.
+   */
+  elementType?: NativeModuleBaseTypeAnnotation,
+  nullable: boolean,
+|}>;
+
+export type NativeModuleStringTypeAnnotation = $ReadOnly<{|
+  type: 'StringTypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleNumberTypeAnnotation = $ReadOnly<{|
+  type: 'NumberTypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleInt32TypeAnnotation = $ReadOnly<{|
+  type: 'Int32TypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleDoubleTypeAnnotation = $ReadOnly<{|
+  type: 'DoubleTypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleFloatTypeAnnotation = $ReadOnly<{|
+  type: 'FloatTypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleBooleanTypeAnnotation = $ReadOnly<{|
+  type: 'BooleanTypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleGenericObjectTypeAnnotation = $ReadOnly<{|
+  type: 'GenericObjectTypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleReservedFunctionValueTypeAnnotation = $ReadOnly<{|
+  type: 'ReservedFunctionValueTypeAnnotation',
+  name: ReservedFunctionValueTypeName,
+  nullable: boolean,
+|}>;
+
+export type NativeModuleTypeAliasTypeAnnotation = $ReadOnly<{|
+  type: 'TypeAliasTypeAnnotation',
+  name: string,
+  nullable: boolean,
+|}>;
+
+export type NativeModulePromiseTypeAnnotation = $ReadOnly<{|
+  type: 'GenericPromiseTypeAnnotation',
+  nullable: boolean,
+|}>;
+
+export type NativeModuleVoidTypeAnnotation = $ReadOnly<{|
+  type: 'VoidTypeAnnotation',
+  nullable: boolean,
+|}>;
+
 export type NativeModuleBaseTypeAnnotation =
-  | $ReadOnly<{|
-      type: 'StringTypeAnnotation',
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'NumberTypeAnnotation',
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'Int32TypeAnnotation',
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'DoubleTypeAnnotation',
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'FloatTypeAnnotation',
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'BooleanTypeAnnotation',
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'GenericObjectTypeAnnotation',
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'ReservedFunctionValueTypeAnnotation',
-      name: ReservedFunctionValueTypeName,
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'ArrayTypeAnnotation',
-      /**
-       * TODO(T72031674): Migrate all our NativeModule specs to not use
-       * invalid Array ElementTypes. Then, make the elementType required.
-       */
-      elementType?: NativeModuleBaseTypeAnnotation,
-      nullable: boolean,
-    |}>
-  | $ReadOnly<{|
-      type: 'TypeAliasTypeAnnotation',
-      name: string,
-      nullable: boolean,
-    |}>
+  | NativeModuleStringTypeAnnotation
+  | NativeModuleNumberTypeAnnotation
+  | NativeModuleInt32TypeAnnotation
+  | NativeModuleDoubleTypeAnnotation
+  | NativeModuleFloatTypeAnnotation
+  | NativeModuleBooleanTypeAnnotation
+  | NativeModuleGenericObjectTypeAnnotation
+  | NativeModuleReservedFunctionValueTypeAnnotation
+  | NativeModuleTypeAliasTypeAnnotation
+  | NativeModuleArrayTypeAnnotation
   | NativeModuleObjectTypeAnnotation;
 
-export type NativeModuleParamOnlyTypeAnnotation = NativeModuleFunctionTypeAnnotation;
-export type NativeModuleReturnOnlyTypeAnnotation =
-  | $ReadOnly<{|
-      nullable: boolean,
-      type: 'GenericPromiseTypeAnnotation',
-    |}>
-  | $ReadOnly<{|
-      nullable: boolean,
-      type: 'VoidTypeAnnotation',
-    |}>;
-
 export type NativeModuleParamTypeAnnotation =
   | NativeModuleBaseTypeAnnotation
   | NativeModuleParamOnlyTypeAnnotation;
@@ -378,4 +401,9 @@ export type NativeModuleTypeAnnotation =
   | NativeModuleParamOnlyTypeAnnotation
   | NativeModuleReturnOnlyTypeAnnotation;
 
+type NativeModuleParamOnlyTypeAnnotation = NativeModuleFunctionTypeAnnotation;
+type NativeModuleReturnOnlyTypeAnnotation =
+  | NativeModulePromiseTypeAnnotation
+  | NativeModuleVoidTypeAnnotation;
+
 export type ReservedFunctionValueTypeName = 'RootTag'; // Union with more custom types.

From 2e0fb693657aa1cca46857f78fffb1a47ee5383c Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 118/241] Refactor: Introduce Required<T> generic type

Summary:
This diff introduces a `Required<T>` generic type in CodegenSchema. Why? NativeModule aliase RHSs are basically ObjectTypeAnnotations but they have `nullable` fixed to `false`. This generic type reduces duplication in the schema flow types.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23645208

fbshipit-source-id: da984f64fa17d8533a3ea74b132ce10aae9aa7ed
---
 .../react-native-codegen/src/CodegenSchema.js | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 2b26e7c0844814..6ed318c6237ba1 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -263,6 +263,8 @@ export type SchemaType = $ReadOnly<{|
  * This is necessary for us to start unifying the notion of a "type
  * annotation" across the codegen schema as a whole.
  */
+export type Required<T> = $ReadOnly<{...T, nullable: false}>;
+
 export type NativeModuleSchema = $ReadOnly<{|
   // We only support aliases to Objects
   aliases: $ReadOnly<NativeModuleAliasMap>,
@@ -270,11 +272,7 @@ export type NativeModuleSchema = $ReadOnly<{|
 |}>;
 
 export type NativeModuleAliasMap = {
-  [aliasName: string]: $ReadOnly<{|
-    type: 'ObjectTypeAnnotation',
-    properties: $ReadOnlyArray<NativeModuleObjectTypeAnnotationPropertySchema>,
-    nullable: false,
-  |}>,
+  [aliasName: string]: Required<NativeModuleObjectTypeAnnotation>,
 };
 
 export type NativeModulePropertySchema = $ReadOnly<{|
@@ -298,16 +296,16 @@ export type NativeModuleMethodParamSchema = $ReadOnly<{|
 
 export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
   type: 'ObjectTypeAnnotation',
-  properties: $ReadOnlyArray<NativeModuleObjectTypeAnnotationPropertySchema>,
+  properties: $ReadOnlyArray<
+    $ReadOnly<{|
+      name: string,
+      optional: boolean,
+      typeAnnotation: NativeModuleBaseTypeAnnotation,
+    |}>,
+  >,
   nullable: boolean,
 |}>;
 
-export type NativeModuleObjectTypeAnnotationPropertySchema = $ReadOnly<{|
-  optional: boolean,
-  name: string,
-  typeAnnotation: NativeModuleBaseTypeAnnotation,
-|}>;
-
 export type NativeModuleArrayTypeAnnotation = $ReadOnly<{|
   type: 'ArrayTypeAnnotation',
   /**

From 92a6722bf279b6cff1fa0b69bd0ba7d85ed3518a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 119/241] Refactor: Make NativeModuleAliasMap $ReadOnly

Summary:
We were using `$ReadOnly<NativeModuleAliasMap>` everywhere, so I figured we'd just make the type itself `$ReadOnly`.

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23645207

fbshipit-source-id: 4e018d5768f4fcfd00492def7d840a5054cb2b73
---
 packages/react-native-codegen/src/CodegenSchema.js        | 6 +++---
 .../src/parsers/flow/modules/index.js                     | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 6ed318c6237ba1..55d9b2aa7b7f94 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -267,13 +267,13 @@ export type Required<T> = $ReadOnly<{...T, nullable: false}>;
 
 export type NativeModuleSchema = $ReadOnly<{|
   // We only support aliases to Objects
-  aliases: $ReadOnly<NativeModuleAliasMap>,
+  aliases: NativeModuleAliasMap,
   properties: $ReadOnlyArray<NativeModulePropertySchema>,
 |}>;
 
-export type NativeModuleAliasMap = {
+export type NativeModuleAliasMap = $ReadOnly<{|
   [aliasName: string]: Required<NativeModuleObjectTypeAnnotation>,
-};
+|}>;
 
 export type NativeModulePropertySchema = $ReadOnly<{|
   name: string,
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index 31de4e511f8e85..ca1b95216e2fe1 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -38,7 +38,7 @@ function translateTypeAnnotation(
    */
   flowTypeAnnotation: $FlowFixMe,
   types: TypeDeclarationMap,
-  aliasMap: NativeModuleAliasMap,
+  aliasMap: {...NativeModuleAliasMap},
 ): NativeModuleTypeAnnotation {
   const {
     nullable,
@@ -306,7 +306,7 @@ function translateFunctionTypeAnnotation(
   flowFunctionTypeAnnotation: $FlowFixMe,
   types: TypeDeclarationMap,
   nullable: boolean,
-  aliasMap: NativeModuleAliasMap,
+  aliasMap: {...NativeModuleAliasMap},
 ): NativeModuleFunctionTypeAnnotation {
   const params: Array<NativeModuleMethodParamSchema> = [];
   for (const flowParam of (flowFunctionTypeAnnotation.params: $ReadOnlyArray<$FlowFixMe>)) {
@@ -367,7 +367,7 @@ function buildPropertySchema(
   // Flow type this node
   property: $FlowFixMe,
   types: TypeDeclarationMap,
-  aliasMap: NativeModuleAliasMap,
+  aliasMap: {...NativeModuleAliasMap},
 ): NativeModulePropertySchema {
   let nullable = false;
   let {key, value} = property;
@@ -422,7 +422,7 @@ function buildModuleSchema(
   return (declaration.body.properties: $ReadOnlyArray<$FlowFixMe>)
     .filter(property => property.type === 'ObjectTypeProperty')
     .map(property => {
-      const aliasMap: NativeModuleAliasMap = {};
+      const aliasMap: {...NativeModuleAliasMap} = {};
       return {
         aliasMap: aliasMap,
         propertySchema: buildPropertySchema(

From 4927de6011026831295df2776c35645364c25527 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 120/241] Rename GenericPromiseTypeAnnotation to
 PromiseTypeAnnotation

Summary:
We have first class support for Promises in our codegen. So, it's more appropriate to just call this PromiseTypeAnnotation, as opposed to GenericPromiseTypeAnnotation.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23645209

fbshipit-source-id: bfc0b909750e221e18be33acf197f342a2918aa9
---
 .../codegen/generator/model/PromiseType.java      |  2 +-
 .../react-native-codegen/src/CodegenSchema.js     |  2 +-
 .../src/generators/modules/GenerateModuleH.js     |  2 +-
 .../generators/modules/GenerateModuleHObjCpp.js   |  5 ++---
 .../generators/modules/GenerateModuleJavaSpec.js  |  4 ++--
 .../generators/modules/GenerateModuleJniCpp.js    | 15 ++++++---------
 .../src/generators/modules/GenerateModuleMm.js    |  6 +++---
 .../modules/__test_fixtures__/fixtures.js         |  8 ++++----
 .../module-parser-snapshot-test.js.snap           |  6 +++---
 .../modules/__tests__/module-parser-e2e-test.js   |  4 +---
 .../src/parsers/flow/modules/index.js             |  6 +++---
 11 files changed, 27 insertions(+), 33 deletions(-)

diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java
index b4051ac81d7f61..c243cae7d73a1e 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java
+++ b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/model/PromiseType.java
@@ -8,7 +8,7 @@
 package com.facebook.react.codegen.generator.model;
 
 public final class PromiseType extends Type {
-  public static final String TYPE_NAME = "GenericPromiseTypeAnnotation";
+  public static final String TYPE_NAME = "PromiseTypeAnnotation";
 
   public PromiseType(final TypeId typeId) {
     super(typeId);
diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 55d9b2aa7b7f94..a2b3d54d5edc95 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -364,7 +364,7 @@ export type NativeModuleTypeAliasTypeAnnotation = $ReadOnly<{|
 |}>;
 
 export type NativeModulePromiseTypeAnnotation = $ReadOnly<{|
-  type: 'GenericPromiseTypeAnnotation',
+  type: 'PromiseTypeAnnotation',
   nullable: boolean,
 |}>;
 
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
index 7342ad01a7c32a..f2aaa32f41f133 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -92,7 +92,7 @@ function translatePrimitiveJSTypeToCpp(
       return 'jsi::Array';
     case 'FunctionTypeAnnotation':
       return 'jsi::Function';
-    case 'GenericPromiseTypeAnnotation':
+    case 'PromiseTypeAnnotation':
       return 'jsi::Value';
     default:
       // TODO (T65847278): Figure out why this does not work.
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js
index c9f173df868e37..cd54439ff917f4 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js
@@ -44,8 +44,7 @@ const protocolTemplate = `::_STRUCTS_::
 `;
 
 const callbackArgs = prop =>
-  prop.typeAnnotation.returnTypeAnnotation.type ===
-  'GenericPromiseTypeAnnotation'
+  prop.typeAnnotation.returnTypeAnnotation.type === 'PromiseTypeAnnotation'
     ? `${
         prop.typeAnnotation.params.length === 0 ? '' : '\n   resolve'
       }:(RCTPromiseResolveBlock)resolve
@@ -171,7 +170,7 @@ function translatePrimitiveJSTypeToObjCTypeForReturn(
           throw new Error(createErrorMessage(typeAnnotation.name));
       }
     case 'VoidTypeAnnotation':
-    case 'GenericPromiseTypeAnnotation':
+    case 'PromiseTypeAnnotation':
       return 'void';
     case 'StringTypeAnnotation':
       return wrapIntoNullableIfNeeded('NSString *');
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
index 43937022e4f52c..45ff4ba8dcfac7 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
@@ -130,7 +130,7 @@ function translateFunctionReturnTypeToJavaType(
           throw new Error(createErrorMessage(returnTypeAnnotation.name));
       }
     case 'VoidTypeAnnotation':
-    case 'GenericPromiseTypeAnnotation':
+    case 'PromiseTypeAnnotation':
       return 'void';
     case 'StringTypeAnnotation':
       return wrapIntoNullableIfNeeded('String');
@@ -279,7 +279,7 @@ module.exports = {
         );
         const returningPromise =
           method.typeAnnotation.returnTypeAnnotation.type ===
-          'GenericPromiseTypeAnnotation';
+          'PromiseTypeAnnotation';
         const isSyncMethod =
           method.typeAnnotation.returnTypeAnnotation.type !==
             'VoidTypeAnnotation' && !returningPromise;
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
index aac88138b51f45..a97083d86bd7f3 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
@@ -99,7 +99,7 @@ function translateReturnTypeToKind(
     case 'FloatTypeAnnotation':
     case 'Int32TypeAnnotation':
       return 'NumberKind';
-    case 'GenericPromiseTypeAnnotation':
+    case 'PromiseTypeAnnotation':
       return 'PromiseKind';
     case 'GenericObjectTypeAnnotation':
     case 'ObjectTypeAnnotation':
@@ -148,7 +148,7 @@ function translateParamTypeToJniType(
     case 'FloatTypeAnnotation':
     case 'Int32TypeAnnotation':
       return nullable ? 'Ljava/lang/Double;' : 'D';
-    case 'GenericPromiseTypeAnnotation':
+    case 'PromiseTypeAnnotation':
       return 'Lcom/facebook/react/bridge/Promise;';
     case 'GenericObjectTypeAnnotation':
     case 'ObjectTypeAnnotation':
@@ -191,7 +191,7 @@ function translateReturnTypeToJniType(
     case 'FloatTypeAnnotation':
     case 'Int32TypeAnnotation':
       return nullable ? 'Ljava/lang/Double;' : 'D';
-    case 'GenericPromiseTypeAnnotation':
+    case 'PromiseTypeAnnotation':
       return 'Lcom/facebook/react/bridge/Promise;';
     case 'GenericObjectTypeAnnotation':
     case 'ObjectTypeAnnotation':
@@ -214,8 +214,7 @@ function translateMethodTypeToJniSignature(
 
   const params = [...typeAnnotation.params];
   let processedReturnTypeAnnotation = returnTypeAnnotation;
-  const isPromiseReturn =
-    returnTypeAnnotation.type === 'GenericPromiseTypeAnnotation';
+  const isPromiseReturn = returnTypeAnnotation.type === 'PromiseTypeAnnotation';
   if (isPromiseReturn) {
     processedReturnTypeAnnotation = {
       nullable: false,
@@ -247,13 +246,11 @@ function translateMethodForImplementation(
 
   const numberOfParams =
     property.typeAnnotation.params.length +
-    (returnTypeAnnotation.type === 'GenericPromiseTypeAnnotation' ? 1 : 0);
+    (returnTypeAnnotation.type === 'PromiseTypeAnnotation' ? 1 : 0);
   const translatedArguments = property.typeAnnotation.params
     .map(param => param.name)
     .concat(
-      returnTypeAnnotation.type === 'GenericPromiseTypeAnnotation'
-        ? ['promise']
-        : [],
+      returnTypeAnnotation.type === 'PromiseTypeAnnotation' ? ['promise'] : [],
     )
     .slice(1)
     .join(':')
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js
index 8b60d07e127429..53a0585886e3dd 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js
@@ -96,7 +96,7 @@ function translateReturnTypeToKind(typeAnnotation): string {
     case 'FloatTypeAnnotation':
     case 'Int32TypeAnnotation':
       return 'NumberKind';
-    case 'GenericPromiseTypeAnnotation':
+    case 'PromiseTypeAnnotation':
       return 'PromiseKind';
     case 'GenericObjectTypeAnnotation':
     case 'ObjectTypeAnnotation':
@@ -117,11 +117,11 @@ function translateMethodForImplementation(property): string {
 
   const numberOfParams =
     property.typeAnnotation.params.length +
-    (returnTypeAnnotation.type === 'GenericPromiseTypeAnnotation' ? 2 : 0);
+    (returnTypeAnnotation.type === 'PromiseTypeAnnotation' ? 2 : 0);
   const translatedArguments = property.typeAnnotation.params
     .map(param => param.name)
     .concat(
-      returnTypeAnnotation.type === 'GenericPromiseTypeAnnotation'
+      returnTypeAnnotation.type === 'PromiseTypeAnnotation'
         ? ['resolve', 'reject']
         : [],
     )
diff --git a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
index 1c5a3b9127da42..4f4f5fc14bd92d 100644
--- a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
@@ -278,7 +278,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
                   nullable: false,
-                  type: 'GenericPromiseTypeAnnotation',
+                  type: 'PromiseTypeAnnotation',
                 },
                 params: [
                   {
@@ -1132,7 +1132,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  type: 'GenericPromiseTypeAnnotation',
+                  type: 'PromiseTypeAnnotation',
                   nullable: false,
                 },
                 params: [
@@ -1154,7 +1154,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  type: 'GenericPromiseTypeAnnotation',
+                  type: 'PromiseTypeAnnotation',
                   nullable: false,
                 },
                 params: [
@@ -1182,7 +1182,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  type: 'GenericPromiseTypeAnnotation',
+                  type: 'PromiseTypeAnnotation',
                   nullable: false,
                 },
                 params: [
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
index 96cbea8e38d1e2..6c35735fee2055 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
@@ -1248,7 +1248,7 @@ Object {
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
-                  "type": "GenericPromiseTypeAnnotation",
+                  "type": "PromiseTypeAnnotation",
                 },
                 "type": "FunctionTypeAnnotation",
               },
@@ -1261,7 +1261,7 @@ Object {
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
-                  "type": "GenericPromiseTypeAnnotation",
+                  "type": "PromiseTypeAnnotation",
                 },
                 "type": "FunctionTypeAnnotation",
               },
@@ -1274,7 +1274,7 @@ Object {
                 "params": Array [],
                 "returnTypeAnnotation": Object {
                   "nullable": false,
-                  "type": "GenericPromiseTypeAnnotation",
+                  "type": "PromiseTypeAnnotation",
                 },
                 "type": "FunctionTypeAnnotation",
               },
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
index e4647258fe32e3..b48f155accf153 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
@@ -708,9 +708,7 @@ describe('Flow Module Parser', () => {
             promiseFlowType => {
               it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return of type '${promiseFlowType}'`, () => {
                 const [returnTypeAnnotation] = parseReturnType(promiseFlowType);
-                expect(returnTypeAnnotation.type).toBe(
-                  'GenericPromiseTypeAnnotation',
-                );
+                expect(returnTypeAnnotation.type).toBe('PromiseTypeAnnotation');
               });
             },
           );
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index ca1b95216e2fe1..a1da76184fba9c 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -62,7 +62,7 @@ function translateTypeAnnotation(
           );
           return {
             nullable,
-            type: 'GenericPromiseTypeAnnotation',
+            type: 'PromiseTypeAnnotation',
           };
         }
         case 'Array':
@@ -90,7 +90,7 @@ function translateTypeAnnotation(
               `${typeAnnotation.id.name} element type cannot be 'void'.`,
             );
             invariant(
-              elementType.type !== 'GenericPromiseTypeAnnotation',
+              elementType.type !== 'PromiseTypeAnnotation',
               `${typeAnnotation.id.name} element type cannot be 'Promise'.`,
             );
 
@@ -328,7 +328,7 @@ function translateFunctionTypeAnnotation(
     );
 
     invariant(
-      paramTypeAnnotation.type !== 'GenericPromiseTypeAnnotation',
+      paramTypeAnnotation.type !== 'PromiseTypeAnnotation',
       `Parameter ${paramName} cannot have type 'Promise'.`,
     );
 

From 91a7da087b6ee6cbe2815a9cdcdf7864daa7f72f Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 121/241] Refactor: Make NativeModuleArrayTypeAnnotation
 elementType customizable

Summary:
In the future, we'll use `NativeModuleArrayTypeAnnotation` inside JS struct objects. Structs cannot contain `ObjectTypeAnnotations` anywhere. Therefore, we need the elementType of `NativeModuuleArrayTypeAnnotation`'s elementType customizable.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23645210

fbshipit-source-id: 97abb993d59536ebd68ec08b18ce7f2801c68a2d
---
 packages/react-native-codegen/src/CodegenSchema.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index a2b3d54d5edc95..7e35b52207aac7 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -306,13 +306,15 @@ export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
   nullable: boolean,
 |}>;
 
-export type NativeModuleArrayTypeAnnotation = $ReadOnly<{|
+export type NativeModuleArrayTypeAnnotation<
+  T = NativeModuleBaseTypeAnnotation,
+> = $ReadOnly<{|
   type: 'ArrayTypeAnnotation',
   /**
    * TODO(T72031674): Migrate all our NativeModule specs to not use
    * invalid Array ElementTypes. Then, make the elementType required.
    */
-  elementType?: NativeModuleBaseTypeAnnotation,
+  elementType?: T,
   nullable: boolean,
 |}>;
 
@@ -383,7 +385,7 @@ export type NativeModuleBaseTypeAnnotation =
   | NativeModuleGenericObjectTypeAnnotation
   | NativeModuleReservedFunctionValueTypeAnnotation
   | NativeModuleTypeAliasTypeAnnotation
-  | NativeModuleArrayTypeAnnotation
+  | NativeModuleArrayTypeAnnotation<>
   | NativeModuleObjectTypeAnnotation;
 
 export type NativeModuleParamTypeAnnotation =

From 5f5ccfcb2cd177babce086e57b5ac8e5442e3571 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 122/241] Update generator fixtures to comply with Schema flow
 types

Summary:
In diffs below, we made several changes to the NativeModule schema. This diff just ensures that the input to our generator snapshot tests, which are module schemas, are valid.

Changelog: [Internal]

Reviewed By: TheSavior

Differential Revision: D23633942

fbshipit-source-id: 444ccd60f6ec76e348a8e54b946260464ff3aeee
---
 .../modules/__test_fixtures__/fixtures.js     | 240 +++++++++++++++---
 1 file changed, 202 insertions(+), 38 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
index 4f4f5fc14bd92d..92a7dc3489823e 100644
--- a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
@@ -46,6 +46,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                       name: 'const1',
                       typeAnnotation: {
                         type: 'BooleanTypeAnnotation',
+                        nullable: false,
                       },
                     },
                     {
@@ -53,6 +54,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                       name: 'const2',
                       typeAnnotation: {
                         type: 'NumberTypeAnnotation',
+                        nullable: false,
                       },
                     },
                     {
@@ -60,6 +62,7 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                       name: 'const3',
                       typeAnnotation: {
                         type: 'StringTypeAnnotation',
+                        nullable: false,
                       },
                     },
                   ],
@@ -92,10 +95,11 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'arg',
                     typeAnnotation: {
                       type: 'BooleanTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -113,10 +117,11 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'arg',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -134,10 +139,11 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'arg',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -153,17 +159,20 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                   nullable: false,
                   type: 'ArrayTypeAnnotation',
                   elementType: {
-                    type: 'AnyTypeAnnotation',
+                    type: 'GenericObjectTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 params: [
                   {
                     name: 'arg',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
+                      nullable: false,
                       elementType: {
-                        type: 'AnyTypeAnnotation',
+                        type: 'GenericObjectTypeAnnotation',
+                        nullable: false,
                       },
                     },
                   },
@@ -182,10 +191,11 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'arg',
                     typeAnnotation: {
                       type: 'GenericObjectTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -204,11 +214,12 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'arg',
                     typeAnnotation: {
                       type: 'ReservedFunctionValueTypeAnnotation',
                       name: 'RootTag',
+                      nullable: false,
                     },
                   },
                 ],
@@ -226,24 +237,27 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'x',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
+                      nullable: false,
                     },
                   },
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'y',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'z',
                     typeAnnotation: {
                       type: 'GenericObjectTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -262,9 +276,15 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 params: [
                   {
                     name: 'callback',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'FunctionTypeAnnotation',
+                      params: [],
+                      returnTypeAnnotation: {
+                        type: 'VoidTypeAnnotation',
+                        nullable: false,
+                      },
+                      nullable: false,
                     },
                   },
                 ],
@@ -282,10 +302,11 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'error',
                     typeAnnotation: {
                       type: 'BooleanTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -428,6 +449,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                       name: 'D',
                       typeAnnotation: {
                         type: 'BooleanTypeAnnotation',
+                        nullable: false,
                       },
                     },
                     {
@@ -435,6 +457,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                       name: 'E',
                       typeAnnotation: {
                         type: 'NumberTypeAnnotation',
+                        nullable: false,
                       },
                     },
                     {
@@ -442,22 +465,25 @@ const COMPLEX_OBJECTS: SchemaType = {
                       name: 'F',
                       typeAnnotation: {
                         type: 'StringTypeAnnotation',
+                        nullable: false,
                       },
                     },
                   ],
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'A',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
+                      nullable: false,
                       properties: [
                         {
                           optional: false,
                           name: 'D',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
+                            nullable: false,
                           },
                         },
                         {
@@ -465,12 +491,14 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'E',
                           typeAnnotation: {
                             type: 'ObjectTypeAnnotation',
+                            nullable: false,
                             properties: [
                               {
                                 optional: false,
                                 name: 'D',
                                 typeAnnotation: {
                                   type: 'BooleanTypeAnnotation',
+                                  nullable: false,
                                 },
                               },
                               {
@@ -478,6 +506,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'E',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
+                                  nullable: false,
                                 },
                               },
                               {
@@ -485,6 +514,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'F',
                                 typeAnnotation: {
                                   type: 'StringTypeAnnotation',
+                                  nullable: false,
                                 },
                               },
                               {
@@ -492,6 +522,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'id',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
+                                  nullable: false,
                                 },
                               },
                             ],
@@ -502,6 +533,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'F',
                           typeAnnotation: {
                             type: 'StringTypeAnnotation',
+                            nullable: false,
                           },
                         },
                       ],
@@ -522,16 +554,18 @@ const COMPLEX_OBJECTS: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'A',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
+                      nullable: false,
                       properties: [
                         {
                           optional: true,
                           name: 'optionalNumberProperty',
                           typeAnnotation: {
                             type: 'NumberTypeAnnotation',
+                            nullable: false,
                           },
                         },
                         {
@@ -539,8 +573,10 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalArrayProperty',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
+                            nullable: false,
                             elementType: {
                               type: 'NumberTypeAnnotation',
+                              nullable: false,
                             },
                           },
                         },
@@ -549,12 +585,14 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalObjectProperty',
                           typeAnnotation: {
                             type: 'ObjectTypeAnnotation',
+                            nullable: false,
                             properties: [
                               {
                                 optional: false,
                                 name: 'x',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
+                                  nullable: false,
                                 },
                               },
                               {
@@ -562,6 +600,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'y',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
+                                  nullable: false,
                                 },
                               },
                             ],
@@ -572,6 +611,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalGenericObjectProperty',
                           typeAnnotation: {
                             type: 'GenericObjectTypeAnnotation',
+                            nullable: false,
                           },
                         },
                         {
@@ -579,6 +619,7 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalBooleanTypeProperty',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
+                            nullable: false,
                           },
                         },
                       ],
@@ -599,37 +640,51 @@ const COMPLEX_OBJECTS: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'options',
                     typeAnnotation: {
                       type: 'GenericObjectTypeAnnotation',
+                      nullable: false,
                     },
                   },
                   {
                     name: 'callback',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'FunctionTypeAnnotation',
+                      params: [],
+                      returnTypeAnnotation: {
+                        type: 'VoidTypeAnnotation',
+                        nullable: false,
+                      },
+                      nullable: false,
                     },
                   },
                   {
                     name: 'extras',
-                    nullable: true,
+                    optional: true,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
+                      nullable: false,
                       elementType: {
                         type: 'ObjectTypeAnnotation',
+                        nullable: false,
                         properties: [
                           {
                             optional: false,
                             name: 'key',
                             typeAnnotation: {
                               type: 'StringTypeAnnotation',
+                              nullable: false,
                             },
                           },
                           {
                             optional: false,
                             name: 'value',
+                            typeAnnotation: {
+                              type: 'GenericObjectTypeAnnotation',
+                              nullable: false,
+                            },
                           },
                         ],
                       },
@@ -650,18 +705,21 @@ const COMPLEX_OBJECTS: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'options',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
+                      nullable: false,
                       properties: [
                         {
                           optional: false,
                           name: 'arrayOfNumbers',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
+                            nullable: false,
                             elementType: {
                               type: 'NumberTypeAnnotation',
+                              nullable: false,
                             },
                           },
                         },
@@ -670,8 +728,10 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalArrayOfNumbers',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
+                            nullable: false,
                             elementType: {
                               type: 'NumberTypeAnnotation',
+                              nullable: false,
                             },
                           },
                         },
@@ -680,8 +740,10 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'arrayOfStrings',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
+                            nullable: false,
                             elementType: {
                               type: 'StringTypeAnnotation',
+                              nullable: false,
                             },
                           },
                         },
@@ -690,8 +752,10 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalArrayOfStrings',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
+                            nullable: false,
                             elementType: {
                               type: 'StringTypeAnnotation',
+                              nullable: false,
                             },
                           },
                         },
@@ -700,14 +764,17 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'arrayOfObjects',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
+                            nullable: false,
                             elementType: {
                               type: 'ObjectTypeAnnotation',
+                              nullable: false,
                               properties: [
                                 {
                                   optional: false,
                                   name: 'numberProperty',
                                   typeAnnotation: {
                                     type: 'NumberTypeAnnotation',
+                                    nullable: false,
                                   },
                                 },
                               ],
@@ -735,18 +802,22 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
         AliasTurboModule: {
           aliases: {
             Options: {
+              type: 'ObjectTypeAnnotation',
+              nullable: false,
               properties: [
                 {
                   optional: false,
                   name: 'offset',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
+                    nullable: false,
                     properties: [
                       {
                         optional: false,
                         name: 'x',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -754,6 +825,7 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                         name: 'y',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
+                          nullable: false,
                         },
                       },
                     ],
@@ -764,12 +836,14 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'size',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
+                    nullable: false,
                     properties: [
                       {
                         optional: false,
                         name: 'width',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -777,6 +851,7 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                         name: 'height',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
+                          nullable: false,
                         },
                       },
                     ],
@@ -787,12 +862,14 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'displaySize',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
+                    nullable: false,
                     properties: [
                       {
                         optional: false,
                         name: 'width',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -800,6 +877,7 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                         name: 'height',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
+                          nullable: false,
                         },
                       },
                     ],
@@ -810,6 +888,7 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'resizeMode',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -817,10 +896,10 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'allowExternalStorage',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
+                    nullable: false,
                   },
                 },
               ],
-              type: 'ObjectTypeAnnotation',
             },
           },
           properties: [
@@ -849,11 +928,12 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'cropData',
                     typeAnnotation: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'Options',
+                      nullable: false,
                     },
                   },
                 ],
@@ -875,12 +955,14 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
           aliases: {
             PhotoIdentifierImage: {
               type: 'ObjectTypeAnnotation',
+              nullable: false,
               properties: [
                 {
                   optional: false,
                   name: 'uri',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -888,6 +970,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'playableDuration',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -895,6 +978,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'width',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -902,6 +986,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'height',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -909,6 +994,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'isStored',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -916,18 +1002,21 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'filename',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
               ],
             },
             PhotoIdentifier: {
               type: 'ObjectTypeAnnotation',
+              nullable: false,
               properties: [
                 {
                   optional: false,
                   name: 'node',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
+                    nullable: false,
                     properties: [
                       {
                         optional: false,
@@ -935,6 +1024,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         typeAnnotation: {
                           type: 'TypeAliasTypeAnnotation',
                           name: 'PhotoIdentifierImage',
+                          nullable: false,
                         },
                       },
                       {
@@ -942,6 +1032,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'type',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -949,6 +1040,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'group_name',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -956,6 +1048,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'timestamp',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -963,12 +1056,14 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'location',
                         typeAnnotation: {
                           type: 'ObjectTypeAnnotation',
+                          nullable: false,
                           properties: [
                             {
                               optional: false,
                               name: 'longitude',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
+                                nullable: false,
                               },
                             },
                             {
@@ -976,6 +1071,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'latitude',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
+                                nullable: false,
                               },
                             },
                             {
@@ -983,6 +1079,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'altitude',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
+                                nullable: false,
                               },
                             },
                             {
@@ -990,6 +1087,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'heading',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
+                                nullable: false,
                               },
                             },
                             {
@@ -997,6 +1095,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'speed',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
+                                nullable: false,
                               },
                             },
                           ],
@@ -1009,15 +1108,18 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
             },
             PhotoIdentifiersPage: {
               type: 'ObjectTypeAnnotation',
+              nullable: false,
               properties: [
                 {
                   optional: false,
                   name: 'edges',
                   typeAnnotation: {
                     type: 'ArrayTypeAnnotation',
+                    nullable: false,
                     elementType: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'PhotoIdentifier',
+                      nullable: false,
                     },
                   },
                 },
@@ -1026,12 +1128,14 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'page_info',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
+                    nullable: false,
                     properties: [
                       {
                         optional: false,
                         name: 'has_next_page',
                         typeAnnotation: {
                           type: 'BooleanTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -1039,6 +1143,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'start_cursor',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
+                          nullable: false,
                         },
                       },
                       {
@@ -1046,6 +1151,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'end_cursor',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
+                          nullable: false,
                         },
                       },
                     ],
@@ -1055,12 +1161,14 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
             },
             GetPhotosParams: {
               type: 'ObjectTypeAnnotation',
+              nullable: false,
               properties: [
                 {
                   optional: false,
                   name: 'first',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1068,6 +1176,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'after',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1075,6 +1184,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'groupName',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1082,6 +1192,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'groupTypes',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1089,6 +1200,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'assetType',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1096,6 +1208,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'maxSize',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1103,8 +1216,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'mimeTypes',
                   typeAnnotation: {
                     type: 'ArrayTypeAnnotation',
+                    nullable: false,
                     elementType: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 },
@@ -1137,11 +1252,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'params',
                     typeAnnotation: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'GetPhotosParams',
+                      nullable: false,
                     },
                   },
                 ],
@@ -1159,17 +1275,19 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'uri',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'type',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -1188,11 +1306,13 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 params: [
                   {
                     name: 'assets',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
+                      nullable: false,
                       elementType: {
                         type: 'StringTypeAnnotation',
+                        nullable: false,
                       },
                     },
                   },
@@ -1220,16 +1340,18 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'config',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
+                      nullable: false,
                       properties: [
                         {
                           optional: false,
                           name: 'unmirrorFrontFacingCamera',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
+                            nullable: false,
                           },
                         },
                         {
@@ -1237,6 +1359,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                           name: 'videoMode',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
+                            nullable: false,
                           },
                         },
                       ],
@@ -1244,16 +1367,28 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   },
                   {
                     name: 'successCallback',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'FunctionTypeAnnotation',
+                      params: [],
+                      returnTypeAnnotation: {
+                        nullable: false,
+                        type: 'VoidTypeAnnotation',
+                      },
+                      nullable: false,
                     },
                   },
                   {
                     name: 'cancelCallback',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'FunctionTypeAnnotation',
+                      params: [],
+                      returnTypeAnnotation: {
+                        nullable: false,
+                        type: 'VoidTypeAnnotation',
+                      },
+                      nullable: false,
                     },
                   },
                 ],
@@ -1275,6 +1410,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'column',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1282,6 +1418,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'file',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1289,6 +1426,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'lineNumber',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1296,6 +1434,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'methodName',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1303,10 +1442,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'collapse',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
+                    nullable: false,
                   },
                 },
               ],
               type: 'ObjectTypeAnnotation',
+              nullable: false,
             },
             ExceptionData: {
               properties: [
@@ -1315,6 +1456,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'message',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1322,6 +1464,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'originalMessage',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1329,6 +1472,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'name',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1336,6 +1480,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'componentStack',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1343,9 +1488,11 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'stack',
                   typeAnnotation: {
                     type: 'ArrayTypeAnnotation',
+                    nullable: false,
                     elementType: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'StackFrame',
+                      nullable: false,
                     },
                   },
                 },
@@ -1354,6 +1501,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'id',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1361,6 +1509,7 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'isFatal',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
+                    nullable: false,
                   },
                 },
                 {
@@ -1368,10 +1517,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'extraData',
                   typeAnnotation: {
                     type: 'GenericObjectTypeAnnotation',
+                    nullable: false,
                   },
                 },
               ],
               type: 'ObjectTypeAnnotation',
+              nullable: false,
             },
           },
           properties: [
@@ -1386,28 +1537,32 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'message',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                   {
                     name: 'stack',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
+                      nullable: false,
                       elementType: {
                         type: 'TypeAliasTypeAnnotation',
                         name: 'StackFrame',
+                        nullable: false,
                       },
                     },
                   },
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'exceptionId',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -1425,28 +1580,32 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'message',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                   {
                     name: 'stack',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
+                      nullable: false,
                       elementType: {
                         type: 'TypeAliasTypeAnnotation',
                         name: 'StackFrame',
+                        nullable: false,
                       },
                     },
                   },
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'exceptionId',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],
@@ -1464,11 +1623,12 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'data',
                     typeAnnotation: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'ExceptionData',
+                      nullable: false,
                     },
                   },
                 ],
@@ -1486,28 +1646,32 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 },
                 params: [
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'message',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
+                      nullable: false,
                     },
                   },
                   {
                     name: 'stack',
-                    nullable: false,
+                    optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
+                      nullable: false,
                       elementType: {
                         type: 'TypeAliasTypeAnnotation',
                         name: 'StackFrame',
+                        nullable: false,
                       },
                     },
                   },
                   {
-                    nullable: false,
+                    optional: false,
                     name: 'exceptionId',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
+                      nullable: false,
                     },
                   },
                 ],

From c3001938537b7f5590d71e536653ebfd083ffa52 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 123/241] Create utilities for module generators

Summary:
There are two operations we do in every NativeModule generator:
- We convert the `SchemaType` into a map of NativeModule schemas
- If the type-annotation is a TypeAliasTypeAnnotation, we resolve it by doing a lookup on the NativeModuleAliasMap. This is usually followed by an invariant to assert that the lookup didn't fail.

Both procedures have been translated into utilities for use across our generators. I also deleted `getTypeAliasTypeAnnotation` which will no longer be used.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23667249

fbshipit-source-id: 4e34078980e2caa4daed77c38b1168bfc161c31c
---
 .../src/generators/modules/Utils.js           | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/Utils.js b/packages/react-native-codegen/src/generators/modules/Utils.js
index 8ce5c95416f610..6985b861c7989e 100644
--- a/packages/react-native-codegen/src/generators/modules/Utils.js
+++ b/packages/react-native-codegen/src/generators/modules/Utils.js
@@ -10,35 +10,43 @@
 
 'use strict';
 
-import type {ObjectTypeAliasTypeShape} from '../../CodegenSchema';
+import type {
+  SchemaType,
+  NativeModuleAliasMap,
+  Required,
+  NativeModuleObjectTypeAnnotation,
+  NativeModuleSchema,
+} from '../../CodegenSchema';
 
-function getTypeAliasTypeAnnotation(
-  name: string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): $ReadOnly<ObjectTypeAliasTypeShape> {
-  const typeAnnotation = aliases[name];
-  if (!typeAnnotation) {
-    throw Error(`No type annotation found for "${name}" in schema`);
-  }
-  if (typeAnnotation.type === 'ObjectTypeAnnotation') {
-    if (typeAnnotation.properties) {
-      return typeAnnotation;
-    }
+const invariant = require('invariant');
 
-    throw new Error(
-      `Unsupported type for "${name}". Please provide properties.`,
-    );
-  }
-  // $FlowFixMe[incompatible-type]
-  if (typeAnnotation.type === 'TypeAliasTypeAnnotation') {
-    return getTypeAliasTypeAnnotation(typeAnnotation.name, aliases);
-  }
+export type AliasResolver = (
+  aliasName: string,
+) => Required<NativeModuleObjectTypeAnnotation>;
+
+function createAliasResolver(aliasMap: NativeModuleAliasMap): AliasResolver {
+  return (aliasName: string) => {
+    const alias = aliasMap[aliasName];
+    invariant(alias != null, `Unable to resolve type alias '${aliasName}'.`);
+    return alias;
+  };
+}
 
-  throw Error(
-    `Unsupported type annotation in alias "${name}", found: ${typeAnnotation.type}`,
-  );
+function getModules(
+  schema: SchemaType,
+): $ReadOnly<{|[moduleName: string]: NativeModuleSchema|}> {
+  return Object.keys(schema.modules)
+    .map<?{+[string]: NativeModuleSchema}>(
+      moduleName => schema.modules[moduleName].nativeModules,
+    )
+    .filter(Boolean)
+    .reduce<{+[string]: NativeModuleSchema}>(
+      (acc, modules) => ({...acc, ...modules}),
+      {},
+    );
 }
 
 module.exports = {
-  getTypeAliasTypeAnnotation,
+  createAliasResolver,
+  getModules,
 };

From c267b8de7291a0aef67f6fb24d78dbc85385c120 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 124/241] Rewrite ObjC++ module generator
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
## Misc. Improvements

* We now have 95%+ flow coverage in all generator files. Henceforth, we can make changes to these files with more confidence, and trust flow to catch more errors. This should also improve the DevX of working on these files.
* Better templates: Instead of doing string replace with RegExps, we instead use functions and leverage JS template literals to generate our code. A few benefits: (1) data dependencies of templates are clearly visible, and statically checked by flow, (2) the templates are more readable in VSCode.
* Merged the GenerateModuleHObjCpp.js and GenerateModuleMm.js generators. They can share a lot of logic, so it's not a good idea to keep them separate.
* The ObjC++ module generator no longer generates “dead” structs (i.e structs that aren’t used by type-safety infra). In fact, it explicitly only supports the types in our Wiki. (I know this wasn’t the case with the legacy codegen, because we were generating native code for enums in the legacy codegen). This is a mixed bag. The test to verify correctness will be more difficult to write. However, keeping structs in the codegen needlessly complicates the parsers + generators, and creates technical debt for us to clean up later.

## Abstractions
- **StructCollector:** As we serialize NativeModule methods, when we detect an ObjectTypeAnnotation in the return type of `getConstants()` or inside a method param, we must create a Struct JS object for it. When we detect a type-alias (also in the same locations), we must look up that type-alias and create a Struct from its RHS. A Struct is basically an ObjectTypeAnnotation with a context (i.e: used in getConstants() vs as a method param), that cannot contain other ObjectTypeAnnotations.
- **serializeMethod.js** Given a NativeModule method type annotation, output the protocol method, JS return type, selector, a record of which params were structs, and which structs. Basically, this is all the information necessary to generate the declaration and implementation codegen for a partiular NativeModule method.
- **serializeStruct/*.js**: After creating all these Structs, we need to loop over all of them, and tranform them into ObjC++ code.
  - **serializeStruct.js**: Depending on the struct context, calls either `serializeRegularStruct.js` or `serializeConstantsStruct.js`. Both of these files have the same layout/abstractions. They look very similar.
- **serializeModule.js:** Outputs RCTCxxConvert categories for transforming `NSDictionary *` into C++ structs. Outputs ObjCTurboModule subclass.

## Algorithm
```
for spec in NativeModuleSpecs
  structCollector = new StructCollector
  resolveAlias = (aliasName) => nullthrows(spec.aliases[aliasName])

  methodDatas = []
  for method in methods(spec)
    methodData.push(serializeMethod(method, structCollector, resolveAlias))
  end

  structs = structCollector.getStructs()

  output generateImplCodegen(methodDatas, structs)
  output generateHeaderCodegen(methodDatas, structs)
end
```

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23633940

fbshipit-source-id: 7c29f458b65434f4865ef1993061b0f0dc7d04ce
---
 Libraries/TypeSafety/RCTConvertHelpers.h      |    1 +
 Libraries/TypeSafety/RCTConvertHelpers.mm     |    6 +
 packages/react-native-codegen/.babelrc        |    1 +
 packages/react-native-codegen/package.json    |    1 +
 .../src/generators/RNCodegen.js               |    6 +-
 .../modules/GenerateModuleHObjCpp.js          |  414 -------
 .../generators/modules/GenerateModuleMm.js    |  320 ------
 .../GenerateModuleObjCpp/StructCollector.js   |  191 ++++
 .../modules/GenerateModuleObjCpp/Utils.js     |   36 +
 .../header/serializeConstantsStruct.js        |  263 +++++
 .../header/serializeRegularStruct.js          |  251 ++++
 .../header/serializeStruct.js                 |   35 +
 .../modules/GenerateModuleObjCpp/index.js     |  210 ++++
 .../GenerateModuleObjCpp/serializeMethod.js   |  413 +++++++
 .../source/serializeModule.js                 |  125 ++
 .../modules/ObjCppUtils/GenerateStructs.js    |  452 --------
 .../GenerateStructsForConstants.js            |  275 -----
 .../generators/modules/ObjCppUtils/Utils.js   |  112 --
 .../__test_fixtures__/structFixtures.js       |  218 ----
 .../__tests__/GenerateModuleHObjCpp-test.js   |    5 +-
 .../__tests__/GenerateModuleMm-test.js        |    7 +-
 .../modules/__tests__/GenerateStructs-test.js |   31 -
 .../GenerateModuleHObjCpp-test.js.snap        | 1011 ++++++-----------
 .../GenerateModuleMm-test.js.snap             |  584 ++++++----
 .../GenerateStructs-test.js.snap              |  284 -----
 25 files changed, 2236 insertions(+), 3016 deletions(-)
 delete mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js
 delete mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
 create mode 100644 packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
 delete mode 100644 packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructs.js
 delete mode 100644 packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructsForConstants.js
 delete mode 100644 packages/react-native-codegen/src/generators/modules/ObjCppUtils/Utils.js
 delete mode 100644 packages/react-native-codegen/src/generators/modules/__test_fixtures__/structFixtures.js
 delete mode 100644 packages/react-native-codegen/src/generators/modules/__tests__/GenerateStructs-test.js
 delete mode 100644 packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateStructs-test.js.snap

diff --git a/Libraries/TypeSafety/RCTConvertHelpers.h b/Libraries/TypeSafety/RCTConvertHelpers.h
index 1b6bf9341e7a86..0b7144b9c8ea2d 100644
--- a/Libraries/TypeSafety/RCTConvertHelpers.h
+++ b/Libraries/TypeSafety/RCTConvertHelpers.h
@@ -49,6 +49,7 @@ NSArray *RCTConvertOptionalVecToArray(const folly::Optional<ContainerT> &vec)
 bool RCTBridgingToBool(id value);
 folly::Optional<bool> RCTBridgingToOptionalBool(id value);
 NSString *RCTBridgingToString(id value);
+NSString *RCTBridgingToOptionalString(id value);
 folly::Optional<double> RCTBridgingToOptionalDouble(id value);
 double RCTBridgingToDouble(id value);
 NSArray *RCTBridgingToArray(id value);
diff --git a/Libraries/TypeSafety/RCTConvertHelpers.mm b/Libraries/TypeSafety/RCTConvertHelpers.mm
index 69fb3e4a3de4f4..cd79c41f6fece4 100644
--- a/Libraries/TypeSafety/RCTConvertHelpers.mm
+++ b/Libraries/TypeSafety/RCTConvertHelpers.mm
@@ -27,6 +27,12 @@ bool RCTBridgingToBool(id value)
   return [RCTConvert NSString:RCTNilIfNull(value)];
 }
 
+NSString *RCTBridgingToOptionalString(id value)
+{
+  return RCTBridgingToString(value);
+}
+
+
 folly::Optional<double> RCTBridgingToOptionalDouble(id value)
 {
   if (!RCTNilIfNull(value)) {
diff --git a/packages/react-native-codegen/.babelrc b/packages/react-native-codegen/.babelrc
index b8ac81899b77e0..7a6194fbaa55d8 100644
--- a/packages/react-native-codegen/.babelrc
+++ b/packages/react-native-codegen/.babelrc
@@ -5,6 +5,7 @@
     "@babel/plugin-transform-destructuring",
     "@babel/plugin-transform-flow-strip-types",
     "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-proposal-class-properties",
     "@babel/plugin-proposal-nullish-coalescing-operator",
     "@babel/plugin-proposal-optional-chaining"
   ]
diff --git a/packages/react-native-codegen/package.json b/packages/react-native-codegen/package.json
index 6f6cac7bb3599f..014bd03565390b 100644
--- a/packages/react-native-codegen/package.json
+++ b/packages/react-native-codegen/package.json
@@ -24,6 +24,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/plugin-proposal-optional-chaining": "^7.0.0",
diff --git a/packages/react-native-codegen/src/generators/RNCodegen.js b/packages/react-native-codegen/src/generators/RNCodegen.js
index 576d984abd8d71..b6f6e02a922255 100644
--- a/packages/react-native-codegen/src/generators/RNCodegen.js
+++ b/packages/react-native-codegen/src/generators/RNCodegen.js
@@ -25,11 +25,10 @@ const generatePropsCpp = require('./components/GeneratePropsCpp.js');
 const generatePropsH = require('./components/GeneratePropsH.js');
 const generateModuleH = require('./modules/GenerateModuleH.js');
 const generateModuleCpp = require('./modules/GenerateModuleCpp.js');
-const generateModuleHObjCpp = require('./modules/GenerateModuleHObjCpp.js');
+const generateModuleObjCpp = require('./modules/GenerateModuleObjCpp');
 const generateModuleJavaSpec = require('./modules/GenerateModuleJavaSpec.js');
 const GenerateModuleJniCpp = require('./modules/GenerateModuleJniCpp.js');
 const GenerateModuleJniH = require('./modules/GenerateModuleJniH.js');
-const generateModuleMm = require('./modules/GenerateModuleMm.js');
 const generatePropsJavaInterface = require('./components/GeneratePropsJavaInterface.js');
 const generatePropsJavaDelegate = require('./components/GeneratePropsJavaDelegate.js');
 const generateTests = require('./components/GenerateTests.js');
@@ -74,8 +73,7 @@ const GENERATORS = {
   modules: [
     generateModuleCpp.generate,
     generateModuleH.generate,
-    generateModuleHObjCpp.generate,
-    generateModuleMm.generate,
+    generateModuleObjCpp.generate,
   ],
   // TODO: Refactor this to consolidate various C++ output variation instead of forking Android.
   modulesAndroid: [
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js
deleted file mode 100644
index cd54439ff917f4..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleHObjCpp.js
+++ /dev/null
@@ -1,414 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  SchemaType,
-  FunctionTypeAnnotationParam,
-  FunctionTypeAnnotationReturn,
-  ObjectParamTypeAnnotation,
-  ObjectTypeAliasTypeShape,
-} from '../../CodegenSchema';
-
-const {
-  translateObjectsForStructs,
-  capitalizeFirstLetter,
-  getNamespacedStructName,
-} = require('./ObjCppUtils/GenerateStructs');
-
-const {getTypeAliasTypeAnnotation} = require('./Utils');
-
-type FilesOutput = Map<string, string>;
-
-const moduleTemplate = `    /**
-    * ObjC++ class for module '::_MODULE_NAME_::'
-    */
-    class JSI_EXPORT Native::_MODULE_NAME_::SpecJSI : public ObjCTurboModule {
-    public:
-      Native::_MODULE_NAME_::SpecJSI(const ObjCTurboModule::InitParams &params);
-    };`;
-
-const protocolTemplate = `::_STRUCTS_::
-
-@protocol Native::_MODULE_NAME_::Spec <RCTBridgeModule, RCTTurboModule>
-::_MODULE_PROPERTIES_::
-@end
-`;
-
-const callbackArgs = prop =>
-  prop.typeAnnotation.returnTypeAnnotation.type === 'PromiseTypeAnnotation'
-    ? `${
-        prop.typeAnnotation.params.length === 0 ? '' : '\n   resolve'
-      }:(RCTPromiseResolveBlock)resolve
-   reject:(RCTPromiseRejectBlock)reject`
-    : '';
-
-const template = `
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * ${'@'}generated by codegen project: GenerateModuleHObjCpp.js
- */
-
-#ifndef __cplusplus
-#error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
-#endif
-
-#import <vector>
-
-#import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
-#import <RCTRequired/RCTRequired.h>
-#import <RCTTypeSafety/RCTConvertHelpers.h>
-#import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
-#import <React/RCTBridgeModule.h>
-#import <React/RCTCxxConvert.h>
-#import <React/RCTManagedPointer.h>
-
-#import <ReactCommon/RCTTurboModule.h>
-
-::_PROTOCOLS_::
-
-namespace facebook {
-  namespace react {
-::_MODULES_::
-  } // namespace react
-} // namespace facebook
-`;
-
-type ObjectForGeneratingStructs = $ReadOnly<{|
-  name: string,
-  object: $ReadOnly<{|
-    type: 'ObjectTypeAnnotation',
-    properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-  |}>,
-|}>;
-
-const constants = `- (facebook::react::ModuleConstants<JS::Native::_MODULE_NAME_::::Constants::Builder>)constantsToExport;
-- (facebook::react::ModuleConstants<JS::Native::_MODULE_NAME_::::Constants::Builder>)getConstants;`;
-
-function translatePrimitiveJSTypeToObjCType(
-  param: FunctionTypeAnnotationParam,
-  createErrorMessage: (typeName: string) => string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-) {
-  const {nullable, typeAnnotation} = param;
-
-  function wrapIntoNullableIfNeeded(generatedType: string) {
-    return nullable ? `${generatedType} _Nullable` : generatedType;
-  }
-
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
-  switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
-      switch (realTypeAnnotation.name) {
-        case 'RootTag':
-          return nullable ? 'NSNumber *' : 'double';
-        default:
-          (realTypeAnnotation.name: empty);
-          throw new Error(createErrorMessage(realTypeAnnotation.name));
-      }
-    case 'StringTypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSString *');
-    case 'NumberTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return nullable ? 'NSNumber *' : 'double';
-    case 'BooleanTypeAnnotation':
-      return nullable ? 'NSNumber * _Nullable' : 'BOOL';
-    case 'ObjectTypeAnnotation':
-      if (typeAnnotation.type === 'TypeAliasTypeAnnotation') {
-        return getNamespacedStructName(typeAnnotation.name) + ' &';
-      }
-      return wrapIntoNullableIfNeeded('NSDictionary *');
-    case 'GenericObjectTypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSDictionary *');
-    case 'ArrayTypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSArray *');
-    case 'FunctionTypeAnnotation':
-      return 'RCTResponseSenderBlock';
-    default:
-      // TODO (T65847278): Figure out why this does not work.
-      // (type: empty);
-      throw new Error(createErrorMessage(realTypeAnnotation.type));
-  }
-}
-
-function translatePrimitiveJSTypeToObjCTypeForReturn(
-  typeAnnotation: FunctionTypeAnnotationReturn,
-  createErrorMessage: (typeName: string) => string,
-) {
-  function wrapIntoNullableIfNeeded(generatedType: string) {
-    return typeAnnotation.nullable
-      ? `${generatedType} _Nullable`
-      : generatedType;
-  }
-  switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
-      switch (typeAnnotation.name) {
-        case 'RootTag':
-          return wrapIntoNullableIfNeeded('NSNumber *');
-        default:
-          (typeAnnotation.name: empty);
-          throw new Error(createErrorMessage(typeAnnotation.name));
-      }
-    case 'VoidTypeAnnotation':
-    case 'PromiseTypeAnnotation':
-      return 'void';
-    case 'StringTypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSString *');
-    case 'NumberTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSNumber *');
-    case 'BooleanTypeAnnotation':
-      return typeAnnotation.nullable ? 'NSNumber * _Nullable' : 'BOOL';
-    case 'GenericObjectTypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSDictionary *');
-    case 'ArrayTypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSArray<id<NSObject>> *');
-    case 'ObjectTypeAnnotation':
-      return wrapIntoNullableIfNeeded('NSDictionary *');
-    default:
-      // TODO (T65847278): Figure out why this does not work.
-      // (typeAnnotation.type: empty);
-      throw new Error(createErrorMessage(typeAnnotation.type));
-  }
-}
-
-function handleArrayOfObjects(
-  objectForGeneratingStructs: Array<ObjectForGeneratingStructs>,
-  propOrParam: FunctionTypeAnnotationParam,
-  name: string,
-) {
-  if (
-    propOrParam.typeAnnotation.type === 'ArrayTypeAnnotation' &&
-    propOrParam.typeAnnotation.elementType
-  ) {
-    const typeAnnotation = propOrParam.typeAnnotation.elementType;
-    const type = typeAnnotation.type;
-
-    if (
-      type === 'ObjectTypeAnnotation' &&
-      typeAnnotation.properties &&
-      typeAnnotation.properties.length > 0
-    ) {
-      objectForGeneratingStructs.push({
-        name,
-        object: {
-          type: 'ObjectTypeAnnotation',
-          properties: typeAnnotation.properties,
-        },
-      });
-    }
-  }
-}
-
-const methodImplementationTemplate =
-  '- (::_RETURN_VALUE_::) ::_PROPERTY_NAME_::::_ARGS_::;';
-
-module.exports = {
-  generate(
-    libraryName: string,
-    schema: SchemaType,
-    moduleSpecName: string,
-  ): FilesOutput {
-    const nativeModules = Object.keys(schema.modules)
-      .sort()
-      .map(moduleName => {
-        const modules = schema.modules[moduleName].nativeModules;
-        if (modules == null) {
-          return null;
-        }
-
-        return modules;
-      })
-      .filter(Boolean)
-      .reduce((acc, components) => Object.assign(acc, components), {});
-
-    const modules = Object.keys(nativeModules)
-      .map(name => moduleTemplate.replace(/::_MODULE_NAME_::/g, name))
-      .join('\n');
-
-    const protocols = Object.keys(nativeModules)
-      .sort()
-      .map(name => {
-        const objectForGeneratingStructs: Array<ObjectForGeneratingStructs> = [];
-        const {aliases, properties} = nativeModules[name];
-        const implementations = properties
-          .map(prop => {
-            const nativeArgs = prop.typeAnnotation.params
-              .map((param, i) => {
-                let paramObjCType;
-                if (
-                  param.typeAnnotation.type === 'ObjectTypeAnnotation' &&
-                  param.typeAnnotation.properties
-                ) {
-                  const variableName =
-                    capitalizeFirstLetter(prop.name) +
-                    capitalizeFirstLetter(param.name);
-                  const structName = 'Spec' + variableName;
-                  objectForGeneratingStructs.push({
-                    name: structName,
-                    object: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: param.typeAnnotation.properties,
-                    },
-                  });
-                  paramObjCType = getNamespacedStructName(structName) + ' &';
-
-                  param.typeAnnotation.properties.map(aProp => {
-                    return handleArrayOfObjects(
-                      objectForGeneratingStructs,
-                      aProp,
-                      'Spec' +
-                        capitalizeFirstLetter(prop.name) +
-                        capitalizeFirstLetter(param.name) +
-                        capitalizeFirstLetter(aProp.name) +
-                        'Element',
-                    );
-                  });
-                } else if (
-                  param.typeAnnotation.type === 'TypeAliasTypeAnnotation'
-                ) {
-                  const typeAnnotation = getTypeAliasTypeAnnotation(
-                    param.typeAnnotation.name,
-                    aliases,
-                  );
-                  if (typeAnnotation.type === 'ObjectTypeAnnotation') {
-                    paramObjCType =
-                      getNamespacedStructName(param.typeAnnotation.name) + ' &';
-                  } else {
-                    throw Error(
-                      `Unsupported type for "${param.typeAnnotation.name}". Found: ${typeAnnotation.type}`,
-                    );
-                  }
-                } else {
-                  paramObjCType = translatePrimitiveJSTypeToObjCType(
-                    param,
-                    typeName =>
-                      `Unsupported type for param "${param.name}" in ${prop.name}. Found: ${typeName}`,
-                    aliases,
-                  );
-
-                  handleArrayOfObjects(
-                    objectForGeneratingStructs,
-                    param,
-                    'Spec' +
-                      capitalizeFirstLetter(prop.name) +
-                      capitalizeFirstLetter(param.name) +
-                      'Element',
-                  );
-                }
-                return `${i === 0 ? '' : param.name}:(${paramObjCType})${
-                  param.name
-                }`;
-              })
-              .join('\n   ')
-              .concat(callbackArgs(prop));
-            const {returnTypeAnnotation} = prop.typeAnnotation;
-            if (
-              returnTypeAnnotation.type === 'ObjectTypeAnnotation' &&
-              returnTypeAnnotation.properties
-            ) {
-              objectForGeneratingStructs.push({
-                name: 'Spec' + capitalizeFirstLetter(prop.name) + 'ReturnType',
-                object: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: returnTypeAnnotation.properties,
-                },
-              });
-            }
-            const implementation = methodImplementationTemplate
-              .replace('::_PROPERTY_NAME_::', prop.name)
-              .replace(
-                '::_RETURN_VALUE_::',
-                translatePrimitiveJSTypeToObjCTypeForReturn(
-                  returnTypeAnnotation,
-                  typeName =>
-                    `Unsupported return type for ${prop.name}. Found: ${typeName}`,
-                ),
-              )
-              .replace('::_ARGS_::', nativeArgs);
-            if (prop.name === 'getConstants') {
-              if (
-                prop.typeAnnotation.returnTypeAnnotation.properties &&
-                prop.typeAnnotation.returnTypeAnnotation.properties.length === 0
-              ) {
-                return '';
-              }
-              return constants.replace(/::_MODULE_NAME_::/, name);
-            }
-            return implementation;
-          })
-          .join('\n');
-
-        Object.keys(aliases)
-          .reverse()
-          .map((aliasName, i) => {
-            const alias = aliases[aliasName];
-
-            let paramObjCType = '';
-
-            switch (alias.type) {
-              case 'ObjectTypeAnnotation':
-                if (alias.properties) {
-                  objectForGeneratingStructs.push({
-                    name: aliasName,
-                    object: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: alias.properties,
-                    },
-                  });
-                  paramObjCType = getNamespacedStructName(alias.name) + ' &';
-                }
-                break;
-              default:
-                throw Error(
-                  `Unsupported type for "${aliasName}". Found: ${alias.type}`,
-                );
-            }
-            return `${i === 0 ? '' : aliasName}:(${paramObjCType})${aliasName}`;
-          })
-          .join('\n');
-
-        return protocolTemplate
-          .replace(
-            /::_STRUCTS_::/g,
-            translateObjectsForStructs(
-              objectForGeneratingStructs,
-              name,
-              aliases,
-            ),
-          )
-          .replace(/::_MODULE_PROPERTIES_::/g, implementations)
-          .replace(/::_MODULE_NAME_::/g, name)
-          .replace('::_PROPERTIES_MAP_::', '');
-      })
-      .join('\n');
-
-    const fileName = `${moduleSpecName}.h`;
-    const replacedTemplate = template
-      .replace(/::_MODULES_::/g, modules)
-      .replace(/::_PROTOCOLS_::/g, protocols);
-
-    return new Map([[fileName, replacedTemplate]]);
-  },
-};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js
deleted file mode 100644
index 53a0585886e3dd..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleMm.js
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {SchemaType, NativeModuleShape} from '../../CodegenSchema';
-
-const {capitalizeFirstLetter} = require('./ObjCppUtils/GenerateStructs');
-const {flatObjects} = require('./ObjCppUtils/Utils');
-const {getTypeAliasTypeAnnotation} = require('./Utils');
-
-type FilesOutput = Map<string, string>;
-
-const propertyHeaderTemplate =
-  '    static facebook::jsi::Value __hostFunction_Native::_MODULE_NAME_::SpecJSI_::_PROPERTY_NAME_::(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {';
-
-const propertyCastTemplate = `static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, ::_KIND_::, "::_PROPERTY_NAME_::", @selector(::_PROPERTY_NAME_::::_ARGS_::), args, count);`;
-
-const propertyTemplate = `
-${propertyHeaderTemplate}
-      return ${propertyCastTemplate}
-    }`;
-
-const propertyDefTemplate =
-  '      methodMap_["::_PROPERTY_NAME_::"] = MethodMetadata {::_ARGS_COUNT_::, __hostFunction_Native::_MODULE_NAME_::SpecJSI_::_PROPERTY_NAME_::};';
-
-const moduleTemplate = `
-    ::_TURBOMODULE_METHOD_INVOKERS_::
-
-    Native::_MODULE_NAME_::SpecJSI::Native::_MODULE_NAME_::SpecJSI(const ObjCTurboModule::InitParams &params)
-      : ObjCTurboModule(params) {
-    ::_PROPERTIES_MAP_::::_CONVERSION_SELECTORS_::
-    }`.trim();
-
-const getterTemplate = `
-@implementation RCTCxxConvert (Native::_MODULE_NAME_::_::_GETTER_NAME_::)
-+ (RCTManagedPointer *)JS_Native::_MODULE_NAME_::_::_GETTER_NAME_:::(id)json
-{
-  return facebook::react::managedPointer<JS::Native::_MODULE_NAME_::::::_GETTER_NAME_::>(json);
-}
-@end
-`;
-
-const argConvertionTemplate =
-  '\n      setMethodArgConversionSelector(@"::_ARG_NAME_::", ::_ARG_NUMBER_::, @"JS_Native::_MODULE_NAME_::_::_SELECTOR_NAME_:::");';
-
-const template = `
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * ${'@'}generated by codegen project: GenerateModuleMm.js
- */
-
-#include <::_INCLUDE_::>
-#import <folly/Optional.h>
-
-::_GETTERS_::
-namespace facebook {
-  namespace react {
-::_MODULES_::
-  } // namespace react
-} // namespace facebook
-`;
-
-function translateReturnTypeToKind(typeAnnotation): string {
-  switch (typeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
-      switch (typeAnnotation.name) {
-        case 'RootTag':
-          return 'NumberKind';
-        default:
-          (typeAnnotation.name: empty);
-          throw new Error(
-            `Invalid ReservedFunctionValueTypeName name, got ${typeAnnotation.name}`,
-          );
-      }
-    case 'VoidTypeAnnotation':
-      return 'VoidKind';
-    case 'StringTypeAnnotation':
-      return 'StringKind';
-    case 'BooleanTypeAnnotation':
-      return 'BooleanKind';
-    case 'NumberTypeAnnotation':
-    case 'DoubleTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return 'NumberKind';
-    case 'PromiseTypeAnnotation':
-      return 'PromiseKind';
-    case 'GenericObjectTypeAnnotation':
-    case 'ObjectTypeAnnotation':
-      return 'ObjectKind';
-    case 'ArrayTypeAnnotation':
-      return 'ArrayKind';
-    default:
-      // TODO (T65847278): Figure out why this does not work.
-      // (typeAnnotation.type: empty);
-      throw new Error(
-        `Unknown prop type for returning value, found: ${typeAnnotation.type}"`,
-      );
-  }
-}
-
-function translateMethodForImplementation(property): string {
-  const {returnTypeAnnotation} = property.typeAnnotation;
-
-  const numberOfParams =
-    property.typeAnnotation.params.length +
-    (returnTypeAnnotation.type === 'PromiseTypeAnnotation' ? 2 : 0);
-  const translatedArguments = property.typeAnnotation.params
-    .map(param => param.name)
-    .concat(
-      returnTypeAnnotation.type === 'PromiseTypeAnnotation'
-        ? ['resolve', 'reject']
-        : [],
-    )
-    .slice(1)
-    .join(':')
-    .concat(':');
-  if (
-    property.name === 'getConstants' &&
-    returnTypeAnnotation.type === 'ObjectTypeAnnotation' &&
-    returnTypeAnnotation.properties &&
-    returnTypeAnnotation.properties.length === 0
-  ) {
-    return '';
-  }
-  return propertyTemplate
-    .replace(/::_KIND_::/g, translateReturnTypeToKind(returnTypeAnnotation))
-    .replace(/::_PROPERTY_NAME_::/g, property.name)
-    .replace(
-      /::_ARGS_::/g,
-      numberOfParams === 0
-        ? ''
-        : (numberOfParams === 1 ? '' : ':') + translatedArguments,
-    );
-}
-
-module.exports = {
-  generate(
-    libraryName: string,
-    schema: SchemaType,
-    moduleSpecName: string,
-  ): FilesOutput {
-    const nativeModules: {[name: string]: NativeModuleShape, ...} = Object.keys(
-      schema.modules,
-    )
-      .map(moduleName => {
-        const modules = schema.modules[moduleName].nativeModules;
-        if (modules == null) {
-          return null;
-        }
-
-        return modules;
-      })
-      .filter(Boolean)
-      .reduce((acc, modules) => Object.assign(acc, modules), {});
-
-    const gettersImplementations = Object.keys(nativeModules)
-      .reduce((acc, moduleName: string) => {
-        const module: NativeModuleShape = nativeModules[moduleName];
-        return acc.concat(
-          flatObjects(
-            module.properties
-              .reduce((moduleAcc, property) => {
-                const {returnTypeAnnotation} = property.typeAnnotation;
-                if (returnTypeAnnotation.type === 'ObjectTypeAnnotation') {
-                  const {properties} = returnTypeAnnotation;
-                  if (properties) {
-                    moduleAcc.push({
-                      name:
-                        'Spec' +
-                        capitalizeFirstLetter(property.name) +
-                        'ReturnType',
-                      object: {
-                        type: 'ObjectTypeAnnotation',
-                        properties: properties,
-                      },
-                    });
-                  }
-                }
-                if (property.typeAnnotation.params) {
-                  return moduleAcc.concat(
-                    property.typeAnnotation.params
-                      .map(param => {
-                        if (
-                          param.typeAnnotation.type === 'ObjectTypeAnnotation'
-                        ) {
-                          const {properties} = param.typeAnnotation;
-                          if (properties) {
-                            return {
-                              name:
-                                'Spec' +
-                                capitalizeFirstLetter(property.name) +
-                                capitalizeFirstLetter(param.name),
-                              object: {
-                                type: 'ObjectTypeAnnotation',
-                                properties: properties,
-                              },
-                            };
-                          }
-                        }
-                      })
-                      .filter(Boolean),
-                  );
-                }
-                return moduleAcc;
-              }, [])
-              .concat(
-                Object.keys(module.aliases).map(aliasName => {
-                  const alias = getTypeAliasTypeAnnotation(
-                    aliasName,
-                    module.aliases,
-                  );
-                  return {
-                    name: aliasName,
-                    object: {type: alias.type, properties: alias.properties},
-                  };
-                }),
-              ),
-            false,
-            module.aliases,
-          )
-            .map(object =>
-              getterTemplate
-                .replace(/::_GETTER_NAME_::/g, object.name)
-                .replace(/::_MODULE_NAME_::/g, moduleName),
-            )
-            .join('\n'),
-        );
-      }, [])
-      .join('\n');
-
-    const modules = Object.keys(nativeModules)
-      .map(name => {
-        const {aliases, properties} = nativeModules[name];
-        const translatedMethods = properties
-          .map(property => translateMethodForImplementation(property))
-          .join('\n');
-        return moduleTemplate
-          .replace(/::_TURBOMODULE_METHOD_INVOKERS_::/g, translatedMethods)
-          .replace(
-            '::_PROPERTIES_MAP_::',
-            properties
-              .map(
-                ({
-                  name: propertyName,
-                  typeAnnotation: {params, returnTypeAnnotation},
-                }) =>
-                  propertyName === 'getConstants' &&
-                  returnTypeAnnotation.type === 'ObjectTypeAnnotation' &&
-                  returnTypeAnnotation.properties &&
-                  returnTypeAnnotation.properties.length === 0
-                    ? ''
-                    : propertyDefTemplate
-                        .replace(/::_PROPERTY_NAME_::/g, propertyName)
-                        .replace(/::_ARGS_COUNT_::/g, params.length.toString()),
-              )
-              .join('\n'),
-          )
-          .replace(
-            '::_CONVERSION_SELECTORS_::',
-            properties
-              .map(({name: propertyName, typeAnnotation: {params}}) =>
-                params
-                  .map((param, index) => {
-                    const typeAnnotation =
-                      param.typeAnnotation.type === 'TypeAliasTypeAnnotation'
-                        ? getTypeAliasTypeAnnotation(
-                            param.typeAnnotation.name,
-                            aliases,
-                          )
-                        : param.typeAnnotation;
-                    const selectorName =
-                      param.typeAnnotation.type === 'TypeAliasTypeAnnotation'
-                        ? param.typeAnnotation.name
-                        : 'Spec' +
-                          capitalizeFirstLetter(propertyName) +
-                          capitalizeFirstLetter(param.name);
-
-                    if (
-                      typeAnnotation.type === 'ObjectTypeAnnotation' &&
-                      typeAnnotation.properties
-                    ) {
-                      return argConvertionTemplate
-                        .replace('::_SELECTOR_NAME_::', selectorName)
-                        .replace('::_ARG_NUMBER_::', index.toString())
-                        .replace('::_ARG_NAME_::', propertyName);
-                    }
-
-                    return '';
-                  })
-                  .join(''),
-              )
-              .join(''),
-          )
-          .replace(/::_MODULE_NAME_::/g, name);
-      })
-      .join('\n');
-
-    const fileName = `${moduleSpecName}-generated.mm`;
-    const replacedTemplate = template
-      .replace(/::_GETTERS_::/g, gettersImplementations)
-      .replace(/::_MODULES_::/g, modules)
-      .replace(/::_LIBRARY_NAME_::/g, libraryName)
-      .replace(/::_INCLUDE_::/g, `${moduleSpecName}/${moduleSpecName}.h`);
-    return new Map([[fileName, replacedTemplate]]);
-  },
-};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
new file mode 100644
index 00000000000000..71855f15f4f864
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
@@ -0,0 +1,191 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {
+  Required,
+  NativeModuleObjectTypeAnnotation,
+  NativeModuleStringTypeAnnotation,
+  NativeModuleNumberTypeAnnotation,
+  NativeModuleInt32TypeAnnotation,
+  NativeModuleDoubleTypeAnnotation,
+  NativeModuleFloatTypeAnnotation,
+  NativeModuleBooleanTypeAnnotation,
+  NativeModuleGenericObjectTypeAnnotation,
+  NativeModuleReservedFunctionValueTypeAnnotation,
+  NativeModuleTypeAliasTypeAnnotation,
+  NativeModuleArrayTypeAnnotation,
+  NativeModuleBaseTypeAnnotation,
+} from '../../../CodegenSchema';
+
+import type {AliasResolver} from '../Utils';
+
+const {capitalize} = require('./Utils');
+
+type StructContext = 'CONSTANTS' | 'REGULAR';
+
+export type RegularStruct = $ReadOnly<{|
+  context: 'REGULAR',
+  name: string,
+  properties: $ReadOnlyArray<StructProperty>,
+|}>;
+
+export type ConstantsStruct = $ReadOnly<{|
+  context: 'CONSTANTS',
+  name: string,
+  properties: $ReadOnlyArray<StructProperty>,
+|}>;
+
+export type Struct = RegularStruct | ConstantsStruct;
+
+export type StructProperty = $ReadOnly<{|
+  name: string,
+  optional: boolean,
+  typeAnnotation: StructTypeAnnotation,
+|}>;
+
+export type StructTypeAnnotation =
+  | NativeModuleStringTypeAnnotation
+  | NativeModuleNumberTypeAnnotation
+  | NativeModuleInt32TypeAnnotation
+  | NativeModuleDoubleTypeAnnotation
+  | NativeModuleFloatTypeAnnotation
+  | NativeModuleBooleanTypeAnnotation
+  | NativeModuleGenericObjectTypeAnnotation
+  | NativeModuleReservedFunctionValueTypeAnnotation
+  | NativeModuleTypeAliasTypeAnnotation
+  | NativeModuleArrayTypeAnnotation<StructTypeAnnotation>;
+
+class StructCollector {
+  _structs: Map<string, Struct> = new Map();
+
+  process(
+    structName: string,
+    structContext: StructContext,
+    resolveAlias: AliasResolver,
+    typeAnnotation: NativeModuleBaseTypeAnnotation,
+  ): StructTypeAnnotation {
+    switch (typeAnnotation.type) {
+      case 'ObjectTypeAnnotation': {
+        this._insertStruct(structName, structContext, resolveAlias, {
+          ...typeAnnotation,
+          // The nullability status of this struct is recorded in the type-alias we create for it below.
+          nullable: false,
+        });
+        return {
+          type: 'TypeAliasTypeAnnotation',
+          name: structName,
+          nullable: typeAnnotation.nullable,
+        };
+      }
+      case 'ArrayTypeAnnotation': {
+        if (typeAnnotation.elementType == null) {
+          return {
+            type: 'ArrayTypeAnnotation',
+            nullable: typeAnnotation.nullable,
+          };
+        }
+
+        return {
+          type: 'ArrayTypeAnnotation',
+          nullable: typeAnnotation.nullable,
+          elementType: this.process(
+            structName + 'Element',
+            structContext,
+            resolveAlias,
+            typeAnnotation.elementType,
+          ),
+        };
+      }
+      case 'TypeAliasTypeAnnotation': {
+        this._insertAlias(typeAnnotation.name, structContext, resolveAlias);
+        return typeAnnotation;
+      }
+      default: {
+        return typeAnnotation;
+      }
+    }
+  }
+
+  _insertAlias(
+    aliasName: string,
+    structContext: StructContext,
+    resolveAlias: AliasResolver,
+  ): void {
+    const usedStruct = this._structs.get(aliasName);
+    if (usedStruct == null) {
+      this._insertStruct(
+        aliasName,
+        structContext,
+        resolveAlias,
+        resolveAlias(aliasName),
+      );
+    } else if (usedStruct.context !== structContext) {
+      throw new Error(
+        `Tried to use alias '${aliasName}' in a getConstants() return type and inside a regular struct.`,
+      );
+    }
+  }
+
+  _insertStruct(
+    structName: string,
+    structContext: StructContext,
+    resolveAlias: AliasResolver,
+    objectTypeAnnotation: Required<NativeModuleObjectTypeAnnotation>,
+  ): void {
+    const properties = objectTypeAnnotation.properties.map(property => {
+      const {typeAnnotation: propertyTypeAnnotation} = property;
+      const propertyStructName = structName + capitalize(property.name);
+
+      return {
+        ...property,
+        typeAnnotation: this.process(
+          propertyStructName,
+          structContext,
+          resolveAlias,
+          propertyTypeAnnotation,
+        ),
+      };
+    });
+
+    switch (structContext) {
+      case 'REGULAR':
+        this._structs.set(structName, {
+          name: structName,
+          context: 'REGULAR',
+          properties: properties,
+        });
+        break;
+      case 'CONSTANTS':
+        this._structs.set(structName, {
+          name: structName,
+          context: 'CONSTANTS',
+          properties: properties,
+        });
+        break;
+      default:
+        (structContext: empty);
+        throw new Error(`Detected an invalid struct context: ${structContext}`);
+    }
+  }
+
+  getAllStructs(): $ReadOnlyArray<Struct> {
+    return [...this._structs.values()];
+  }
+
+  getStruct(name: string): ?Struct {
+    return this._structs.get(name);
+  }
+}
+
+module.exports = {
+  StructCollector,
+};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js
new file mode 100644
index 00000000000000..0b989b12e03d02
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/Utils.js
@@ -0,0 +1,36 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {StructProperty} from './StructCollector';
+
+function capitalize(string: string): string {
+  return string.charAt(0).toUpperCase() + string.slice(1);
+}
+function getSafePropertyName(property: StructProperty): string {
+  if (property.name === 'id') {
+    return `${property.name}_`;
+  }
+  return property.name;
+}
+
+function getNamespacedStructName(
+  moduleName: string,
+  structName: string,
+): string {
+  return `JS::Native${moduleName}::${structName}`;
+}
+
+module.exports = {
+  capitalize,
+  getSafePropertyName,
+  getNamespacedStructName,
+};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
new file mode 100644
index 00000000000000..27a71f43a32cf1
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
@@ -0,0 +1,263 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+const {
+  capitalize,
+  getSafePropertyName,
+  getNamespacedStructName,
+} = require('../Utils');
+
+import type {StructTypeAnnotation, ConstantsStruct} from '../StructCollector';
+import type {StructSerilizationOutput} from './serializeStruct';
+
+const StructTemplate = ({
+  moduleName,
+  structName,
+  builderInputProps,
+}: $ReadOnly<{|
+  moduleName: string,
+  structName: string,
+  builderInputProps: string,
+|}>) => `
+namespace JS {
+  namespace Native${moduleName} {
+    struct ${structName} {
+
+      struct Builder {
+        struct Input {
+          ${builderInputProps}
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ${structName} */
+        Builder(${structName} i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ${structName} fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ${structName}(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}`;
+
+const MethodTemplate = ({
+  moduleName,
+  structName,
+  properties,
+}: $ReadOnly<{|
+  moduleName: string,
+  structName: string,
+  properties: string,
+|}>) => `
+inline JS::Native${moduleName}::${structName}::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+${properties}
+  return d;
+}) {}
+inline JS::Native${moduleName}::${structName}::Builder::Builder(${structName} i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}`;
+
+function toObjCType(
+  moduleName: string,
+  typeAnnotation: StructTypeAnnotation,
+  isOptional: boolean = false,
+): string {
+  const isRequired = !typeAnnotation.nullable && !isOptional;
+  const wrapFollyOptional = (type: string) => {
+    return isRequired ? type : `folly::Optional<${type}>`;
+  };
+
+  switch (typeAnnotation.type) {
+    case 'ReservedFunctionValueTypeAnnotation':
+      switch (typeAnnotation.name) {
+        case 'RootTag':
+          return wrapFollyOptional('double');
+        default:
+          (typeAnnotation.name: empty);
+          throw new Error(`Unknown prop type, found: ${typeAnnotation.name}"`);
+      }
+    case 'StringTypeAnnotation':
+      return 'NSString *';
+    case 'NumberTypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'FloatTypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'Int32TypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'DoubleTypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'BooleanTypeAnnotation':
+      return wrapFollyOptional('bool');
+    case 'GenericObjectTypeAnnotation':
+      return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable ';
+    case 'ArrayTypeAnnotation':
+      if (typeAnnotation.elementType == null) {
+        return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable ';
+      }
+
+      return wrapFollyOptional(
+        `std::vector<${toObjCType(moduleName, typeAnnotation.elementType)}>`,
+      );
+    case 'TypeAliasTypeAnnotation':
+      const structName = capitalize(typeAnnotation.name);
+      const namespacedStructName = getNamespacedStructName(
+        moduleName,
+        structName,
+      );
+      return wrapFollyOptional(`${namespacedStructName}::Builder`);
+    default:
+      (typeAnnotation.type: empty);
+      throw new Error(
+        `Couldn't convert into ObjC type: ${typeAnnotation.type}"`,
+      );
+  }
+}
+
+function toObjCValue(
+  moduleName: string,
+  typeAnnotation: StructTypeAnnotation,
+  value: string,
+  depth: number,
+  isOptional: boolean = false,
+): string {
+  const isRequired = !isOptional && !typeAnnotation.nullable;
+
+  function wrapPrimitive(type: string) {
+    return !isRequired
+      ? `${value}.hasValue() ? @((${type})${value}.value()) : nil`
+      : `@(${value})`;
+  }
+
+  switch (typeAnnotation.type) {
+    case 'ReservedFunctionValueTypeAnnotation':
+      switch (typeAnnotation.name) {
+        case 'RootTag':
+          return wrapPrimitive('double');
+        default:
+          (typeAnnotation.name: empty);
+          throw new Error(
+            `Couldn't convert into ObjC type: ${typeAnnotation.type}"`,
+          );
+      }
+    case 'StringTypeAnnotation':
+      return value;
+    case 'NumberTypeAnnotation':
+      return wrapPrimitive('double');
+    case 'FloatTypeAnnotation':
+      return wrapPrimitive('double');
+    case 'Int32TypeAnnotation':
+      return wrapPrimitive('double');
+    case 'DoubleTypeAnnotation':
+      return wrapPrimitive('double');
+    case 'BooleanTypeAnnotation':
+      return wrapPrimitive('BOOL');
+    case 'GenericObjectTypeAnnotation':
+      return value;
+    case 'ArrayTypeAnnotation':
+      const {elementType} = typeAnnotation;
+      if (elementType == null) {
+        return value;
+      }
+
+      const localVarName = `el${'_'.repeat(depth + 1)}`;
+      const elementObjCType = toObjCType(moduleName, elementType);
+      const elementObjCValue = toObjCValue(
+        moduleName,
+        elementType,
+        localVarName,
+        depth + 1,
+      );
+
+      const RCTConvertVecToArray = transformer => {
+        return `RCTConvert${
+          !isRequired ? 'Optional' : ''
+        }VecToArray(${value}, ${transformer})`;
+      };
+
+      return RCTConvertVecToArray(
+        `^id(${elementObjCType} ${localVarName}) { return ${elementObjCValue}; }`,
+      );
+    case 'TypeAliasTypeAnnotation':
+      return !isRequired
+        ? `${value}.hasValue() ? ${value}.value().buildUnsafeRawValue() : nil`
+        : `${value}.buildUnsafeRawValue()`;
+    default:
+      (typeAnnotation.type: empty);
+      throw new Error(
+        `Couldn't convert into ObjC value: ${typeAnnotation.type}"`,
+      );
+  }
+}
+
+function serializeConstantsStruct(
+  moduleName: string,
+  struct: ConstantsStruct,
+): StructSerilizationOutput {
+  const declaration = StructTemplate({
+    moduleName,
+    structName: struct.name,
+    builderInputProps: struct.properties
+      .map(property => {
+        const {typeAnnotation, optional} = property;
+        const propName = getSafePropertyName(property);
+        const objCType = toObjCType(moduleName, typeAnnotation, optional);
+
+        if (!optional) {
+          return `RCTRequired<${objCType}> ${propName};`;
+        }
+
+        const space = ' '.repeat(objCType.endsWith('*') ? 0 : 1);
+        return `${objCType}${space}${propName};`;
+      })
+      .join('\n          '),
+  });
+
+  const methods = MethodTemplate({
+    moduleName,
+    structName: struct.name,
+    properties: struct.properties
+      .map(property => {
+        const {typeAnnotation, optional} = property;
+        const propName = getSafePropertyName(property);
+        const objCValue = toObjCValue(
+          moduleName,
+          typeAnnotation,
+          propName,
+          0,
+          optional,
+        );
+
+        let varDecl = `auto ${propName} = i.${propName}`;
+        if (!optional) {
+          varDecl += '.get()';
+        }
+
+        const assignment = `d[@"${propName}"] = ` + objCValue;
+        return `  ${varDecl};\n  ${assignment};`;
+      })
+      .join('\n'),
+  });
+
+  return {declaration, methods};
+}
+
+module.exports = {
+  serializeConstantsStruct,
+};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
new file mode 100644
index 00000000000000..ce7b5f12d4f5bb
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
@@ -0,0 +1,251 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+const {
+  capitalize,
+  getSafePropertyName,
+  getNamespacedStructName,
+} = require('../Utils');
+
+import type {StructTypeAnnotation, RegularStruct} from '../StructCollector';
+import type {StructSerilizationOutput} from './serializeStruct';
+
+const StructTemplate = ({
+  moduleName,
+  structName,
+  structProperties,
+}: $ReadOnly<{|
+  moduleName: string,
+  structName: string,
+  structProperties: string,
+|}>) => `
+namespace JS {
+  namespace Native${moduleName} {
+    struct ${structName} {
+      ${structProperties}
+
+      ${structName}(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (Native${moduleName}_${structName})
++ (RCTManagedPointer *)JS_Native${moduleName}_${structName}:(id)json;
+@end
+`;
+
+const MethodTemplate = ({
+  returnType,
+  returnValue,
+  moduleName,
+  structName,
+  propertyName,
+}: $ReadOnly<{|
+  returnType: string,
+  returnValue: string,
+  moduleName: string,
+  structName: string,
+  propertyName: string,
+|}>) => `
+inline ${returnType}JS::Native${moduleName}::${structName}::${propertyName}() const
+{
+  id const p = _v[@"${propertyName}"];
+  return ${returnValue};
+}
+`;
+
+function toObjCType(
+  moduleName: string,
+  typeAnnotation: StructTypeAnnotation,
+  isOptional: boolean = false,
+): string {
+  const isRequired = !typeAnnotation.nullable && !isOptional;
+  const wrapFollyOptional = (type: string) => {
+    return isRequired ? type : `folly::Optional<${type}>`;
+  };
+
+  switch (typeAnnotation.type) {
+    case 'ReservedFunctionValueTypeAnnotation':
+      switch (typeAnnotation.name) {
+        case 'RootTag':
+          return wrapFollyOptional('double');
+        default:
+          (typeAnnotation.name: empty);
+          throw new Error(`Unknown prop type, found: ${typeAnnotation.name}"`);
+      }
+    case 'StringTypeAnnotation':
+      return 'NSString *';
+    case 'NumberTypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'FloatTypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'Int32TypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'DoubleTypeAnnotation':
+      return wrapFollyOptional('double');
+    case 'BooleanTypeAnnotation':
+      return wrapFollyOptional('bool');
+    case 'GenericObjectTypeAnnotation':
+      return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable';
+    case 'ArrayTypeAnnotation':
+      if (typeAnnotation.elementType == null) {
+        return isRequired ? 'id<NSObject> ' : 'id<NSObject> _Nullable';
+      }
+      return wrapFollyOptional(
+        `facebook::react::LazyVector<${toObjCType(
+          moduleName,
+          typeAnnotation.elementType,
+        )}>`,
+      );
+    case 'TypeAliasTypeAnnotation':
+      const structName = capitalize(typeAnnotation.name);
+      const namespacedStructName = getNamespacedStructName(
+        moduleName,
+        structName,
+      );
+      return wrapFollyOptional(namespacedStructName);
+    default:
+      (typeAnnotation.type: empty);
+      throw new Error(
+        `Couldn't convert into ObjC type: ${typeAnnotation.type}"`,
+      );
+  }
+}
+
+function toObjCValue(
+  moduleName: string,
+  typeAnnotation: StructTypeAnnotation,
+  value: string,
+  depth: number,
+  isOptional: boolean = false,
+): string {
+  const isRequired = !typeAnnotation.nullable && !isOptional;
+  const RCTBridgingTo = (type: string, arg?: string) => {
+    const args = [value, arg].filter(Boolean).join(', ');
+    return isRequired
+      ? `RCTBridgingTo${type}(${args})`
+      : `RCTBridgingToOptional${type}(${args})`;
+  };
+
+  switch (typeAnnotation.type) {
+    case 'ReservedFunctionValueTypeAnnotation':
+      switch (typeAnnotation.name) {
+        case 'RootTag':
+          return RCTBridgingTo('Double');
+        default:
+          (typeAnnotation.name: empty);
+          throw new Error(
+            `Couldn't convert into ObjC type: ${typeAnnotation.type}"`,
+          );
+      }
+    case 'StringTypeAnnotation':
+      return RCTBridgingTo('String');
+    case 'NumberTypeAnnotation':
+      return RCTBridgingTo('Double');
+    case 'FloatTypeAnnotation':
+      return RCTBridgingTo('Double');
+    case 'Int32TypeAnnotation':
+      return RCTBridgingTo('Double');
+    case 'DoubleTypeAnnotation':
+      return RCTBridgingTo('Double');
+    case 'BooleanTypeAnnotation':
+      return RCTBridgingTo('Bool');
+    case 'GenericObjectTypeAnnotation':
+      return value;
+    case 'ArrayTypeAnnotation':
+      const {elementType} = typeAnnotation;
+      if (elementType == null) {
+        return value;
+      }
+
+      const localVarName = `itemValue_${depth}`;
+      const elementObjCType = toObjCType(moduleName, elementType);
+      const elementObjCValue = toObjCValue(
+        moduleName,
+        elementType,
+        localVarName,
+        depth + 1,
+      );
+
+      return RCTBridgingTo(
+        'Vec',
+        `^${elementObjCType}(id ${localVarName}) { return ${elementObjCValue}; }`,
+      );
+    case 'TypeAliasTypeAnnotation':
+      const structName = capitalize(typeAnnotation.name);
+      const namespacedStructName = getNamespacedStructName(
+        moduleName,
+        structName,
+      );
+
+      return !isRequired
+        ? `(p == nil ? folly::none : folly::make_optional(${namespacedStructName}(p)))`
+        : `${namespacedStructName}(p)`;
+    default:
+      (typeAnnotation.type: empty);
+      throw new Error(
+        `Couldn't convert into ObjC value: ${typeAnnotation.type}"`,
+      );
+  }
+}
+
+function serializeRegularStruct(
+  moduleName: string,
+  struct: RegularStruct,
+): StructSerilizationOutput {
+  const declaration = StructTemplate({
+    moduleName: moduleName,
+    structName: struct.name,
+    structProperties: struct.properties
+      .map(property => {
+        const {typeAnnotation, optional} = property;
+        const propName = getSafePropertyName(property);
+        const returnType = toObjCType(moduleName, typeAnnotation, optional);
+
+        const padding = ' '.repeat(returnType.endsWith('*') ? 0 : 1);
+        return `${returnType}${padding}${propName}() const;`;
+      })
+      .join('\n      '),
+  });
+
+  const methods = struct.properties
+    .map<string>(property => {
+      const {typeAnnotation, optional} = property;
+      const propName = getSafePropertyName(property);
+      const returnType = toObjCType(moduleName, typeAnnotation, optional);
+      const returnValue = toObjCValue(
+        moduleName,
+        typeAnnotation,
+        'p',
+        0,
+        optional,
+      );
+
+      const padding = ' '.repeat(returnType.endsWith('*') ? 0 : 1);
+      return MethodTemplate({
+        moduleName,
+        structName: struct.name,
+        returnType: returnType + padding,
+        returnValue: returnValue,
+        propertyName: propName,
+      });
+    })
+    .join('\n');
+
+  return {methods, declaration};
+}
+
+module.exports = {
+  serializeRegularStruct,
+};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js
new file mode 100644
index 00000000000000..fe2355333b3a83
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeStruct.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {Struct} from '../StructCollector';
+
+const {serializeConstantsStruct} = require('./serializeConstantsStruct');
+const {serializeRegularStruct} = require('./serializeRegularStruct');
+
+export type StructSerilizationOutput = $ReadOnly<{|
+  methods: string,
+  declaration: string,
+|}>;
+
+function serializeStruct(
+  moduleName: string,
+  struct: Struct,
+): StructSerilizationOutput {
+  if (struct.context === 'REGULAR') {
+    return serializeRegularStruct(moduleName, struct);
+  }
+  return serializeConstantsStruct(moduleName, struct);
+}
+
+module.exports = {
+  serializeStruct,
+};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
new file mode 100644
index 00000000000000..0f1852415b206c
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
@@ -0,0 +1,210 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {SchemaType} from '../../../CodegenSchema';
+import type {MethodSerializationOutput} from './serializeMethod';
+
+const {createAliasResolver, getModules} = require('../Utils');
+
+const {StructCollector} = require('./StructCollector');
+const {serializeStruct} = require('./header/serializeStruct');
+const {serializeMethod} = require('./serializeMethod');
+const {serializeModuleSource} = require('./source/serializeModule');
+
+type FilesOutput = Map<string, string>;
+
+const ModuleDeclarationTemplate = ({
+  moduleName,
+  structDeclarations,
+  protocolMethods,
+}: $ReadOnly<{|
+  moduleName: string,
+  structDeclarations: string,
+  protocolMethods: string,
+|}>) => `
+${structDeclarations}
+@protocol Native${moduleName}Spec <RCTBridgeModule, RCTTurboModule>
+
+${protocolMethods}
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module '${moduleName}'
+     */
+    class JSI_EXPORT Native${moduleName}SpecJSI : public ObjCTurboModule {
+    public:
+      Native${moduleName}SpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+`;
+
+const HeaderFileTemplate = ({
+  moduleDeclarations,
+  structInlineMethods,
+}: $ReadOnly<{|
+  moduleDeclarations: string,
+  structInlineMethods: string,
+|}>) => `
+/**
+ * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * ${'@'}generated by codegen project: GenerateModuleHObjCpp.js
+ */
+
+#ifndef __cplusplus
+#error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
+#endif
+
+#import <vector>
+
+#import <Foundation/Foundation.h>
+
+#import <folly/Optional.h>
+
+#import <RCTRequired/RCTRequired.h>
+#import <RCTTypeSafety/RCTConvertHelpers.h>
+#import <RCTTypeSafety/RCTTypedModuleConstants.h>
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTCxxConvert.h>
+#import <React/RCTManagedPointer.h>
+
+#import <ReactCommon/RCTTurboModule.h>
+
+${moduleDeclarations}
+
+${structInlineMethods}
+`;
+
+const SourceFileTemplate = ({
+  headerFileName,
+  moduleImplementations,
+}: $ReadOnly<{|
+  headerFileName: string,
+  moduleImplementations: string,
+|}>) => `
+/**
+ * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * ${'@'}generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
+ */
+
+#import "${headerFileName}"
+
+${moduleImplementations}
+`;
+
+module.exports = {
+  generate(
+    libraryName: string,
+    schema: SchemaType,
+    moduleSpecName: string,
+  ): FilesOutput {
+    const nativeModules = getModules(schema);
+
+    const moduleDeclarations: Array<string> = [];
+    const structInlineMethods: Array<string> = [];
+    const moduleImplementations: Array<string> = [];
+
+    const moduleNames: Array<string> = Object.keys(nativeModules).sort();
+    for (const moduleName of moduleNames) {
+      const {aliases, properties} = nativeModules[moduleName];
+      const resolveAlias = createAliasResolver(aliases);
+      const structCollector = new StructCollector();
+
+      const methodSerializations: Array<MethodSerializationOutput> = [];
+      const serializeProperty = property => {
+        methodSerializations.push(
+          ...serializeMethod(
+            moduleName,
+            property,
+            structCollector,
+            resolveAlias,
+          ),
+        );
+      };
+
+      /**
+       * Note: As we serialize NativeModule methods, we insert structs into
+       * StructCollector, as we encounter them.
+       */
+      properties
+        .filter(property => property.name !== 'getConstants')
+        .forEach(serializeProperty);
+      properties
+        .filter(property => property.name === 'getConstants')
+        .forEach(serializeProperty);
+
+      const generatedStructs = structCollector.getAllStructs();
+      const structStrs = [];
+      const methodStrs = [];
+
+      for (const struct of generatedStructs) {
+        const {methods, declaration} = serializeStruct(moduleName, struct);
+        structStrs.push(declaration);
+        methodStrs.push(methods);
+      }
+
+      moduleDeclarations.push(
+        ModuleDeclarationTemplate({
+          moduleName: moduleName,
+          structDeclarations: structStrs.join('\n'),
+          protocolMethods: methodSerializations
+            .map(({protocolMethod}) => protocolMethod)
+            .join('\n'),
+        }),
+      );
+
+      structInlineMethods.push(methodStrs.join('\n'));
+
+      moduleImplementations.push(
+        serializeModuleSource(
+          moduleName,
+          generatedStructs,
+          methodSerializations.filter(
+            ({selector}) => selector !== 'constantsToExport',
+          ),
+        ),
+      );
+    }
+
+    const headerFileName = `${moduleSpecName}.h`;
+    const headerFile = HeaderFileTemplate({
+      moduleDeclarations: moduleDeclarations.join('\n'),
+      structInlineMethods: structInlineMethods.join('\n'),
+    });
+
+    const sourceFileName = `${moduleSpecName}-generated.mm`;
+    const sourceFile = SourceFileTemplate({
+      headerFileName,
+      moduleImplementations: moduleImplementations.join('\n'),
+    });
+
+    return new Map([
+      [headerFileName, headerFile],
+      [sourceFileName, sourceFile],
+    ]);
+  },
+};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
new file mode 100644
index 00000000000000..6fe0c47b288e9a
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
@@ -0,0 +1,413 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {
+  NativeModuleMethodParamSchema,
+  NativeModuleReturnTypeAnnotation,
+  NativeModulePropertySchema,
+} from '../../../CodegenSchema';
+
+import type {AliasResolver} from '../Utils';
+
+const invariant = require('invariant');
+const {StructCollector} = require('./StructCollector');
+const {capitalize, getNamespacedStructName} = require('./Utils');
+
+const ProtocolMethodTemplate = ({
+  returnObjCType,
+  methodName,
+  params,
+}: $ReadOnly<{|
+  returnObjCType: string,
+  methodName: string,
+  params: string,
+|}>) => `- (${returnObjCType})${methodName}${params};`;
+
+export type StructParameterRecord = $ReadOnly<{|
+  paramIndex: number,
+  structName: string,
+|}>;
+
+type ReturnJSType =
+  | 'VoidKind'
+  | 'PromiseKind'
+  | 'ObjectKind'
+  | 'ArrayKind'
+  | 'NumberKind'
+  | 'StringKind';
+
+export type MethodSerializationOutput = $ReadOnly<{|
+  methodName: string,
+  protocolMethod: string,
+  selector: string,
+  structParamRecords: $ReadOnlyArray<StructParameterRecord>,
+  returnJSType: ReturnJSType,
+|}>;
+
+function serializeMethod(
+  moduleName: string,
+  property: NativeModulePropertySchema,
+  structCollector: StructCollector,
+  resolveAlias: AliasResolver,
+): $ReadOnlyArray<MethodSerializationOutput> {
+  const {
+    name: methodName,
+    typeAnnotation: {params, returnTypeAnnotation},
+  } = property;
+
+  if (methodName === 'getConstants') {
+    return serializeConstantsProtocolMethods(
+      moduleName,
+      property,
+      structCollector,
+      resolveAlias,
+    );
+  }
+
+  const methodParams: Array<{|paramName: string, objCType: string|}> = [];
+  const structParamRecords: Array<StructParameterRecord> = [];
+
+  params.forEach((param, index) => {
+    const structName = `Spec${capitalize(methodName)}${capitalize(param.name)}`;
+    const {objCType, isStruct} = getParamObjCType(
+      moduleName,
+      methodName,
+      param,
+      structName,
+      structCollector,
+      resolveAlias,
+    );
+
+    methodParams.push({paramName: param.name, objCType});
+
+    if (isStruct) {
+      structParamRecords.push({paramIndex: index, structName});
+    }
+  });
+
+  if (returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
+    methodParams.push(
+      {paramName: 'resolve', objCType: 'RCTPromiseResolveBlock'},
+      {paramName: 'reject', objCType: 'RCTPromiseRejectBlock'},
+    );
+  }
+
+  /**
+   * Build Protocol Method
+   **/
+  const returnObjCType = getReturnObjCType(methodName, returnTypeAnnotation);
+  const paddingMax = `- (${returnObjCType})${methodName}`.length;
+
+  const objCParams = methodParams.reduce(
+    ($objCParams, {objCType, paramName}, i) => {
+      const rhs = `(${objCType})${paramName}`;
+      const padding = ' '.repeat(Math.max(0, paddingMax - paramName.length));
+      return i === 0
+        ? `:${rhs}`
+        : `${$objCParams}\n${padding}${paramName}:${rhs}`;
+    },
+    '',
+  );
+
+  const protocolMethod = ProtocolMethodTemplate({
+    methodName,
+    returnObjCType,
+    params: objCParams,
+  });
+
+  /**
+   * Build ObjC Selector
+   */
+  const selector = methodParams
+    .map<string>(({paramName}) => paramName)
+    .reduce(($selector, paramName, i) => {
+      return i === 0 ? `${$selector}:` : `${$selector}${paramName}:`;
+    }, methodName);
+
+  /**
+   * Build JS Return type
+   */
+  const returnJSType = getReturnJSType(methodName, returnTypeAnnotation);
+
+  return [
+    {
+      methodName,
+      protocolMethod,
+      selector: `@selector(${selector})`,
+      structParamRecords,
+      returnJSType,
+    },
+  ];
+}
+
+function getParamObjCType(
+  moduleName: string,
+  methodName: string,
+  param: NativeModuleMethodParamSchema,
+  structName: string,
+  structCollector: StructCollector,
+  resolveAlias: AliasResolver,
+): $ReadOnly<{|objCType: string, isStruct: boolean|}> {
+  const {name: paramName, typeAnnotation} = param;
+  const notRequired = param.optional || typeAnnotation.nullable;
+
+  function wrapIntoNullableIfNeeded(generatedType: string) {
+    return typeAnnotation.nullable
+      ? `${generatedType} _Nullable`
+      : generatedType;
+  }
+
+  const isStruct = (objCType: string) => ({
+    isStruct: true,
+    objCType,
+  });
+
+  const notStruct = (objCType: string) => ({
+    isStruct: false,
+    objCType,
+  });
+
+  // Handle types that can only be in parameters
+  switch (typeAnnotation.type) {
+    case 'FunctionTypeAnnotation': {
+      return notStruct('RCTResponseSenderBlock');
+    }
+    case 'ArrayTypeAnnotation': {
+      /**
+       * Array in params always codegen NSArray *
+       *
+       * TODO(T73933406): Support codegen for Arrays of structs and primitives
+       *
+       * For example:
+       *   Array<number> => NSArray<NSNumber *>
+       *   type Animal = {||};
+       *   Array<Animal> => NSArray<JS::NativeSampleTurboModule::Animal *>, etc.
+       */
+      return notStruct(wrapIntoNullableIfNeeded('NSArray *'));
+    }
+  }
+
+  const structTypeAnnotation = structCollector.process(
+    structName,
+    'REGULAR',
+    resolveAlias,
+    typeAnnotation,
+  );
+
+  invariant(
+    structTypeAnnotation.type !== 'ArrayTypeAnnotation',
+    'ArrayTypeAnnotations should have been processed earlier',
+  );
+
+  switch (structTypeAnnotation.type) {
+    case 'TypeAliasTypeAnnotation': {
+      /**
+       * TODO(T73943261): Support nullable object literals and aliases?
+       */
+      return isStruct(
+        getNamespacedStructName(moduleName, structTypeAnnotation.name) + ' &',
+      );
+    }
+    case 'ReservedFunctionValueTypeAnnotation':
+      switch (structTypeAnnotation.name) {
+        case 'RootTag':
+          return notStruct(notRequired ? 'NSNumber *' : 'double');
+        default:
+          (structTypeAnnotation.name: empty);
+          throw new Error(
+            `Unsupported type for param "${paramName}" in ${methodName}. Found: ${structTypeAnnotation.type}`,
+          );
+      }
+    case 'StringTypeAnnotation':
+      return notStruct(wrapIntoNullableIfNeeded('NSString *'));
+    case 'NumberTypeAnnotation':
+      return notStruct(notRequired ? 'NSNumber *' : 'double');
+    case 'FloatTypeAnnotation':
+      return notStruct(notRequired ? 'NSNumber *' : 'double');
+    case 'DoubleTypeAnnotation':
+      return notStruct(notRequired ? 'NSNumber *' : 'double');
+    case 'Int32TypeAnnotation':
+      return notStruct(notRequired ? 'NSNumber *' : 'double');
+    case 'BooleanTypeAnnotation':
+      return notStruct(notRequired ? 'NSNumber *' : 'BOOL');
+    case 'GenericObjectTypeAnnotation':
+      return notStruct(wrapIntoNullableIfNeeded('NSDictionary *'));
+    default:
+      (structTypeAnnotation.type: empty);
+      throw new Error(
+        `Unsupported type for param "${paramName}" in ${methodName}. Found: ${typeAnnotation.type}`,
+      );
+  }
+}
+
+function getReturnObjCType(
+  methodName: string,
+  typeAnnotation: NativeModuleReturnTypeAnnotation,
+) {
+  function wrapIntoNullableIfNeeded(generatedType: string) {
+    return typeAnnotation.nullable
+      ? `${generatedType} _Nullable`
+      : generatedType;
+  }
+
+  switch (typeAnnotation.type) {
+    case 'VoidTypeAnnotation':
+      return 'void';
+    case 'PromiseTypeAnnotation':
+      return 'void';
+    case 'ObjectTypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSDictionary *');
+    case 'TypeAliasTypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSDictionary *');
+    case 'ArrayTypeAnnotation':
+      if (typeAnnotation.elementType == null) {
+        return wrapIntoNullableIfNeeded('NSArray<id<NSObject>> *');
+      }
+
+      return wrapIntoNullableIfNeeded(
+        `NSArray<${getReturnObjCType(
+          methodName,
+          typeAnnotation.elementType,
+        )}> *`,
+      );
+    case 'ReservedFunctionValueTypeAnnotation':
+      switch (typeAnnotation.name) {
+        case 'RootTag':
+          return wrapIntoNullableIfNeeded('NSNumber *');
+        default:
+          (typeAnnotation.name: empty);
+          throw new Error(
+            `Unsupported return type for ${methodName}. Found: ${typeAnnotation.name}`,
+          );
+      }
+    case 'StringTypeAnnotation':
+      // TODO: Can NSString * returns not be _Nullable?
+      // In the legacy codegen, we don't surround NSSTring * with _Nullable
+      return wrapIntoNullableIfNeeded('NSString *');
+    case 'NumberTypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSNumber *');
+    case 'FloatTypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSNumber *');
+    case 'DoubleTypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSNumber *');
+    case 'Int32TypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSNumber *');
+    case 'BooleanTypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSNumber *');
+    case 'GenericObjectTypeAnnotation':
+      return wrapIntoNullableIfNeeded('NSDictionary *');
+    default:
+      (typeAnnotation.type: empty);
+      throw new Error(
+        `Unsupported return type for ${methodName}. Found: ${typeAnnotation.type}`,
+      );
+  }
+}
+
+function getReturnJSType(
+  methodName: string,
+  typeAnnotation: NativeModuleReturnTypeAnnotation,
+): ReturnJSType {
+  switch (typeAnnotation.type) {
+    case 'VoidTypeAnnotation':
+      return 'VoidKind';
+    case 'PromiseTypeAnnotation':
+      return 'PromiseKind';
+    case 'ObjectTypeAnnotation':
+      return 'ObjectKind';
+    case 'TypeAliasTypeAnnotation':
+      return 'ObjectKind';
+    case 'ArrayTypeAnnotation':
+      return 'ArrayKind';
+    case 'ReservedFunctionValueTypeAnnotation':
+      return 'NumberKind';
+    case 'StringTypeAnnotation':
+      return 'StringKind';
+    case 'NumberTypeAnnotation':
+      return 'NumberKind';
+    case 'FloatTypeAnnotation':
+      return 'NumberKind';
+    case 'DoubleTypeAnnotation':
+      return 'NumberKind';
+    case 'Int32TypeAnnotation':
+      return 'NumberKind';
+    case 'BooleanTypeAnnotation':
+      return 'NumberKind';
+    case 'GenericObjectTypeAnnotation':
+      return 'ObjectKind';
+    default:
+      (typeAnnotation.type: empty);
+      throw new Error(
+        `Unsupported return type for ${methodName}. Found: ${typeAnnotation.type}`,
+      );
+  }
+}
+
+function serializeConstantsProtocolMethods(
+  moduleName: string,
+  property: NativeModulePropertySchema,
+  structCollector: StructCollector,
+  resolveAlias: AliasResolver,
+): $ReadOnlyArray<MethodSerializationOutput> {
+  if (property.typeAnnotation.params.length !== 0) {
+    throw new Error(
+      `${moduleName}.getConstants() may only accept 0 arguments.`,
+    );
+  }
+
+  const {returnTypeAnnotation} = property.typeAnnotation;
+  if (returnTypeAnnotation.type !== 'ObjectTypeAnnotation') {
+    throw new Error(
+      `${moduleName}.getConstants() may only return an object literal: {|...|}.`,
+    );
+  }
+
+  if (returnTypeAnnotation.properties.length === 0) {
+    return [];
+  }
+
+  const realTypeAnnotation = structCollector.process(
+    'Constants',
+    'CONSTANTS',
+    resolveAlias,
+    returnTypeAnnotation,
+  );
+
+  invariant(
+    realTypeAnnotation.type === 'TypeAliasTypeAnnotation',
+    "Unable to generate C++ struct from module's getConstants() method return type.",
+  );
+
+  const returnObjCType = `facebook::react::ModuleConstants<JS::Native${moduleName}::Constants::Builder>`;
+
+  return ['constantsToExport', 'getConstants'].map<MethodSerializationOutput>(
+    methodName => {
+      const protocolMethod = ProtocolMethodTemplate({
+        methodName,
+        returnObjCType,
+        params: '',
+      });
+
+      return {
+        methodName: 'getConstants',
+        protocolMethod,
+        returnJSType: 'ObjectKind',
+        selector: 'getConstants',
+        structParamRecords: [],
+      };
+    },
+  );
+}
+
+module.exports = {
+  serializeMethod,
+};
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
new file mode 100644
index 00000000000000..82c69359a06d36
--- /dev/null
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
@@ -0,0 +1,125 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {Struct} from '../StructCollector';
+import type {
+  MethodSerializationOutput,
+  StructParameterRecord,
+} from '../serializeMethod';
+
+const ModuleTemplate = ({
+  moduleName,
+  structs,
+  methodSerializationOutputs,
+}: $ReadOnly<{|
+  moduleName: string,
+  structs: $ReadOnlyArray<Struct>,
+  methodSerializationOutputs: $ReadOnlyArray<MethodSerializationOutput>,
+|}>) => `
+${structs
+  .map(struct =>
+    RCTCxxConvertCategoryTemplate({moduleName, structName: struct.name}),
+  )
+  .join('\n')}
+namespace facebook {
+  namespace react {
+    ${methodSerializationOutputs
+      .map(serializedMethodParts =>
+        InlineHostFunctionTemplate({
+          moduleName,
+          methodName: serializedMethodParts.methodName,
+          returnJSType: serializedMethodParts.returnJSType,
+          selector: serializedMethodParts.selector,
+        }),
+      )
+      .join('\n')}
+
+    Native${moduleName}SpecJSI::Native${moduleName}SpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        ${methodSerializationOutputs
+          .map(({methodName, structParamRecords}) =>
+            MethodMapEntryTemplate({
+              moduleName,
+              methodName,
+              structParamRecords,
+            }),
+          )
+          .join('\n' + ' '.repeat(8))}
+        }
+    }
+  } // namespace react
+} // namespace facebook
+`;
+
+const RCTCxxConvertCategoryTemplate = ({
+  moduleName,
+  structName,
+}: $ReadOnly<{|
+  moduleName: string,
+  structName: string,
+|}>) => `
+@implementation RCTCxxConvert (Native${moduleName}_${structName})
++ (RCTManagedPointer *)JS_Native${moduleName}_${structName}:(id)json
+{
+  return facebook::react::managedPointer<JS::Native${moduleName}::${structName}>(json);
+}
+@end
+`;
+
+const InlineHostFunctionTemplate = ({
+  moduleName,
+  methodName,
+  returnJSType,
+  selector,
+}: $ReadOnly<{|
+  moduleName: string,
+  methodName: string,
+  returnJSType: string,
+  selector: string,
+|}>) => `
+    static facebook::jsi::Value __hostFunction_Native${moduleName}SpecJSI::${methodName}(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ${returnJSType}, "${methodName}", ${selector}, args, count);
+    }
+`;
+
+const MethodMapEntryTemplate = ({
+  moduleName,
+  methodName,
+  structParamRecords,
+}: $ReadOnly<{|
+  moduleName: string,
+  methodName: string,
+  structParamRecords: $ReadOnlyArray<StructParameterRecord>,
+|}>) => `
+        methodMap_["${methodName}"] = MethodMetadata {1, __hostFunction_Native${moduleName}SpecJSI_${methodName}};
+        ${structParamRecords
+          .map(({paramIndex, structName}) => {
+            return `setMethodArgConversionSelector(@"${methodName}", ${paramIndex}, @"JS_Native${moduleName}_${structName}:");`;
+          })
+          .join('\n' + ' '.repeat(8))}
+`;
+
+function serializeModuleSource(
+  moduleName: string,
+  structs: $ReadOnlyArray<Struct>,
+  methodSerializationOutputs: $ReadOnlyArray<MethodSerializationOutput>,
+): string {
+  return ModuleTemplate({
+    moduleName,
+    structs,
+    methodSerializationOutputs,
+  });
+}
+
+module.exports = {
+  serializeModuleSource,
+};
diff --git a/packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructs.js b/packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructs.js
deleted file mode 100644
index c9e1d817a296d1..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructs.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  ObjectParamTypeAnnotation,
-  ObjectTypeAliasTypeShape,
-} from '../../../CodegenSchema';
-const {
-  flatObjects,
-  capitalizeFirstLetter,
-  getSafePropertyName,
-} = require('./Utils');
-const {getTypeAliasTypeAnnotation} = require('../Utils');
-const {generateStructsForConstants} = require('./GenerateStructsForConstants');
-
-const template = `
-::_CONSTANTS_::::_STRUCTS_::::_INLINES_::
-`;
-
-const structTemplate = `
-namespace JS {
-  namespace Native::_MODULE_NAME_:: {
-    struct ::_STRUCT_NAME_:: {
-      ::_STRUCT_PROPERTIES_::
-
-      ::_STRUCT_NAME_::(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (Native::_MODULE_NAME_::_::_STRUCT_NAME_::)
-+ (RCTManagedPointer *)JS_Native::_MODULE_NAME_::_::_STRUCT_NAME_:::(id)json;
-@end
-`;
-
-const inlineTemplate = `
-inline ::_RETURN_TYPE_::JS::Native::_MODULE_NAME_::::::_STRUCT_NAME_::::::_PROPERTY_NAME_::() const
-{
-  id const p = _v[@"::_PROPERTY_NAME_::"];
-  return ::_RETURN_VALUE_::;
-}
-`;
-
-function getNamespacedStructName(structName: string): string {
-  return `JS::Native::_MODULE_NAME_::::${structName}`;
-}
-
-function getElementTypeForArray(
-  property: ObjectParamTypeAnnotation,
-  name: string,
-  moduleName: string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): string {
-  const {typeAnnotation} = property;
-
-  // TODO(T67898313): Workaround for NativeLinking's use of union type. This check may be removed once typeAnnotation is non-optional.
-  if (!typeAnnotation) {
-    throw new Error(
-      `Cannot get array element type, property ${property.name} does not contain a type annotation`,
-    );
-  }
-
-  if (typeAnnotation.type !== 'ArrayTypeAnnotation') {
-    throw new Error(
-      `Cannot get array element type for non-array type ${typeAnnotation.type}`,
-    );
-  }
-
-  if (!typeAnnotation.elementType) {
-    return 'id<NSObject>';
-  }
-
-  const type =
-    typeAnnotation.elementType.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.elementType.name, aliases)
-          .type
-      : typeAnnotation.elementType.type;
-  switch (type) {
-    case 'StringTypeAnnotation':
-      return 'NSString *';
-    case 'DoubleTypeAnnotation':
-    case 'NumberTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return 'double';
-    case 'ObjectTypeAnnotation':
-      const structName =
-        typeAnnotation.elementType.type === 'TypeAliasTypeAnnotation'
-          ? typeAnnotation.elementType.name
-          : `${property.name}Element`;
-      return getNamespacedStructName(structName);
-    case 'GenericObjectTypeAnnotation':
-      // TODO(T67565166): Generic objects are not type safe and should be disallowed in the schema. This case should throw an error once it is disallowed in schema.
-      console.error(
-        `Warning: Generic objects are not type safe and should be avoided whenever possible (see '${property.name}' in ${moduleName}'s ${name})`,
-      );
-      return 'id<NSObject>';
-    case 'BooleanTypeAnnotation':
-    case 'AnyObjectTypeAnnotation':
-    case 'AnyTypeAnnotation':
-    case 'ArrayTypeAnnotation':
-    case 'FunctionTypeAnnotation':
-    case 'ReservedFunctionValueTypeAnnotation':
-    case 'ReservedPropTypeAnnotation':
-    case 'StringEnumTypeAnnotation':
-      throw new Error(`Unsupported array element type, found: ${type}"`);
-    default:
-      (type: empty);
-      throw new Error(`Unknown array element type, found: ${type}"`);
-  }
-}
-
-function getInlineMethodSignature(
-  property: ObjectParamTypeAnnotation,
-  name: string,
-  moduleName: string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): string {
-  const {typeAnnotation} = property;
-  function markOptionalTypeIfNecessary(type: string) {
-    if (property.optional) {
-      return `folly::Optional<${type}>`;
-    }
-    return type;
-  }
-
-  // TODO(T67672788): Workaround for values key in NativeLinking which lacks a typeAnnotation. id<NSObject> is not type safe!
-  if (!typeAnnotation) {
-    console.error(
-      `Warning: Unsafe type found (see '${property.name}' in ${moduleName}'s ${name})`,
-    );
-    return `id<NSObject> ${getSafePropertyName(property)}() const;`;
-  }
-
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
-
-  const variableName =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? `${capitalizeFirstLetter(typeAnnotation.name)}`
-      : `${capitalizeFirstLetter(name)}${capitalizeFirstLetter(
-          getSafePropertyName(property),
-        )}`;
-
-  switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
-      switch (realTypeAnnotation.name) {
-        case 'RootTag':
-          return `double ${getSafePropertyName(property)}() const;`;
-        default:
-          (realTypeAnnotation.name: empty);
-          throw new Error(
-            `Unknown prop type, found: ${realTypeAnnotation.name}"`,
-          );
-      }
-    case 'StringTypeAnnotation':
-      return `NSString *${getSafePropertyName(property)}() const;`;
-    case 'NumberTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return `${markOptionalTypeIfNecessary('double')} ${getSafePropertyName(
-        property,
-      )}() const;`;
-    case 'BooleanTypeAnnotation':
-      return `${markOptionalTypeIfNecessary('bool')} ${getSafePropertyName(
-        property,
-      )}() const;`;
-    case 'ObjectTypeAnnotation':
-      return `${markOptionalTypeIfNecessary(
-        getNamespacedStructName(variableName),
-      )} ${getSafePropertyName(property)}() const;`;
-    case 'GenericObjectTypeAnnotation':
-    case 'AnyTypeAnnotation':
-      return `id<NSObject> ${
-        property.optional ? '_Nullable ' : ' '
-      }${getSafePropertyName(property)}() const;`;
-    case 'ArrayTypeAnnotation':
-      return `${markOptionalTypeIfNecessary(
-        `facebook::react::LazyVector<${getElementTypeForArray(
-          property,
-          name,
-          moduleName,
-          aliases,
-        )}>`,
-      )} ${getSafePropertyName(property)}() const;`;
-    case 'FunctionTypeAnnotation':
-    default:
-      throw new Error(`Unknown prop type, found: ${realTypeAnnotation.type}"`);
-  }
-}
-
-function getInlineMethodImplementation(
-  property: ObjectParamTypeAnnotation,
-  name: string,
-  moduleName: string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): string {
-  const {typeAnnotation} = property;
-  function markOptionalTypeIfNecessary(type: string): string {
-    if (property.optional) {
-      return `folly::Optional<${type}> `;
-    }
-    return `${type} `;
-  }
-  function markOptionalValueIfNecessary(value: string): string {
-    if (property.optional) {
-      return `RCTBridgingToOptional${capitalizeFirstLetter(value)}`;
-    }
-    return `RCTBridgingTo${capitalizeFirstLetter(value)}`;
-  }
-  function bridgeArrayElementValueIfNecessary(element: string): string {
-    // TODO(T67898313): Workaround for NativeLinking's use of union type
-    if (!typeAnnotation) {
-      throw new Error(
-        `Cannot get array element type, property ${property.name} does not contain a type annotation`,
-      );
-    }
-
-    if (typeAnnotation.type !== 'ArrayTypeAnnotation') {
-      throw new Error(
-        `Cannot get array element type for non-array type ${typeAnnotation.type}`,
-      );
-    }
-
-    if (!typeAnnotation.elementType) {
-      throw new Error(`Cannot get array element type for ${name}`);
-    }
-
-    const type =
-      typeAnnotation.elementType.type === 'TypeAliasTypeAnnotation'
-        ? getTypeAliasTypeAnnotation(typeAnnotation.elementType.name, aliases)
-            .type
-        : typeAnnotation.elementType.type;
-
-    switch (type) {
-      case 'StringTypeAnnotation':
-        return `RCTBridgingToString(${element})`;
-      case 'DoubleTypeAnnotation':
-      case 'NumberTypeAnnotation':
-      case 'FloatTypeAnnotation':
-      case 'Int32TypeAnnotation':
-        return `RCTBridgingToDouble(${element})`;
-      case 'BooleanTypeAnnotation':
-        return `RCTBridgingToBool(${element})`;
-      case 'ObjectTypeAnnotation':
-        const structName =
-          typeAnnotation.elementType.type === 'TypeAliasTypeAnnotation'
-            ? `${typeAnnotation.elementType.name}(${element})`
-            : `${getSafePropertyName(property)}Element(${element})`;
-        return getNamespacedStructName(structName);
-      case 'GenericObjectTypeAnnotation':
-        return element;
-      case 'AnyObjectTypeAnnotation':
-      case 'AnyTypeAnnotation':
-      case 'ArrayTypeAnnotation':
-      case 'FunctionTypeAnnotation':
-      case 'ReservedFunctionValueTypeAnnotation':
-      case 'ReservedPropTypeAnnotation':
-      case 'StringEnumTypeAnnotation':
-      case 'TupleTypeAnnotation':
-        throw new Error(`Unsupported array element type, found: ${type}"`);
-      default:
-        (type: empty);
-        throw new Error(`Unknown array element type, found: ${type}"`);
-    }
-  }
-
-  // TODO(T67672788): Workaround for values key in NativeLinking which lacks a typeAnnotation. id<NSObject> is not type safe!
-  if (!typeAnnotation) {
-    console.error(
-      `Warning: Unsafe type found (see '${property.name}' in ${moduleName}'s ${name})`,
-    );
-    return inlineTemplate
-      .replace(
-        /::_RETURN_TYPE_::/,
-        property.optional ? 'id<NSObject> _Nullable ' : 'id<NSObject> ',
-      )
-      .replace(/::_RETURN_VALUE_::/, 'p');
-  }
-
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
-
-  switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
-      switch (realTypeAnnotation.name) {
-        case 'RootTag':
-          return inlineTemplate
-            .replace(/::_RETURN_TYPE_::/, 'double ')
-            .replace(/::_RETURN_VALUE_::/, 'RCTBridgingToDouble(p)');
-        default:
-          (realTypeAnnotation.name: empty);
-          throw new Error(
-            `Unknown prop type, found: ${realTypeAnnotation.name}"`,
-          );
-      }
-    case 'StringTypeAnnotation':
-      return inlineTemplate
-        .replace(/::_RETURN_TYPE_::/, 'NSString *')
-        .replace(/::_RETURN_VALUE_::/, 'RCTBridgingToString(p)');
-    case 'NumberTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return inlineTemplate
-        .replace(/::_RETURN_TYPE_::/, markOptionalTypeIfNecessary('double'))
-        .replace(
-          /::_RETURN_VALUE_::/,
-          `${markOptionalValueIfNecessary('double')}(p)`,
-        );
-    case 'BooleanTypeAnnotation':
-      return inlineTemplate
-        .replace(/::_RETURN_TYPE_::/, markOptionalTypeIfNecessary('bool'))
-        .replace(
-          /::_RETURN_VALUE_::/,
-          `${markOptionalValueIfNecessary('bool')}(p)`,
-        );
-    case 'GenericObjectTypeAnnotation':
-    case 'AnyTypeAnnotation':
-      return inlineTemplate
-        .replace(
-          /::_RETURN_TYPE_::/,
-          property.optional ? 'id<NSObject> _Nullable ' : 'id<NSObject> ',
-        )
-        .replace(/::_RETURN_VALUE_::/, 'p');
-    case 'ObjectTypeAnnotation':
-      const structName =
-        typeAnnotation.type === 'TypeAliasTypeAnnotation'
-          ? `${capitalizeFirstLetter(typeAnnotation.name)}`
-          : `${name}${capitalizeFirstLetter(getSafePropertyName(property))}`;
-      const namespacedStructName = getNamespacedStructName(structName);
-      return inlineTemplate
-        .replace(
-          /::_RETURN_TYPE_::/,
-          markOptionalTypeIfNecessary(namespacedStructName),
-        )
-        .replace(
-          /::_RETURN_VALUE_::/,
-          property.optional
-            ? `(p == nil ? folly::none : folly::make_optional(${namespacedStructName}(p)))`
-            : `${namespacedStructName}(p)`,
-        );
-    case 'ArrayTypeAnnotation':
-      return inlineTemplate
-        .replace(
-          /::_RETURN_TYPE_::/,
-          markOptionalTypeIfNecessary(
-            `facebook::react::LazyVector<${getElementTypeForArray(
-              property,
-              name,
-              moduleName,
-              aliases,
-            )}>`,
-          ),
-        )
-        .replace(
-          /::_RETURN_VALUE_::/,
-          `${markOptionalValueIfNecessary('vec')}(p, ^${getElementTypeForArray(
-            property,
-            name,
-            moduleName,
-            aliases,
-          )}(id itemValue_0) { return ${bridgeArrayElementValueIfNecessary(
-            'itemValue_0',
-          )}; })`,
-        );
-    case 'FunctionTypeAnnotation':
-    default:
-      throw new Error(`Unknown prop type, found: ${realTypeAnnotation.type}"`);
-  }
-}
-
-function translateObjectsForStructs(
-  annotations: $ReadOnlyArray<
-    $ReadOnly<{|
-      name: string,
-      object: $ReadOnly<{|
-        type: 'ObjectTypeAnnotation',
-        properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-      |}>,
-    |}>,
-  >,
-  moduleName: string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): string {
-  const flattenObjects = flatObjects(annotations, false, aliases);
-
-  const translatedInlineMethods = flattenObjects
-    .reduce(
-      (acc, object) =>
-        acc.concat(
-          object.properties.map(property =>
-            getInlineMethodImplementation(
-              property,
-              object.name,
-              moduleName,
-              aliases,
-            )
-              .replace(/::_PROPERTY_NAME_::/g, getSafePropertyName(property))
-              .replace(/::_STRUCT_NAME_::/g, object.name),
-          ),
-        ),
-      [],
-    )
-    .join('\n');
-
-  const translatedStructs = flattenObjects
-    .map(object => {
-      return structTemplate
-        .replace(
-          /::_STRUCT_PROPERTIES_::/g,
-          object.properties
-            .map(property =>
-              getInlineMethodSignature(
-                property,
-                object.name,
-                moduleName,
-                aliases,
-              ),
-            )
-            .join('\n      '),
-        )
-        .replace(/::_STRUCT_NAME_::/g, object.name);
-    })
-    .reverse()
-    .join('\n');
-  const translatedConstants = generateStructsForConstants(annotations, aliases);
-
-  return template
-    .replace(/::_STRUCTS_::/, translatedStructs)
-    .replace(/::_INLINES_::/, translatedInlineMethods)
-    .replace(/::_CONSTANTS_::/, translatedConstants);
-}
-module.exports = {
-  translateObjectsForStructs,
-  capitalizeFirstLetter,
-  getNamespacedStructName,
-};
diff --git a/packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructsForConstants.js b/packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructsForConstants.js
deleted file mode 100644
index 0433152f7f627d..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/ObjCppUtils/GenerateStructsForConstants.js
+++ /dev/null
@@ -1,275 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  ObjectParamTypeAnnotation,
-  ObjectTypeAliasTypeShape,
-} from '../../../CodegenSchema';
-const {flatObjects, capitalizeFirstLetter} = require('./Utils');
-const {getTypeAliasTypeAnnotation} = require('../Utils');
-
-const structTemplate = `
-namespace JS {
-  namespace Native::_MODULE_NAME_:: {
-    struct ::_STRUCT_NAME_:: {
-
-      struct Builder {
-        struct Input {
-          ::_INPUT_::
-        };
-
-        /** Initialize with a set of values */
-        Builder(const Input i);
-        /** Initialize with an existing ::_STRUCT_NAME_:: */
-        Builder(::_STRUCT_NAME_:: i);
-        /** Builds the object. Generally used only by the infrastructure. */
-        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
-      private:
-        NSDictionary *(^_factory)(void);
-      };
-
-      static ::_STRUCT_NAME_:: fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
-      NSDictionary *unsafeRawValue() const { return _v; }
-    private:
-      ::_STRUCT_NAME_::(NSDictionary *const v) : _v(v) {}
-      NSDictionary *_v;
-    };
-  }
-}
-
-inline JS::Native::_MODULE_NAME_::::::_STRUCT_NAME_::::Builder::Builder(const Input i) : _factory(^{
-  NSMutableDictionary *d = [NSMutableDictionary new];
-  ::_PROPERTIES_::
-  return d;
-}) {}
-inline JS::Native::_MODULE_NAME_::::::_STRUCT_NAME_::::Builder::Builder(::_STRUCT_NAME_:: i) : _factory(^{
-  return i.unsafeRawValue();
-}) {}`;
-
-function getBuilderInputFieldDeclaration(
-  property: ObjectParamTypeAnnotation,
-  name: string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): string {
-  function markRequiredIfNecessary(annotation) {
-    if (!property.optional) {
-      return 'RCTRequired<' + annotation + '> ' + property.name + ';';
-    }
-    return 'folly::Optional<' + annotation + '> ' + property.name + ';';
-  }
-  const {typeAnnotation} = property;
-
-  // TODO(T67898313): Workaround for NativeLinking's use of union type. This check may be removed once typeAnnotation is non-optional.
-  if (!typeAnnotation) {
-    throw new Error(
-      `Cannot get array element type, property ${property.name} does not contain a type annotation`,
-    );
-  }
-
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
-
-  const variableName =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? typeAnnotation.name
-      : `${name}${capitalizeFirstLetter(property.name)}`;
-
-  switch (realTypeAnnotation.type) {
-    case 'ReservedFunctionValueTypeAnnotation':
-      switch (realTypeAnnotation.name) {
-        case 'RootTag':
-          return markRequiredIfNecessary('double');
-        default:
-          (realTypeAnnotation.name: empty);
-          throw new Error(
-            `Unknown prop type, found: ${realTypeAnnotation.name}"`,
-          );
-      }
-    case 'StringTypeAnnotation':
-      if (property.optional) {
-        return 'NSString *' + property.name + ';';
-      }
-      return markRequiredIfNecessary('NSString *');
-    case 'NumberTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return markRequiredIfNecessary('double');
-    case 'BooleanTypeAnnotation':
-      return markRequiredIfNecessary('bool');
-    case 'ObjectTypeAnnotation':
-      return markRequiredIfNecessary(
-        `JS::Native::_MODULE_NAME_::::${variableName}::Builder`,
-      );
-    case 'GenericObjectTypeAnnotation':
-    case 'AnyTypeAnnotation':
-      if (property.optional) {
-        return 'id<NSObject> _Nullable ' + property.name + ';';
-      }
-      return markRequiredIfNecessary('id<NSObject>');
-    case 'ArrayTypeAnnotation':
-      return markRequiredIfNecessary('std::vector<id<NSObject>>');
-    case 'FunctionTypeAnnotation':
-    default:
-      throw new Error(`Unknown prop type, found: ${realTypeAnnotation.type}"`);
-  }
-}
-
-function safeGetter(name: string, optional: boolean) {
-  return `
-  auto ${name} = i.${name}${optional ? '' : '.get()'};
-  d[@"${name}"] = ${name};
-  `.trim();
-}
-
-function arrayGetter(name: string, optional: boolean) {
-  return `
-  auto ${name} = i.${name}${optional ? '' : '.get()'};
-  d[@"${name}"] = RCTConvert${
-    optional ? 'Optional' : ''
-  }VecToArray(${name}, ^id(id<NSObject> el_) { return el_; });
-  `.trim();
-}
-
-function boolGetter(name: string, optional: boolean) {
-  return `
-  auto ${name} = i.${name}${optional ? '' : '.get()'};
-  d[@"${name}"] = ${
-    optional
-      ? `${name}.hasValue() ? @((BOOL)${name}.value()) : nil`
-      : `@(${name})`
-  };
-  `.trim();
-}
-
-function numberGetter(name: string, optional: boolean) {
-  return `
-  auto ${name} = i.${name}${optional ? '' : '.get()'};
-  d[@"${name}"] = ${
-    optional
-      ? `${name}.hasValue() ? @((double)${name}.value()) : nil`
-      : `@(${name})`
-  };
-  `.trim();
-}
-
-function unsafeGetter(name: string, optional: boolean) {
-  return `
-  auto ${name} = i.${name}${optional ? '' : '.get()'};
-  d[@"${name}"] = ${
-    optional
-      ? `${name}.hasValue() ? ${name}.value().buildUnsafeRawValue() : nil`
-      : `${name}.buildUnsafeRawValue()`
-  };
-  `.trim();
-}
-
-function getObjectProperty(
-  property: ObjectParamTypeAnnotation,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): string {
-  const {typeAnnotation} = property;
-
-  // TODO(T67898313): Workaround for NativeLinking's use of union type. This check may be removed once typeAnnotation is non-optional.
-  if (!typeAnnotation) {
-    throw new Error(
-      `Cannot get array element type, property ${property.name} does not contain a type annotation`,
-    );
-  }
-
-  const type =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases).type
-      : typeAnnotation.type;
-
-  switch (type) {
-    case 'ReservedFunctionValueTypeAnnotation':
-      if (typeAnnotation.name == null) {
-        throw new Error(`Prop type ${type} has no name.`);
-      }
-      switch (typeAnnotation.name) {
-        case 'RootTag':
-          return numberGetter(property.name, property.optional);
-        default:
-          // TODO (T65847278): Figure out why this does not work.
-          // (typeAnnotation.name: empty);
-          throw new Error(`Unknown prop type, found: ${typeAnnotation.name}"`);
-      }
-    case 'NumberTypeAnnotation':
-    case 'FloatTypeAnnotation':
-    case 'Int32TypeAnnotation':
-      return numberGetter(property.name, property.optional);
-    case 'BooleanTypeAnnotation':
-      return boolGetter(property.name, property.optional);
-    case 'StringTypeAnnotation':
-    case 'GenericObjectTypeAnnotation':
-    case 'AnyTypeAnnotation':
-      return safeGetter(property.name, property.optional);
-    case 'ObjectTypeAnnotation':
-      return unsafeGetter(property.name, property.optional);
-    case 'ArrayTypeAnnotation':
-      return arrayGetter(property.name, property.optional);
-    case 'FunctionTypeAnnotation':
-    default:
-      throw new Error(`Unknown prop type, found: ${type}"`);
-  }
-}
-
-function generateStructsForConstants(
-  annotations: $ReadOnlyArray<
-    $ReadOnly<{|
-      name: string,
-      object: $ReadOnly<{|
-        type: 'ObjectTypeAnnotation',
-        properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-      |}>,
-    |}>,
-  >,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): string {
-  return flatObjects(annotations, true, aliases)
-    .reduce(
-      (acc, object) =>
-        acc.concat(
-          structTemplate
-            .replace(
-              /::_INPUT_::/g,
-              object.properties
-                .map(property =>
-                  getBuilderInputFieldDeclaration(
-                    property,
-                    object.name,
-                    aliases,
-                  ),
-                )
-                .join('\n          '),
-            )
-            .replace(
-              /::_PROPERTIES_::/g,
-              object.properties
-                .map(property => getObjectProperty(property, aliases))
-                .join('\n'),
-            )
-            .replace(/::_STRUCT_NAME_::/g, object.name),
-        ),
-      [],
-    )
-    .reverse()
-    .join('\n')
-    .replace(/SpecGetConstantsReturnType/g, 'Constants')
-    .replace(/GetConstantsReturnType/g, 'Constants');
-}
-module.exports = {
-  generateStructsForConstants,
-  capitalizeFirstLetter,
-};
diff --git a/packages/react-native-codegen/src/generators/modules/ObjCppUtils/Utils.js b/packages/react-native-codegen/src/generators/modules/ObjCppUtils/Utils.js
deleted file mode 100644
index fd4dca38468dad..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/ObjCppUtils/Utils.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  ObjectParamTypeAnnotation,
-  ObjectTypeAliasTypeShape,
-} from '../../../CodegenSchema';
-const {getTypeAliasTypeAnnotation} = require('../Utils');
-
-function capitalizeFirstLetter(string: string): string {
-  return string.charAt(0).toUpperCase() + string.slice(1);
-}
-
-function flatObjects(
-  annotations: $ReadOnlyArray<
-    $ReadOnly<{|
-      name: string,
-      object: $ReadOnly<{|
-        type: 'ObjectTypeAnnotation',
-        properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-      |}>,
-    |}>,
-  >,
-  forConstants: boolean = false,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
-): $ReadOnlyArray<
-  $ReadOnly<{|
-    name: string,
-    properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-  |}>,
-> {
-  let objectTypesToFlatten: Array<{|
-    properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-    name: string,
-  |}> = annotations
-    .map(annotation => {
-      if (annotation.object.type === 'TypeAliasTypeAnnotation') {
-        const alias = getTypeAliasTypeAnnotation(annotation.name, aliases);
-        return {name: annotation.name, properties: alias.properties};
-      }
-      return {
-        name: annotation.name,
-        properties: annotation.object.properties,
-      };
-    })
-    .filter(
-      annotation =>
-        (annotation.name === 'SpecGetConstantsReturnType') === forConstants,
-    )
-    .filter(
-      annotation =>
-        annotation.name !== 'SpecGetConstantsReturnType' ||
-        annotation.properties.length > 0,
-    );
-
-  let flattenObjects: Array<{|
-    properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-    name: string,
-  |}> = [];
-
-  while (objectTypesToFlatten.length !== 0) {
-    const oldObjectTypesToFlatten = objectTypesToFlatten;
-    objectTypesToFlatten = [];
-    flattenObjects = flattenObjects.concat(
-      oldObjectTypesToFlatten.map(object => {
-        const {properties} = object;
-        if (properties !== undefined) {
-          objectTypesToFlatten = objectTypesToFlatten.concat(
-            properties.reduce((acc, curr) => {
-              if (
-                curr.typeAnnotation &&
-                curr.typeAnnotation.type === 'ObjectTypeAnnotation' &&
-                curr.typeAnnotation.properties
-              ) {
-                return acc.concat({
-                  properties: curr.typeAnnotation.properties,
-                  name: object.name + capitalizeFirstLetter(curr.name),
-                });
-              }
-              return acc;
-            }, []),
-          );
-        }
-        return object;
-      }),
-    );
-  }
-
-  return flattenObjects;
-}
-
-function getSafePropertyName(property: ObjectParamTypeAnnotation): string {
-  if (property.name === 'id') {
-    return `${property.name}_`;
-  }
-  return property.name;
-}
-
-module.exports = {
-  flatObjects,
-  capitalizeFirstLetter,
-  getSafePropertyName,
-};
diff --git a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/structFixtures.js b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/structFixtures.js
deleted file mode 100644
index 2de452b87c2c39..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/structFixtures.js
+++ /dev/null
@@ -1,218 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-import type {ObjectParamTypeAnnotation} from '../../../CodegenSchema.js';
-const SIMPLE_STRUCT: $ReadOnlyArray<
-  $ReadOnly<{|
-    name: string,
-    object: $ReadOnly<{|
-      type: 'ObjectTypeAnnotation',
-      properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-    |}>,
-  |}>,
-> = [
-  {
-    name: 'SpecSampleFuncReturnType',
-    object: {
-      type: 'ObjectTypeAnnotation',
-      properties: [
-        {
-          optional: false,
-          name: 'a',
-          typeAnnotation: {
-            type: 'BooleanTypeAnnotation',
-          },
-        },
-        {
-          optional: false,
-          name: 'b',
-          typeAnnotation: {
-            type: 'NumberTypeAnnotation',
-          },
-        },
-        {
-          optional: false,
-          name: 'c',
-          typeAnnotation: {
-            type: 'StringTypeAnnotation',
-          },
-        },
-        {
-          optional: false,
-          name: 'd',
-          typeAnnotation: {
-            type: 'ObjectTypeAnnotation',
-            properties: [
-              {
-                optional: false,
-                name: 'e',
-                typeAnnotation: {
-                  type: 'BooleanTypeAnnotation',
-                },
-              },
-              {
-                optional: false,
-                name: 'f',
-                typeAnnotation: {
-                  type: 'NumberTypeAnnotation',
-                },
-              },
-              {
-                optional: false,
-                name: 'g',
-                typeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
-                    {
-                      optional: false,
-                      name: 'h',
-                      typeAnnotation: {
-                        type: 'BooleanTypeAnnotation',
-                      },
-                    },
-                    {
-                      optional: false,
-                      name: 'i',
-                      typeAnnotation: {
-                        type: 'NumberTypeAnnotation',
-                      },
-                    },
-                    {
-                      optional: false,
-                      name: 'j',
-                      typeAnnotation: {
-                        type: 'StringTypeAnnotation',
-                      },
-                    },
-                  ],
-                },
-              },
-            ],
-          },
-        },
-        {
-          optional: false,
-          name: 'k',
-          typeAnnotation: {
-            type: 'ReservedFunctionValueTypeAnnotation',
-            name: 'RootTag',
-          },
-        },
-      ],
-    },
-  },
-];
-
-const SIMPLE_CONSTANTS: $ReadOnlyArray<
-  $ReadOnly<{|
-    name: string,
-    object: $ReadOnly<{|
-      type: 'ObjectTypeAnnotation',
-      properties: $ReadOnlyArray<ObjectParamTypeAnnotation>,
-    |}>,
-  |}>,
-> = [
-  {
-    name: 'SpecGetConstantsReturnType',
-    object: {
-      type: 'ObjectTypeAnnotation',
-      properties: [
-        {
-          optional: false,
-          name: 'a',
-          typeAnnotation: {
-            type: 'BooleanTypeAnnotation',
-          },
-        },
-        {
-          optional: false,
-          name: 'b',
-          typeAnnotation: {
-            type: 'NumberTypeAnnotation',
-          },
-        },
-        {
-          optional: false,
-          name: 'c',
-          typeAnnotation: {
-            type: 'StringTypeAnnotation',
-          },
-        },
-        {
-          optional: false,
-          name: 'd',
-          typeAnnotation: {
-            type: 'ObjectTypeAnnotation',
-            properties: [
-              {
-                optional: false,
-                name: 'e',
-                typeAnnotation: {
-                  type: 'BooleanTypeAnnotation',
-                },
-              },
-              {
-                optional: false,
-                name: 'f',
-                typeAnnotation: {
-                  type: 'NumberTypeAnnotation',
-                },
-              },
-              {
-                optional: false,
-                name: 'g',
-                typeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
-                    {
-                      optional: false,
-                      name: 'h',
-                      typeAnnotation: {
-                        type: 'BooleanTypeAnnotation',
-                      },
-                    },
-                    {
-                      optional: false,
-                      name: 'i',
-                      typeAnnotation: {
-                        type: 'NumberTypeAnnotation',
-                      },
-                    },
-                    {
-                      optional: false,
-                      name: 'j',
-                      typeAnnotation: {
-                        type: 'StringTypeAnnotation',
-                      },
-                    },
-                  ],
-                },
-              },
-            ],
-          },
-        },
-        {
-          optional: false,
-          name: 'k',
-          typeAnnotation: {
-            type: 'ReservedFunctionValueTypeAnnotation',
-            name: 'RootTag',
-          },
-        },
-      ],
-    },
-  },
-];
-module.exports = {
-  SIMPLE_STRUCT,
-  SIMPLE_CONSTANTS,
-};
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
index b41441cb2daf7c..3c4943971857b0 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleHObjCpp-test.js
@@ -12,7 +12,7 @@
 'use strict';
 
 const fixtures = require('../__test_fixtures__/fixtures.js');
-const generator = require('../GenerateModuleHObjCpp.js');
+const generator = require('../GenerateModuleObjCpp');
 
 describe('GenerateModuleHObjCpp', () => {
   Object.keys(fixtures)
@@ -21,8 +21,9 @@ describe('GenerateModuleHObjCpp', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
+        const output = generator.generate(fixtureName, fixture, 'SampleSpec');
         expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
+          new Map([['SampleSpec.h', output.get('SampleSpec.h')]]),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
index 5bfd8c79e07682..ec8f4842a106bf 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateModuleMm-test.js
@@ -12,7 +12,7 @@
 'use strict';
 
 const fixtures = require('../__test_fixtures__/fixtures.js');
-const generator = require('../GenerateModuleMm.js');
+const generator = require('../GenerateModuleObjCpp');
 
 describe('GenerateModuleMm', () => {
   Object.keys(fixtures)
@@ -21,8 +21,11 @@ describe('GenerateModuleMm', () => {
       const fixture = fixtures[fixtureName];
 
       it(`can generate fixture ${fixtureName}`, () => {
+        const output = generator.generate(fixtureName, fixture, 'SampleSpec');
         expect(
-          generator.generate(fixtureName, fixture, 'SampleSpec'),
+          new Map([
+            ['SampleSpec-generated.mm', output.get('SampleSpec-generated.mm')],
+          ]),
         ).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateStructs-test.js b/packages/react-native-codegen/src/generators/modules/__tests__/GenerateStructs-test.js
deleted file mode 100644
index a66b5ff7e4c28c..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/__tests__/GenerateStructs-test.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @emails oncall+react_native
- * @flow strict-local
- * @format
- */
-
-'use strict';
-
-const fixtures = require('../__test_fixtures__/structFixtures.js');
-const generator = require('../ObjCppUtils/GenerateStructs.js');
-
-describe('GenerateStructs', () => {
-  Object.keys(fixtures)
-    .sort()
-    .forEach(fixtureName => {
-      const fixture = fixtures[fixtureName];
-
-      it(`can generate fixture ${fixtureName}`, () => {
-        expect(
-          generator
-            .translateObjectsForStructs(fixture, fixtureName, {})
-            .replace(/::_MODULE_NAME_::/g, 'SampleTurboModule'),
-        ).toMatchSnapshot();
-      });
-    });
-});
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
index 939b9bcea8d2f2..2d7f078c5257b9 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
@@ -34,24 +34,6 @@ Map {
 
 
 
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct SpecOptionalsAOptionalObjectProperty {
-      double x() const;
-      double y() const;
-
-      SpecOptionalsAOptionalObjectProperty(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty:(id)json;
-@end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct SpecDifficultAE {
@@ -74,57 +56,38 @@ namespace JS {
 
 namespace JS {
   namespace NativeSampleTurboModule {
-    struct SpecGetArraysOptionsArrayOfObjectsElement {
-      double numberProperty() const;
-
-      SpecGetArraysOptionsArrayOfObjectsElement(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement:(id)json;
-@end
-
-
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct SpecGetArraysOptions {
-      facebook::react::LazyVector<double> arrayOfNumbers() const;
-      folly::Optional<facebook::react::LazyVector<double>> optionalArrayOfNumbers() const;
-      facebook::react::LazyVector<NSString *> arrayOfStrings() const;
-      folly::Optional<facebook::react::LazyVector<NSString *>> optionalArrayOfStrings() const;
-      facebook::react::LazyVector<JS::NativeSampleTurboModule::arrayOfObjectsElement> arrayOfObjects() const;
+    struct SpecDifficultA {
+      bool D() const;
+      JS::NativeSampleTurboModule::SpecDifficultAE E() const;
+      NSString *F() const;
 
-      SpecGetArraysOptions(NSDictionary *const v) : _v(v) {}
+      SpecDifficultA(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptions)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptions:(id)json;
+@interface RCTCxxConvert (NativeSampleTurboModule_SpecDifficultA)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultA:(id)json;
 @end
 
 
 namespace JS {
   namespace NativeSampleTurboModule {
-    struct SpecOptionalMethodExtrasElement {
-      NSString *key() const;
-      id<NSObject> value() const;
+    struct SpecOptionalsAOptionalObjectProperty {
+      double x() const;
+      double y() const;
 
-      SpecOptionalMethodExtrasElement(NSDictionary *const v) : _v(v) {}
+      SpecOptionalsAOptionalObjectProperty(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecOptionalMethodExtrasElement)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalMethodExtrasElement:(id)json;
+@interface RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty:(id)json;
 @end
 
 
@@ -151,83 +114,128 @@ namespace JS {
 
 namespace JS {
   namespace NativeSampleTurboModule {
-    struct SpecDifficultReturnType {
-      bool D() const;
-      double E() const;
-      NSString *F() const;
+    struct SpecGetArraysOptionsArrayOfObjectsElement {
+      double numberProperty() const;
 
-      SpecDifficultReturnType(NSDictionary *const v) : _v(v) {}
+      SpecGetArraysOptionsArrayOfObjectsElement(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecDifficultReturnType)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultReturnType:(id)json;
+@interface RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement:(id)json;
 @end
 
 
 namespace JS {
   namespace NativeSampleTurboModule {
-    struct SpecDifficultA {
-      bool D() const;
-      JS::NativeSampleTurboModule::SpecDifficultAE E() const;
-      NSString *F() const;
+    struct SpecGetArraysOptions {
+      facebook::react::LazyVector<double> arrayOfNumbers() const;
+      folly::Optional<facebook::react::LazyVector<double>> optionalArrayOfNumbers() const;
+      facebook::react::LazyVector<NSString *> arrayOfStrings() const;
+      folly::Optional<facebook::react::LazyVector<NSString *>> optionalArrayOfStrings() const;
+      facebook::react::LazyVector<JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement> arrayOfObjects() const;
 
-      SpecDifficultA(NSDictionary *const v) : _v(v) {}
+      SpecGetArraysOptions(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecDifficultA)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultA:(id)json;
+@interface RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptions)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptions:(id)json;
 @end
 
-inline bool JS::NativeSampleTurboModule::SpecDifficultA::D() const
+@protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSDictionary *)difficult:(JS::NativeSampleTurboModule::SpecDifficultA &)A;
+- (void)optionals:(JS::NativeSampleTurboModule::SpecOptionalsA &)A;
+- (void)optionalMethod:(NSDictionary *)options
+              callback:(RCTResponseSenderBlock)callback
+                extras:(NSArray *)extras;
+- (void)getArrays:(JS::NativeSampleTurboModule::SpecGetArraysOptions &)options;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'SampleTurboModule'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+inline bool JS::NativeSampleTurboModule::SpecDifficultAE::D() const
 {
   id const p = _v[@\\"D\\"];
   return RCTBridgingToBool(p);
 }
 
 
-inline JS::NativeSampleTurboModule::SpecDifficultAE JS::NativeSampleTurboModule::SpecDifficultA::E() const
+inline double JS::NativeSampleTurboModule::SpecDifficultAE::E() const
 {
   id const p = _v[@\\"E\\"];
-  return JS::NativeSampleTurboModule::SpecDifficultAE(p);
+  return RCTBridgingToDouble(p);
 }
 
 
-inline NSString *JS::NativeSampleTurboModule::SpecDifficultA::F() const
+inline NSString *JS::NativeSampleTurboModule::SpecDifficultAE::F() const
 {
   id const p = _v[@\\"F\\"];
   return RCTBridgingToString(p);
 }
 
 
-inline bool JS::NativeSampleTurboModule::SpecDifficultReturnType::D() const
+inline double JS::NativeSampleTurboModule::SpecDifficultAE::id_() const
+{
+  id const p = _v[@\\"id_\\"];
+  return RCTBridgingToDouble(p);
+}
+
+
+inline bool JS::NativeSampleTurboModule::SpecDifficultA::D() const
 {
   id const p = _v[@\\"D\\"];
   return RCTBridgingToBool(p);
 }
 
 
-inline double JS::NativeSampleTurboModule::SpecDifficultReturnType::E() const
+inline JS::NativeSampleTurboModule::SpecDifficultAE JS::NativeSampleTurboModule::SpecDifficultA::E() const
 {
   id const p = _v[@\\"E\\"];
-  return RCTBridgingToDouble(p);
+  return JS::NativeSampleTurboModule::SpecDifficultAE(p);
 }
 
 
-inline NSString *JS::NativeSampleTurboModule::SpecDifficultReturnType::F() const
+inline NSString *JS::NativeSampleTurboModule::SpecDifficultA::F() const
 {
   id const p = _v[@\\"F\\"];
   return RCTBridgingToString(p);
 }
 
 
+inline double JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty::x() const
+{
+  id const p = _v[@\\"x\\"];
+  return RCTBridgingToDouble(p);
+}
+
+
+inline double JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty::y() const
+{
+  id const p = _v[@\\"y\\"];
+  return RCTBridgingToDouble(p);
+}
+
+
 inline folly::Optional<double> JS::NativeSampleTurboModule::SpecOptionalsA::optionalNumberProperty() const
 {
   id const p = _v[@\\"optionalNumberProperty\\"];
@@ -263,17 +271,10 @@ inline folly::Optional<bool> JS::NativeSampleTurboModule::SpecOptionalsA::option
 }
 
 
-inline NSString *JS::NativeSampleTurboModule::SpecOptionalMethodExtrasElement::key() const
-{
-  id const p = _v[@\\"key\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline id<NSObject> JS::NativeSampleTurboModule::SpecOptionalMethodExtrasElement::value() const
+inline double JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement::numberProperty() const
 {
-  id const p = _v[@\\"value\\"];
-  return p;
+  id const p = _v[@\\"numberProperty\\"];
+  return RCTBridgingToDouble(p);
 }
 
 
@@ -305,84 +306,12 @@ inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeSample
 }
 
 
-inline facebook::react::LazyVector<JS::NativeSampleTurboModule::arrayOfObjectsElement> JS::NativeSampleTurboModule::SpecGetArraysOptions::arrayOfObjects() const
+inline facebook::react::LazyVector<JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement> JS::NativeSampleTurboModule::SpecGetArraysOptions::arrayOfObjects() const
 {
   id const p = _v[@\\"arrayOfObjects\\"];
-  return RCTBridgingToVec(p, ^JS::NativeSampleTurboModule::arrayOfObjectsElement(id itemValue_0) { return JS::NativeSampleTurboModule::arrayOfObjectsElement(itemValue_0); });
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement::numberProperty() const
-{
-  id const p = _v[@\\"numberProperty\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline bool JS::NativeSampleTurboModule::SpecDifficultAE::D() const
-{
-  id const p = _v[@\\"D\\"];
-  return RCTBridgingToBool(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecDifficultAE::E() const
-{
-  id const p = _v[@\\"E\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline NSString *JS::NativeSampleTurboModule::SpecDifficultAE::F() const
-{
-  id const p = _v[@\\"F\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecDifficultAE::id_() const
-{
-  id const p = _v[@\\"id_\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty::x() const
-{
-  id const p = _v[@\\"x\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty::y() const
-{
-  id const p = _v[@\\"y\\"];
-  return RCTBridgingToDouble(p);
+  return RCTBridgingToVec(p, ^JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(id itemValue_0) { return JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(p); });
 }
 
-
-
-@protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
-- (NSDictionary *) difficult:(JS::NativeSampleTurboModule::SpecDifficultA &)A;
-- (void) optionals:(JS::NativeSampleTurboModule::SpecOptionalsA &)A;
-- (void) optionalMethod:(NSDictionary *)options
-   callback:(RCTResponseSenderBlock)callback
-   extras:(NSArray * _Nullable)extras;
-- (void) getArrays:(JS::NativeSampleTurboModule::SpecGetArraysOptions &)options;
-@end
-
-
-namespace facebook {
-  namespace react {
-    /**
-    * ObjC++ class for module 'SampleTurboModule'
-    */
-    class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
-    public:
-      NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
-  } // namespace react
-} // namespace facebook
 ",
 }
 `;
@@ -421,24 +350,25 @@ Map {
 
 
 
-
-
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
-@end
 
 
+@end
 namespace facebook {
   namespace react {
     /**
-    * ObjC++ class for module 'SampleTurboModule'
-    */
+     * ObjC++ class for module 'SampleTurboModule'
+     */
     class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
     };
   } // namespace react
 } // namespace facebook
+
+
+
 ",
 }
 `;
@@ -479,19 +409,19 @@ Map {
 
 namespace JS {
   namespace NativeAliasTurboModule {
-    struct OptionsDisplaySize {
-      double width() const;
-      double height() const;
+    struct OptionsOffset {
+      double x() const;
+      double y() const;
 
-      OptionsDisplaySize(NSDictionary *const v) : _v(v) {}
+      OptionsOffset(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeAliasTurboModule_OptionsDisplaySize)
-+ (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsDisplaySize:(id)json;
+@interface RCTCxxConvert (NativeAliasTurboModule_OptionsOffset)
++ (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsOffset:(id)json;
 @end
 
 
@@ -515,19 +445,19 @@ namespace JS {
 
 namespace JS {
   namespace NativeAliasTurboModule {
-    struct OptionsOffset {
-      double x() const;
-      double y() const;
+    struct OptionsDisplaySize {
+      double width() const;
+      double height() const;
 
-      OptionsOffset(NSDictionary *const v) : _v(v) {}
+      OptionsDisplaySize(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeAliasTurboModule_OptionsOffset)
-+ (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsOffset:(id)json;
+@interface RCTCxxConvert (NativeAliasTurboModule_OptionsDisplaySize)
++ (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsDisplaySize:(id)json;
 @end
 
 
@@ -551,40 +481,24 @@ namespace JS {
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_Options:(id)json;
 @end
 
-inline JS::NativeAliasTurboModule::OptionsOffset JS::NativeAliasTurboModule::Options::offset() const
-{
-  id const p = _v[@\\"offset\\"];
-  return JS::NativeAliasTurboModule::OptionsOffset(p);
-}
+@protocol NativeAliasTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
+- (void)cropImage:(JS::NativeAliasTurboModule::Options &)cropData;
 
-inline JS::NativeAliasTurboModule::OptionsSize JS::NativeAliasTurboModule::Options::size() const
-{
-  id const p = _v[@\\"size\\"];
-  return JS::NativeAliasTurboModule::OptionsSize(p);
-}
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'AliasTurboModule'
+     */
+    class JSI_EXPORT NativeAliasTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeAliasTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
 
 
-inline folly::Optional<JS::NativeAliasTurboModule::OptionsDisplaySize> JS::NativeAliasTurboModule::Options::displaySize() const
-{
-  id const p = _v[@\\"displaySize\\"];
-  return (p == nil ? folly::none : folly::make_optional(JS::NativeAliasTurboModule::OptionsDisplaySize(p)));
-}
-
-
-inline NSString *JS::NativeAliasTurboModule::Options::resizeMode() const
-{
-  id const p = _v[@\\"resizeMode\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline folly::Optional<bool> JS::NativeAliasTurboModule::Options::allowExternalStorage() const
-{
-  id const p = _v[@\\"allowExternalStorage\\"];
-  return RCTBridgingToOptionalBool(p);
-}
-
 
 inline double JS::NativeAliasTurboModule::OptionsOffset::x() const
 {
@@ -628,24 +542,40 @@ inline double JS::NativeAliasTurboModule::OptionsDisplaySize::height() const
 }
 
 
+inline JS::NativeAliasTurboModule::OptionsOffset JS::NativeAliasTurboModule::Options::offset() const
+{
+  id const p = _v[@\\"offset\\"];
+  return JS::NativeAliasTurboModule::OptionsOffset(p);
+}
 
-@protocol NativeAliasTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
-- (void) cropImage:(JS::NativeAliasTurboModule::Options &)cropData;
-@end
+inline JS::NativeAliasTurboModule::OptionsSize JS::NativeAliasTurboModule::Options::size() const
+{
+  id const p = _v[@\\"size\\"];
+  return JS::NativeAliasTurboModule::OptionsSize(p);
+}
 
 
-namespace facebook {
-  namespace react {
-    /**
-    * ObjC++ class for module 'AliasTurboModule'
-    */
-    class JSI_EXPORT NativeAliasTurboModuleSpecJSI : public ObjCTurboModule {
-    public:
-      NativeAliasTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
-  } // namespace react
-} // namespace facebook
+inline folly::Optional<JS::NativeAliasTurboModule::OptionsDisplaySize> JS::NativeAliasTurboModule::Options::displaySize() const
+{
+  id const p = _v[@\\"displaySize\\"];
+  return (p == nil ? folly::none : folly::make_optional(JS::NativeAliasTurboModule::OptionsDisplaySize(p)));
+}
+
+
+inline NSString *JS::NativeAliasTurboModule::Options::resizeMode() const
+{
+  id const p = _v[@\\"resizeMode\\"];
+  return RCTBridgingToOptionalString(p);
+}
+
+
+inline folly::Optional<bool> JS::NativeAliasTurboModule::Options::allowExternalStorage() const
+{
+  id const p = _v[@\\"allowExternalStorage\\"];
+  return RCTBridgingToOptionalBool(p);
+}
+
 ",
 }
 `;
@@ -686,143 +616,164 @@ Map {
 
 namespace JS {
   namespace NativeCameraRollManager {
-    struct PhotoIdentifierNodeLocation {
-      double longitude() const;
-      double latitude() const;
-      folly::Optional<double> altitude() const;
-      folly::Optional<double> heading() const;
-      folly::Optional<double> speed() const;
-
-      PhotoIdentifierNodeLocation(NSDictionary *const v) : _v(v) {}
+    struct GetPhotosParams {
+      double first() const;
+      NSString *after() const;
+      NSString *groupName() const;
+      NSString *groupTypes() const;
+      NSString *assetType() const;
+      folly::Optional<double> maxSize() const;
+      folly::Optional<facebook::react::LazyVector<NSString *>> mimeTypes() const;
+
+      GetPhotosParams(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeCameraRollManager_PhotoIdentifierNodeLocation)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifierNodeLocation:(id)json;
+@interface RCTCxxConvert (NativeCameraRollManager_GetPhotosParams)
++ (RCTManagedPointer *)JS_NativeCameraRollManager_GetPhotosParams:(id)json;
 @end
 
+@protocol NativeCameraRollManagerSpec <RCTBridgeModule, RCTTurboModule>
 
-namespace JS {
-  namespace NativeCameraRollManager {
-    struct PhotoIdentifierNode {
-      JS::NativeCameraRollManager::PhotoIdentifierImage image() const;
-      NSString *type() const;
-      NSString *group_name() const;
-      double timestamp() const;
-      JS::NativeCameraRollManager::PhotoIdentifierNodeLocation location() const;
-
-      PhotoIdentifierNode(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
+- (void)getPhotos:(JS::NativeCameraRollManager::GetPhotosParams &)params
+          resolve:(RCTPromiseResolveBlock)resolve
+           reject:(RCTPromiseRejectBlock)reject;
+- (void)saveToCameraRoll:(NSString *)uri
+                    type:(NSString *)type
+                 resolve:(RCTPromiseResolveBlock)resolve
+                  reject:(RCTPromiseRejectBlock)reject;
+- (void)deletePhotos:(NSArray *)assets
+             resolve:(RCTPromiseResolveBlock)resolve
+              reject:(RCTPromiseRejectBlock)reject;
 
-@interface RCTCxxConvert (NativeCameraRollManager_PhotoIdentifierNode)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifierNode:(id)json;
 @end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'CameraRollManager'
+     */
+    class JSI_EXPORT NativeCameraRollManagerSpecJSI : public ObjCTurboModule {
+    public:
+      NativeCameraRollManagerSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
 
 
 namespace JS {
-  namespace NativeCameraRollManager {
-    struct PhotoIdentifiersPagePage_info {
-      bool has_next_page() const;
-      NSString *start_cursor() const;
-      NSString *end_cursor() const;
+  namespace NativeExceptionsManager {
+    struct StackFrame {
+      folly::Optional<double> column() const;
+      NSString *file() const;
+      folly::Optional<double> lineNumber() const;
+      NSString *methodName() const;
+      folly::Optional<bool> collapse() const;
 
-      PhotoIdentifiersPagePage_info(NSDictionary *const v) : _v(v) {}
+      StackFrame(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeCameraRollManager_PhotoIdentifiersPagePage_info)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifiersPagePage_info:(id)json;
+@interface RCTCxxConvert (NativeExceptionsManager_StackFrame)
++ (RCTManagedPointer *)JS_NativeExceptionsManager_StackFrame:(id)json;
 @end
 
 
 namespace JS {
-  namespace NativeCameraRollManager {
-    struct PhotoIdentifierImage {
-      NSString *uri() const;
-      double playableDuration() const;
-      double width() const;
-      double height() const;
-      folly::Optional<bool> isStored() const;
-      NSString *filename() const;
+  namespace NativeExceptionsManager {
+    struct ExceptionData {
+      NSString *message() const;
+      NSString *originalMessage() const;
+      NSString *name() const;
+      NSString *componentStack() const;
+      facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> stack() const;
+      double id_() const;
+      bool isFatal() const;
+      id<NSObject> _Nullable extraData() const;
 
-      PhotoIdentifierImage(NSDictionary *const v) : _v(v) {}
+      ExceptionData(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeCameraRollManager_PhotoIdentifierImage)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifierImage:(id)json;
+@interface RCTCxxConvert (NativeExceptionsManager_ExceptionData)
++ (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json;
 @end
 
+@protocol NativeExceptionsManagerSpec <RCTBridgeModule, RCTTurboModule>
 
-namespace JS {
-  namespace NativeCameraRollManager {
-    struct PhotoIdentifier {
-      JS::NativeCameraRollManager::PhotoIdentifierNode node() const;
+- (void)reportFatalException:(NSString *)message
+                       stack:(NSArray *)stack
+                 exceptionId:(double)exceptionId;
+- (void)reportSoftException:(NSString *)message
+                      stack:(NSArray *)stack
+                exceptionId:(double)exceptionId;
+- (void)reportException:(JS::NativeExceptionsManager::ExceptionData &)data;
+- (void)updateExceptionMessage:(NSString *)message
+                         stack:(NSArray *)stack
+                   exceptionId:(double)exceptionId;
+- (void)dismissRedbox;
 
-      PhotoIdentifier(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'ExceptionsManager'
+     */
+    class JSI_EXPORT NativeExceptionsManagerSpecJSI : public ObjCTurboModule {
+    public:
+      NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params);
     };
-  }
-}
+  } // namespace react
+} // namespace facebook
 
-@interface RCTCxxConvert (NativeCameraRollManager_PhotoIdentifier)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifier:(id)json;
-@end
 
 
 namespace JS {
-  namespace NativeCameraRollManager {
-    struct PhotoIdentifiersPage {
-      facebook::react::LazyVector<JS::NativeCameraRollManager::PhotoIdentifier> edges() const;
-      JS::NativeCameraRollManager::PhotoIdentifiersPagePage_info page_info() const;
+  namespace NativeImagePickerIOS {
+    struct SpecOpenCameraDialogConfig {
+      bool unmirrorFrontFacingCamera() const;
+      bool videoMode() const;
 
-      PhotoIdentifiersPage(NSDictionary *const v) : _v(v) {}
+      SpecOpenCameraDialogConfig(NSDictionary *const v) : _v(v) {}
     private:
       NSDictionary *_v;
     };
   }
 }
 
-@interface RCTCxxConvert (NativeCameraRollManager_PhotoIdentifiersPage)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifiersPage:(id)json;
+@interface RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
++ (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json;
 @end
 
+@protocol NativeImagePickerIOSSpec <RCTBridgeModule, RCTTurboModule>
 
-namespace JS {
-  namespace NativeCameraRollManager {
-    struct GetPhotosParams {
-      double first() const;
-      NSString *after() const;
-      NSString *groupName() const;
-      NSString *groupTypes() const;
-      NSString *assetType() const;
-      folly::Optional<double> maxSize() const;
-      folly::Optional<facebook::react::LazyVector<NSString *>> mimeTypes() const;
+- (void)openCameraDialog:(JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig &)config
+         successCallback:(RCTResponseSenderBlock)successCallback
+          cancelCallback:(RCTResponseSenderBlock)cancelCallback;
 
-      GetPhotosParams(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'ImagePickerIOS'
+     */
+    class JSI_EXPORT NativeImagePickerIOSSpecJSI : public ObjCTurboModule {
+    public:
+      NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params);
     };
-  }
-}
+  } // namespace react
+} // namespace facebook
+
 
-@interface RCTCxxConvert (NativeCameraRollManager_GetPhotosParams)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_GetPhotosParams:(id)json;
-@end
 
 inline double JS::NativeCameraRollManager::GetPhotosParams::first() const
 {
@@ -834,28 +785,28 @@ inline double JS::NativeCameraRollManager::GetPhotosParams::first() const
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::after() const
 {
   id const p = _v[@\\"after\\"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 
 
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::groupName() const
 {
   id const p = _v[@\\"groupName\\"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 
 
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::groupTypes() const
 {
   id const p = _v[@\\"groupTypes\\"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 
 
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::assetType() const
 {
   id const p = _v[@\\"assetType\\"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 
 
@@ -873,220 +824,40 @@ inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeCamera
 }
 
 
-inline facebook::react::LazyVector<JS::NativeCameraRollManager::PhotoIdentifier> JS::NativeCameraRollManager::PhotoIdentifiersPage::edges() const
-{
-  id const p = _v[@\\"edges\\"];
-  return RCTBridgingToVec(p, ^JS::NativeCameraRollManager::PhotoIdentifier(id itemValue_0) { return JS::NativeCameraRollManager::PhotoIdentifier(itemValue_0); });
-}
-
-
-inline JS::NativeCameraRollManager::PhotoIdentifiersPagePage_info JS::NativeCameraRollManager::PhotoIdentifiersPage::page_info() const
-{
-  id const p = _v[@\\"page_info\\"];
-  return JS::NativeCameraRollManager::PhotoIdentifiersPagePage_info(p);
-}
-
-
-inline JS::NativeCameraRollManager::PhotoIdentifierNode JS::NativeCameraRollManager::PhotoIdentifier::node() const
-{
-  id const p = _v[@\\"node\\"];
-  return JS::NativeCameraRollManager::PhotoIdentifierNode(p);
-}
-
-
-inline NSString *JS::NativeCameraRollManager::PhotoIdentifierImage::uri() const
-{
-  id const p = _v[@\\"uri\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline double JS::NativeCameraRollManager::PhotoIdentifierImage::playableDuration() const
-{
-  id const p = _v[@\\"playableDuration\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline double JS::NativeCameraRollManager::PhotoIdentifierImage::width() const
-{
-  id const p = _v[@\\"width\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline double JS::NativeCameraRollManager::PhotoIdentifierImage::height() const
-{
-  id const p = _v[@\\"height\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline folly::Optional<bool> JS::NativeCameraRollManager::PhotoIdentifierImage::isStored() const
-{
-  id const p = _v[@\\"isStored\\"];
-  return RCTBridgingToOptionalBool(p);
-}
-
-
-inline NSString *JS::NativeCameraRollManager::PhotoIdentifierImage::filename() const
-{
-  id const p = _v[@\\"filename\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline bool JS::NativeCameraRollManager::PhotoIdentifiersPagePage_info::has_next_page() const
-{
-  id const p = _v[@\\"has_next_page\\"];
-  return RCTBridgingToBool(p);
-}
-
-
-inline NSString *JS::NativeCameraRollManager::PhotoIdentifiersPagePage_info::start_cursor() const
-{
-  id const p = _v[@\\"start_cursor\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline NSString *JS::NativeCameraRollManager::PhotoIdentifiersPagePage_info::end_cursor() const
-{
-  id const p = _v[@\\"end_cursor\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline JS::NativeCameraRollManager::PhotoIdentifierImage JS::NativeCameraRollManager::PhotoIdentifierNode::image() const
-{
-  id const p = _v[@\\"image\\"];
-  return JS::NativeCameraRollManager::PhotoIdentifierImage(p);
-}
-
-
-inline NSString *JS::NativeCameraRollManager::PhotoIdentifierNode::type() const
+inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::column() const
 {
-  id const p = _v[@\\"type\\"];
-  return RCTBridgingToString(p);
+  id const p = _v[@\\"column\\"];
+  return RCTBridgingToOptionalDouble(p);
 }
 
 
-inline NSString *JS::NativeCameraRollManager::PhotoIdentifierNode::group_name() const
+inline NSString *JS::NativeExceptionsManager::StackFrame::file() const
 {
-  id const p = _v[@\\"group_name\\"];
+  id const p = _v[@\\"file\\"];
   return RCTBridgingToString(p);
 }
 
 
-inline double JS::NativeCameraRollManager::PhotoIdentifierNode::timestamp() const
-{
-  id const p = _v[@\\"timestamp\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline JS::NativeCameraRollManager::PhotoIdentifierNodeLocation JS::NativeCameraRollManager::PhotoIdentifierNode::location() const
-{
-  id const p = _v[@\\"location\\"];
-  return JS::NativeCameraRollManager::PhotoIdentifierNodeLocation(p);
-}
-
-
-inline double JS::NativeCameraRollManager::PhotoIdentifierNodeLocation::longitude() const
-{
-  id const p = _v[@\\"longitude\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline double JS::NativeCameraRollManager::PhotoIdentifierNodeLocation::latitude() const
-{
-  id const p = _v[@\\"latitude\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline folly::Optional<double> JS::NativeCameraRollManager::PhotoIdentifierNodeLocation::altitude() const
+inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::lineNumber() const
 {
-  id const p = _v[@\\"altitude\\"];
+  id const p = _v[@\\"lineNumber\\"];
   return RCTBridgingToOptionalDouble(p);
 }
 
 
-inline folly::Optional<double> JS::NativeCameraRollManager::PhotoIdentifierNodeLocation::heading() const
+inline NSString *JS::NativeExceptionsManager::StackFrame::methodName() const
 {
-  id const p = _v[@\\"heading\\"];
-  return RCTBridgingToOptionalDouble(p);
+  id const p = _v[@\\"methodName\\"];
+  return RCTBridgingToString(p);
 }
 
 
-inline folly::Optional<double> JS::NativeCameraRollManager::PhotoIdentifierNodeLocation::speed() const
+inline folly::Optional<bool> JS::NativeExceptionsManager::StackFrame::collapse() const
 {
-  id const p = _v[@\\"speed\\"];
-  return RCTBridgingToOptionalDouble(p);
-}
-
-
-
-@protocol NativeCameraRollManagerSpec <RCTBridgeModule, RCTTurboModule>
-
-- (void) getPhotos:(JS::NativeCameraRollManager::GetPhotosParams &)params
-   resolve:(RCTPromiseResolveBlock)resolve
-   reject:(RCTPromiseRejectBlock)reject;
-- (void) saveToCameraRoll:(NSString *)uri
-   type:(NSString *)type
-   resolve:(RCTPromiseResolveBlock)resolve
-   reject:(RCTPromiseRejectBlock)reject;
-- (void) deletePhotos:(NSArray *)assets
-   resolve:(RCTPromiseResolveBlock)resolve
-   reject:(RCTPromiseRejectBlock)reject;
-@end
-
-
-
-namespace JS {
-  namespace NativeExceptionsManager {
-    struct StackFrame {
-      folly::Optional<double> column() const;
-      NSString *file() const;
-      folly::Optional<double> lineNumber() const;
-      NSString *methodName() const;
-      folly::Optional<bool> collapse() const;
-
-      StackFrame(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeExceptionsManager_StackFrame)
-+ (RCTManagedPointer *)JS_NativeExceptionsManager_StackFrame:(id)json;
-@end
-
-
-namespace JS {
-  namespace NativeExceptionsManager {
-    struct ExceptionData {
-      NSString *message() const;
-      NSString *originalMessage() const;
-      NSString *name() const;
-      NSString *componentStack() const;
-      facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> stack() const;
-      double id_() const;
-      bool isFatal() const;
-      id<NSObject> _Nullable extraData() const;
-
-      ExceptionData(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
+  id const p = _v[@\\"collapse\\"];
+  return RCTBridgingToOptionalBool(p);
 }
 
-@interface RCTCxxConvert (NativeExceptionsManager_ExceptionData)
-+ (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json;
-@end
 
 inline NSString *JS::NativeExceptionsManager::ExceptionData::message() const
 {
@@ -1119,7 +890,7 @@ inline NSString *JS::NativeExceptionsManager::ExceptionData::componentStack() co
 inline facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> JS::NativeExceptionsManager::ExceptionData::stack() const
 {
   id const p = _v[@\\"stack\\"];
-  return RCTBridgingToVec(p, ^JS::NativeExceptionsManager::StackFrame(id itemValue_0) { return JS::NativeExceptionsManager::StackFrame(itemValue_0); });
+  return RCTBridgingToVec(p, ^JS::NativeExceptionsManager::StackFrame(id itemValue_0) { return JS::NativeExceptionsManager::StackFrame(p); });
 }
 
 
@@ -1144,75 +915,6 @@ inline id<NSObject> _Nullable JS::NativeExceptionsManager::ExceptionData::extraD
 }
 
 
-inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::column() const
-{
-  id const p = _v[@\\"column\\"];
-  return RCTBridgingToOptionalDouble(p);
-}
-
-
-inline NSString *JS::NativeExceptionsManager::StackFrame::file() const
-{
-  id const p = _v[@\\"file\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::lineNumber() const
-{
-  id const p = _v[@\\"lineNumber\\"];
-  return RCTBridgingToOptionalDouble(p);
-}
-
-
-inline NSString *JS::NativeExceptionsManager::StackFrame::methodName() const
-{
-  id const p = _v[@\\"methodName\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline folly::Optional<bool> JS::NativeExceptionsManager::StackFrame::collapse() const
-{
-  id const p = _v[@\\"collapse\\"];
-  return RCTBridgingToOptionalBool(p);
-}
-
-
-
-@protocol NativeExceptionsManagerSpec <RCTBridgeModule, RCTTurboModule>
-- (void) reportFatalException:(NSString *)message
-   stack:(NSArray *)stack
-   exceptionId:(double)exceptionId;
-- (void) reportSoftException:(NSString *)message
-   stack:(NSArray *)stack
-   exceptionId:(double)exceptionId;
-- (void) reportException:(JS::NativeExceptionsManager::ExceptionData &)data;
-- (void) updateExceptionMessage:(NSString *)message
-   stack:(NSArray *)stack
-   exceptionId:(double)exceptionId;
-- (void) dismissRedbox;
-@end
-
-
-
-namespace JS {
-  namespace NativeImagePickerIOS {
-    struct SpecOpenCameraDialogConfig {
-      bool unmirrorFrontFacingCamera() const;
-      bool videoMode() const;
-
-      SpecOpenCameraDialogConfig(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
-+ (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json;
-@end
-
 inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::unmirrorFrontFacingCamera() const
 {
   id const p = _v[@\\"unmirrorFrontFacingCamera\\"];
@@ -1226,40 +928,6 @@ inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::videoMode() co
   return RCTBridgingToBool(p);
 }
 
-
-
-@protocol NativeImagePickerIOSSpec <RCTBridgeModule, RCTTurboModule>
-- (void) openCameraDialog:(JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig &)config
-   successCallback:(RCTResponseSenderBlock)successCallback
-   cancelCallback:(RCTResponseSenderBlock)cancelCallback;
-@end
-
-
-namespace facebook {
-  namespace react {
-    /**
-    * ObjC++ class for module 'CameraRollManager'
-    */
-    class JSI_EXPORT NativeCameraRollManagerSpecJSI : public ObjCTurboModule {
-    public:
-      NativeCameraRollManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
-    /**
-    * ObjC++ class for module 'ExceptionsManager'
-    */
-    class JSI_EXPORT NativeExceptionsManagerSpecJSI : public ObjCTurboModule {
-    public:
-      NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
-    /**
-    * ObjC++ class for module 'ImagePickerIOS'
-    */
-    class JSI_EXPORT NativeImagePickerIOSSpecJSI : public ObjCTurboModule {
-    public:
-      NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
-  } // namespace react
-} // namespace facebook
 ",
 }
 `;
@@ -1327,53 +995,53 @@ namespace JS {
     };
   }
 }
-
-inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
-  NSMutableDictionary *d = [NSMutableDictionary new];
-  auto const1 = i.const1.get();
-  d[@\\"const1\\"] = @(const1);
-auto const2 = i.const2.get();
-  d[@\\"const2\\"] = @(const2);
-auto const3 = i.const3.get();
-  d[@\\"const3\\"] = const3;
-  return d;
-}) {}
-inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
-  return i.unsafeRawValue();
-}) {}
-
-
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber *)getBool:(BOOL)arg;
+- (NSNumber *)getNumber:(double)arg;
+- (NSString *)getString:(NSString *)arg;
+- (NSArray<NSDictionary *> *)getArray:(NSArray *)arg;
+- (NSDictionary *)getObject:(NSDictionary *)arg;
+- (NSNumber *)getRootTag:(double)arg;
+- (NSDictionary *)getValue:(double)x
+                         y:(NSString *)y
+                         z:(NSDictionary *)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(BOOL)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
 - (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)constantsToExport;
 - (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)getConstants;
-- (void) voidFunc;
-- (BOOL) getBool:(BOOL)arg;
-- (NSNumber *) getNumber:(double)arg;
-- (NSString *) getString:(NSString *)arg;
-- (NSArray<id<NSObject>> *) getArray:(NSArray *)arg;
-- (NSDictionary *) getObject:(NSDictionary *)arg;
-- (NSNumber *) getRootTag:(double)arg;
-- (NSDictionary *) getValue:(double)x
-   y:(NSString *)y
-   z:(NSDictionary *)z;
-- (void) getValueWithCallback:(RCTResponseSenderBlock)callback;
-- (void) getValueWithPromise:(BOOL)error
-   resolve:(RCTPromiseResolveBlock)resolve
-   reject:(RCTPromiseRejectBlock)reject;
-@end
-
 
+@end
 namespace facebook {
   namespace react {
     /**
-    * ObjC++ class for module 'SampleTurboModule'
-    */
+     * ObjC++ class for module 'SampleTurboModule'
+     */
     class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
     };
   } // namespace react
 } // namespace facebook
+
+
+
+inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1.get();
+  d[@\\"const1\\"] = @(const1);
+  auto const2 = i.const2.get();
+  d[@\\"const2\\"] = @(const2);
+  auto const3 = i.const3.get();
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
 ",
 }
 `;
@@ -1412,40 +1080,45 @@ Map {
 
 
 
-
-
 @protocol NativeSample2TurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
-- (void) voidFunc;
-@end
-
+- (void)voidFunc;
 
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'Sample2TurboModule'
+     */
+    class JSI_EXPORT NativeSample2TurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
 
 
 
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
-- (void) voidFunc;
-@end
 
+- (void)voidFunc;
 
+@end
 namespace facebook {
   namespace react {
     /**
-    * ObjC++ class for module 'SampleTurboModule'
-    */
+     * ObjC++ class for module 'SampleTurboModule'
+     */
     class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
     };
-    /**
-    * ObjC++ class for module 'Sample2TurboModule'
-    */
-    class JSI_EXPORT NativeSample2TurboModuleSpecJSI : public ObjCTurboModule {
-    public:
-      NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
   } // namespace react
 } // namespace facebook
+
+
+
+
 ",
 }
 `;
@@ -1484,39 +1157,45 @@ Map {
 
 
 
-
-
 @protocol NativeSample2TurboModuleSpec <RCTBridgeModule, RCTTurboModule>
-- (void) voidFunc;
-@end
 
+- (void)voidFunc;
 
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'Sample2TurboModule'
+     */
+    class JSI_EXPORT NativeSample2TurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
 
 
 
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
-- (void) voidFunc;
-@end
 
+- (void)voidFunc;
 
+@end
 namespace facebook {
   namespace react {
     /**
-    * ObjC++ class for module 'SampleTurboModule'
-    */
+     * ObjC++ class for module 'SampleTurboModule'
+     */
     class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
     };
-    /**
-    * ObjC++ class for module 'Sample2TurboModule'
-    */
-    class JSI_EXPORT NativeSample2TurboModuleSpecJSI : public ObjCTurboModule {
-    public:
-      NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-    };
   } // namespace react
 } // namespace facebook
+
+
+
+
 ",
 }
 `;
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
index 192e19235d1cf1..1d9e6034f4baeb 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
@@ -9,17 +9,21 @@ Map {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleMm.js
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#include <SampleSpec/SampleSpec.h>
-#import <folly/Optional.h>
+#import \\"SampleSpec.h\\"
+
 
 
-@implementation RCTCxxConvert (NativeSampleTurboModule_SpecDifficultReturnType)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultReturnType:(id)json
+@implementation RCTCxxConvert (NativeSampleTurboModule_SpecDifficultAE)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultAE:(id)json
 {
-  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecDifficultReturnType>(json);
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecDifficultAE>(json);
 }
 @end
 
@@ -32,72 +36,83 @@ Map {
 @end
 
 
-@implementation RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsA)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsA:(id)json
+@implementation RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty:(id)json
 {
-  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecOptionalsA>(json);
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty>(json);
 }
 @end
 
 
-@implementation RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptions)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptions:(id)json
+@implementation RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsA)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsA:(id)json
 {
-  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecGetArraysOptions>(json);
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecOptionalsA>(json);
 }
 @end
 
 
-@implementation RCTCxxConvert (NativeSampleTurboModule_SpecDifficultAE)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultAE:(id)json
+@implementation RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement:(id)json
 {
-  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecDifficultAE>(json);
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement>(json);
 }
 @end
 
 
-@implementation RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty:(id)json
+@implementation RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptions)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptions:(id)json
 {
-  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty>(json);
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecGetArraysOptions>(json);
 }
 @end
 
 namespace facebook {
   namespace react {
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_difficult(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, ObjectKind, \\"difficult\\", @selector(difficult:), args, count);
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::difficult(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"difficult\\", @selector(difficult:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_optionals(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"optionals\\", @selector(optionals:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::optionals(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"optionals\\", @selector(optionals:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"optionalMethod\\", @selector(optionalMethod:callback:extras:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::optionalMethod(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"optionalMethod\\", @selector(optionalMethod:callback:extras:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArrays(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"getArrays\\", @selector(getArrays:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getArrays(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getArrays\\", @selector(getArrays:), args, count);
     }
 
+
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-          methodMap_[\\"difficult\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_difficult};
-      methodMap_[\\"optionals\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_optionals};
-      methodMap_[\\"optionalMethod\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod};
-      methodMap_[\\"getArrays\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArrays};
-      setMethodArgConversionSelector(@\\"difficult\\", 0, @\\"JS_NativeSampleTurboModule_SpecDifficultA:\\");
-      setMethodArgConversionSelector(@\\"optionals\\", 0, @\\"JS_NativeSampleTurboModule_SpecOptionalsA:\\");
-      setMethodArgConversionSelector(@\\"getArrays\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetArraysOptions:\\");
+        
+        methodMap_[\\"difficult\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_difficult};
+        setMethodArgConversionSelector(@\\"difficult\\", 0, @\\"JS_NativeSampleTurboModule_SpecDifficultA:\\");
+
+        
+        methodMap_[\\"optionals\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_optionals};
+        setMethodArgConversionSelector(@\\"optionals\\", 0, @\\"JS_NativeSampleTurboModule_SpecOptionalsA:\\");
+
+        
+        methodMap_[\\"optionalMethod\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod};
+        
+
+        
+        methodMap_[\\"getArrays\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArrays};
+        setMethodArgConversionSelector(@\\"getArrays\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetArraysOptions:\\");
+
+        }
     }
   } // namespace react
 } // namespace facebook
+
 ",
 }
 `;
@@ -111,23 +126,29 @@ Map {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleMm.js
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#include <SampleSpec/SampleSpec.h>
-#import <folly/Optional.h>
+#import \\"SampleSpec.h\\"
+
 
 
 namespace facebook {
   namespace react {
-
+    
 
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-    
+        
+        }
     }
   } // namespace react
 } // namespace facebook
+
 ",
 }
 `;
@@ -141,20 +162,16 @@ Map {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleMm.js
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#include <SampleSpec/SampleSpec.h>
-#import <folly/Optional.h>
+#import \\"SampleSpec.h\\"
 
 
-@implementation RCTCxxConvert (NativeAliasTurboModule_Options)
-+ (RCTManagedPointer *)JS_NativeAliasTurboModule_Options:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAliasTurboModule::Options>(json);
-}
-@end
-
 
 @implementation RCTCxxConvert (NativeAliasTurboModule_OptionsOffset)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsOffset:(id)json
@@ -179,23 +196,33 @@ Map {
 }
 @end
 
-namespace facebook {
-  namespace react {
 
+@implementation RCTCxxConvert (NativeAliasTurboModule_Options)
++ (RCTManagedPointer *)JS_NativeAliasTurboModule_Options:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeAliasTurboModule::Options>(json);
+}
+@end
 
-    static facebook::jsi::Value __hostFunction_NativeAliasTurboModuleSpecJSI_cropImage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"cropImage\\", @selector(cropImage:), args, count);
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeAliasTurboModuleSpecJSI::cropImage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"cropImage\\", @selector(cropImage:), args, count);
     }
 
+
     NativeAliasTurboModuleSpecJSI::NativeAliasTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-    
-      methodMap_[\\"cropImage\\"] = MethodMetadata {1, __hostFunction_NativeAliasTurboModuleSpecJSI_cropImage};
-      setMethodArgConversionSelector(@\\"cropImage\\", 0, @\\"JS_NativeAliasTurboModule_Options:\\");
+        
+        methodMap_[\\"cropImage\\"] = MethodMetadata {1, __hostFunction_NativeAliasTurboModuleSpecJSI_cropImage};
+        setMethodArgConversionSelector(@\\"cropImage\\", 0, @\\"JS_NativeAliasTurboModule_SpecCropImageCropData:\\");
+
+        }
     }
   } // namespace react
 } // namespace facebook
+
 ",
 }
 `;
@@ -209,35 +236,15 @@ Map {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleMm.js
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#include <SampleSpec/SampleSpec.h>
-#import <folly/Optional.h>
-
+#import \\"SampleSpec.h\\"
 
-@implementation RCTCxxConvert (NativeCameraRollManager_PhotoIdentifierImage)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifierImage:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeCameraRollManager::PhotoIdentifierImage>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeCameraRollManager_PhotoIdentifier)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifier:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeCameraRollManager::PhotoIdentifier>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeCameraRollManager_PhotoIdentifiersPage)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifiersPage:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeCameraRollManager::PhotoIdentifiersPage>(json);
-}
-@end
 
 
 @implementation RCTCxxConvert (NativeCameraRollManager_GetPhotosParams)
@@ -247,37 +254,43 @@ Map {
 }
 @end
 
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI::getPhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getPhotos\\", @selector(getPhotos:resolve:reject:), args, count);
+    }
 
-@implementation RCTCxxConvert (NativeCameraRollManager_PhotoIdentifierNode)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifierNode:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeCameraRollManager::PhotoIdentifierNode>(json);
-}
-@end
 
+    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI::saveToCameraRoll(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"saveToCameraRoll\\", @selector(saveToCameraRoll:type:resolve:reject:), args, count);
+    }
 
-@implementation RCTCxxConvert (NativeCameraRollManager_PhotoIdentifiersPagePage_info)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifiersPagePage_info:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeCameraRollManager::PhotoIdentifiersPagePage_info>(json);
-}
-@end
 
+    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI::deletePhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"deletePhotos\\", @selector(deletePhotos:resolve:reject:), args, count);
+    }
 
-@implementation RCTCxxConvert (NativeCameraRollManager_PhotoIdentifierNodeLocation)
-+ (RCTManagedPointer *)JS_NativeCameraRollManager_PhotoIdentifierNodeLocation:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeCameraRollManager::PhotoIdentifierNodeLocation>(json);
-}
-@end
 
+    NativeCameraRollManagerSpecJSI::NativeCameraRollManagerSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getPhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_getPhotos};
+        setMethodArgConversionSelector(@\\"getPhotos\\", 0, @\\"JS_NativeCameraRollManager_SpecGetPhotosParams:\\");
+
+        
+        methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll};
+        
+
+        
+        methodMap_[\\"deletePhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_deletePhotos};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
 
-@implementation RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
-+ (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig>(json);
-}
-@end
 
 
 @implementation RCTCxxConvert (NativeExceptionsManager_StackFrame)
@@ -297,79 +310,87 @@ Map {
 
 namespace facebook {
   namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::reportFatalException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportFatalException\\", @selector(reportFatalException:stack:exceptionId:), args, count);
+    }
 
 
-    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_getPhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, PromiseKind, \\"getPhotos\\", @selector(getPhotos:resolve:reject:), args, count);
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::reportSoftException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportSoftException\\", @selector(reportSoftException:stack:exceptionId:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, PromiseKind, \\"saveToCameraRoll\\", @selector(saveToCameraRoll:type:resolve:reject:), args, count);
-    }
 
-    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_deletePhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, PromiseKind, \\"deletePhotos\\", @selector(deletePhotos:resolve:reject:), args, count);
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::reportException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportException\\", @selector(reportException:), args, count);
     }
 
-    NativeCameraRollManagerSpecJSI::NativeCameraRollManagerSpecJSI(const ObjCTurboModule::InitParams &params)
-      : ObjCTurboModule(params) {
-    
-      methodMap_[\\"getPhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_getPhotos};
-      methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {2, __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll};
-      methodMap_[\\"deletePhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_deletePhotos};
-      setMethodArgConversionSelector(@\\"getPhotos\\", 0, @\\"JS_NativeCameraRollManager_GetPhotosParams:\\");
+
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::updateExceptionMessage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"updateExceptionMessage\\", @selector(updateExceptionMessage:stack:exceptionId:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"openCameraDialog\\", @selector(openCameraDialog:successCallback:cancelCallback:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::dismissRedbox(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"dismissRedbox\\", @selector(dismissRedbox), args, count);
     }
 
-    NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
+
+    NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-          methodMap_[\\"openCameraDialog\\"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
-      setMethodArgConversionSelector(@\\"openCameraDialog\\", 0, @\\"JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:\\");
-    }
+        
+        methodMap_[\\"reportFatalException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException};
+        
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"reportFatalException\\", @selector(reportFatalException:stack:exceptionId:), args, count);
-    }
+        
+        methodMap_[\\"reportSoftException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException};
+        
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"reportSoftException\\", @selector(reportSoftException:stack:exceptionId:), args, count);
-    }
+        
+        methodMap_[\\"reportException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportException};
+        setMethodArgConversionSelector(@\\"reportException\\", 0, @\\"JS_NativeExceptionsManager_SpecReportExceptionData:\\");
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"reportException\\", @selector(reportException:), args, count);
-    }
+        
+        methodMap_[\\"updateExceptionMessage\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage};
+        
+
+        
+        methodMap_[\\"dismissRedbox\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
+        
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"updateExceptionMessage\\", @selector(updateExceptionMessage:stack:exceptionId:), args, count);
+        }
     }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
++ (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig>(json);
+}
+@end
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"dismissRedbox\\", @selector(dismissRedbox), args, count);
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeImagePickerIOSSpecJSI::openCameraDialog(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"openCameraDialog\\", @selector(openCameraDialog:successCallback:cancelCallback:), args, count);
     }
 
-    NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params)
+
+    NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-          methodMap_[\\"reportFatalException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException};
-      methodMap_[\\"reportSoftException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException};
-      methodMap_[\\"reportException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportException};
-      methodMap_[\\"updateExceptionMessage\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage};
-      methodMap_[\\"dismissRedbox\\"] = MethodMetadata {0, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
-      setMethodArgConversionSelector(@\\"reportException\\", 0, @\\"JS_NativeExceptionsManager_ExceptionData:\\");
+        
+        methodMap_[\\"openCameraDialog\\"] = MethodMetadata {1, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
+        setMethodArgConversionSelector(@\\"openCameraDialog\\", 0, @\\"JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:\\");
+
+        }
     }
   } // namespace react
 } // namespace facebook
+
 ",
 }
 `;
@@ -383,87 +404,142 @@ Map {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleMm.js
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#include <SampleSpec/SampleSpec.h>
-#import <folly/Optional.h>
+#import \\"SampleSpec.h\\"
 
 
+
+@implementation RCTCxxConvert (NativeSampleTurboModule_Constants)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::Constants>(json);
+}
+@end
+
 namespace facebook {
   namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, BooleanKind, \\"getBool\\", @selector(getBool:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
     }
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
     }
 
+
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-          methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
-      methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
-      methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
-      methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
-      methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
-      methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
-      methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
-      methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
-      methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
-      methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
-      methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        
+
+        
+        methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
+        
+
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
+        
+
+        
+        methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
+        
+
+        
+        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
+        
+
+        
+        methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
+        
+
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+        
+
+        }
     }
   } // namespace react
 } // namespace facebook
+
 ",
 }
 `;
@@ -477,40 +553,57 @@ Map {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleMm.js
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#include <SampleSpec/SampleSpec.h>
-#import <folly/Optional.h>
+#import \\"SampleSpec.h\\"
 
 
 
 namespace facebook {
   namespace react {
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    
+    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-    NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+
+    NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-          methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
+        
+
+        }
     }
+  } // namespace react
+} // namespace facebook
+
 
 
-    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-    NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+
+    NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-    
-      methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        
+
+        }
     }
   } // namespace react
 } // namespace facebook
+
 ",
 }
 `;
@@ -524,38 +617,57 @@ Map {
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleMm.js
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
-#include <SampleSpec/SampleSpec.h>
-#import <folly/Optional.h>
+#import \\"SampleSpec.h\\"
 
 
 
 namespace facebook {
   namespace react {
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    
+    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-    NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+
+    NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-          methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
+        
+
+        }
     }
+  } // namespace react
+} // namespace facebook
+
 
-    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule &>(turboModule)
-         .invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-    NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+
+    NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
-          methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        
+
+        }
     }
   } // namespace react
 } // namespace facebook
+
 ",
 }
 `;
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateStructs-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateStructs-test.js.snap
deleted file mode 100644
index 75bb7bfe5dbde1..00000000000000
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateStructs-test.js.snap
+++ /dev/null
@@ -1,284 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`GenerateStructs can generate fixture SIMPLE_CONSTANTS 1`] = `
-"
-
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct ConstantsDG {
-
-      struct Builder {
-        struct Input {
-          RCTRequired<bool> h;
-          RCTRequired<double> i;
-          RCTRequired<NSString *> j;
-        };
-
-        /** Initialize with a set of values */
-        Builder(const Input i);
-        /** Initialize with an existing ConstantsDG */
-        Builder(ConstantsDG i);
-        /** Builds the object. Generally used only by the infrastructure. */
-        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
-      private:
-        NSDictionary *(^_factory)(void);
-      };
-
-      static ConstantsDG fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
-      NSDictionary *unsafeRawValue() const { return _v; }
-    private:
-      ConstantsDG(NSDictionary *const v) : _v(v) {}
-      NSDictionary *_v;
-    };
-  }
-}
-
-inline JS::NativeSampleTurboModule::ConstantsDG::Builder::Builder(const Input i) : _factory(^{
-  NSMutableDictionary *d = [NSMutableDictionary new];
-  auto h = i.h.get();
-  d[@\\"h\\"] = @(h);
-auto i = i.i.get();
-  d[@\\"i\\"] = @(i);
-auto j = i.j.get();
-  d[@\\"j\\"] = j;
-  return d;
-}) {}
-inline JS::NativeSampleTurboModule::ConstantsDG::Builder::Builder(ConstantsDG i) : _factory(^{
-  return i.unsafeRawValue();
-}) {}
-
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct ConstantsD {
-
-      struct Builder {
-        struct Input {
-          RCTRequired<bool> e;
-          RCTRequired<double> f;
-          RCTRequired<JS::NativeSampleTurboModule::ConstantsDG::Builder> g;
-        };
-
-        /** Initialize with a set of values */
-        Builder(const Input i);
-        /** Initialize with an existing ConstantsD */
-        Builder(ConstantsD i);
-        /** Builds the object. Generally used only by the infrastructure. */
-        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
-      private:
-        NSDictionary *(^_factory)(void);
-      };
-
-      static ConstantsD fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
-      NSDictionary *unsafeRawValue() const { return _v; }
-    private:
-      ConstantsD(NSDictionary *const v) : _v(v) {}
-      NSDictionary *_v;
-    };
-  }
-}
-
-inline JS::NativeSampleTurboModule::ConstantsD::Builder::Builder(const Input i) : _factory(^{
-  NSMutableDictionary *d = [NSMutableDictionary new];
-  auto e = i.e.get();
-  d[@\\"e\\"] = @(e);
-auto f = i.f.get();
-  d[@\\"f\\"] = @(f);
-auto g = i.g.get();
-  d[@\\"g\\"] = g.buildUnsafeRawValue();
-  return d;
-}) {}
-inline JS::NativeSampleTurboModule::ConstantsD::Builder::Builder(ConstantsD i) : _factory(^{
-  return i.unsafeRawValue();
-}) {}
-
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct Constants {
-
-      struct Builder {
-        struct Input {
-          RCTRequired<bool> a;
-          RCTRequired<double> b;
-          RCTRequired<NSString *> c;
-          RCTRequired<JS::NativeSampleTurboModule::ConstantsD::Builder> d;
-          RCTRequired<double> k;
-        };
-
-        /** Initialize with a set of values */
-        Builder(const Input i);
-        /** Initialize with an existing Constants */
-        Builder(Constants i);
-        /** Builds the object. Generally used only by the infrastructure. */
-        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
-      private:
-        NSDictionary *(^_factory)(void);
-      };
-
-      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
-      NSDictionary *unsafeRawValue() const { return _v; }
-    private:
-      Constants(NSDictionary *const v) : _v(v) {}
-      NSDictionary *_v;
-    };
-  }
-}
-
-inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
-  NSMutableDictionary *d = [NSMutableDictionary new];
-  auto a = i.a.get();
-  d[@\\"a\\"] = @(a);
-auto b = i.b.get();
-  d[@\\"b\\"] = @(b);
-auto c = i.c.get();
-  d[@\\"c\\"] = c;
-auto d = i.d.get();
-  d[@\\"d\\"] = d.buildUnsafeRawValue();
-auto k = i.k.get();
-  d[@\\"k\\"] = @(k);
-  return d;
-}) {}
-inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
-  return i.unsafeRawValue();
-}) {}
-"
-`;
-
-exports[`GenerateStructs can generate fixture SIMPLE_STRUCT 1`] = `
-"
-
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct SpecSampleFuncReturnTypeDG {
-      bool h() const;
-      double i() const;
-      NSString *j() const;
-
-      SpecSampleFuncReturnTypeDG(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecSampleFuncReturnTypeDG)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecSampleFuncReturnTypeDG:(id)json;
-@end
-
-
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct SpecSampleFuncReturnTypeD {
-      bool e() const;
-      double f() const;
-      JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeDG g() const;
-
-      SpecSampleFuncReturnTypeD(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecSampleFuncReturnTypeD)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecSampleFuncReturnTypeD:(id)json;
-@end
-
-
-namespace JS {
-  namespace NativeSampleTurboModule {
-    struct SpecSampleFuncReturnType {
-      bool a() const;
-      double b() const;
-      NSString *c() const;
-      JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeD d() const;
-      double k() const;
-
-      SpecSampleFuncReturnType(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeSampleTurboModule_SpecSampleFuncReturnType)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecSampleFuncReturnType:(id)json;
-@end
-
-inline bool JS::NativeSampleTurboModule::SpecSampleFuncReturnType::a() const
-{
-  id const p = _v[@\\"a\\"];
-  return RCTBridgingToBool(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecSampleFuncReturnType::b() const
-{
-  id const p = _v[@\\"b\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline NSString *JS::NativeSampleTurboModule::SpecSampleFuncReturnType::c() const
-{
-  id const p = _v[@\\"c\\"];
-  return RCTBridgingToString(p);
-}
-
-
-inline JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeD JS::NativeSampleTurboModule::SpecSampleFuncReturnType::d() const
-{
-  id const p = _v[@\\"d\\"];
-  return JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeD(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecSampleFuncReturnType::k() const
-{
-  id const p = _v[@\\"k\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline bool JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeD::e() const
-{
-  id const p = _v[@\\"e\\"];
-  return RCTBridgingToBool(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeD::f() const
-{
-  id const p = _v[@\\"f\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeDG JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeD::g() const
-{
-  id const p = _v[@\\"g\\"];
-  return JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeDG(p);
-}
-
-
-inline bool JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeDG::h() const
-{
-  id const p = _v[@\\"h\\"];
-  return RCTBridgingToBool(p);
-}
-
-
-inline double JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeDG::i() const
-{
-  id const p = _v[@\\"i\\"];
-  return RCTBridgingToDouble(p);
-}
-
-
-inline NSString *JS::NativeSampleTurboModule::SpecSampleFuncReturnTypeDG::j() const
-{
-  id const p = _v[@\\"j\\"];
-  return RCTBridgingToString(p);
-}
-
-"
-`;

From 1ac1255d63320d547bc967ff72dfdd3e55562e73 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 125/241] E2E snapshot test ObjC++ generator

Summary:
NativeModule specs exist under `react-native-github/packages/react-native-codegen/src/__tests__/modules/fixtures`. `GenerateModuleObjCpp-test.js` runs the RN Codegen on those NativeModule specs, and saves the output inside a snapshot. For convenience, the folowing command runs the legacy codegen on the fixtures:

```
buck build fbsource//xplat/js/react-native-github/packages/react-native-codegen/src/__tests__/modules:RNCodegenModuleFixtures-flow-types-ios --show-output
```

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23637708

fbshipit-source-id: 3319f319515eca42b4499682313fea6e0bdc2a06
---
 .../modules/NativeSampleTurboModule.js        |   18 +-
 .../modules/NativeSampleTurboModuleArrays.js  |   51 +
 .../NativeSampleTurboModuleNullable.js        |   46 +
 ...iveSampleTurboModuleNullableAndOptional.js |   46 +
 .../NativeSampleTurboModuleOptional.js        |   46 +
 .../e2e/__tests__/modules/BUCK                |   11 +
 .../modules/GenerateModuleObjCpp-test.js      |   50 +
 .../GenerateModuleObjCpp-test.js.snap         | 2545 +++++++++++++++++
 8 files changed, 2811 insertions(+), 2 deletions(-)
 create mode 100644 packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js
 create mode 100644 packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js
 create mode 100644 packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js
 create mode 100644 packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js
 create mode 100644 packages/react-native-codegen/e2e/__tests__/modules/BUCK
 create mode 100644 packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
 create mode 100644 packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap

diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js
index ee6c0983afb75f..c950ed9e288972 100644
--- a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModule.js
@@ -10,9 +10,16 @@
 
 'use strict';
 
-import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+import type {
+  RootTag,
+  TurboModule,
+} from 'react-native/Libraries/TurboModule/RCTExport';
 import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
+type Animal = {|
+  name: string,
+|};
+
 export interface Spec extends TurboModule {
   // Exported methods.
   +getConstants: () => {|
@@ -26,7 +33,14 @@ export interface Spec extends TurboModule {
   +getString: (arg: string) => string;
   +getArray: (arg: Array<any>) => Array<any>;
   +getObject: (arg: Object) => Object;
-  +getValue: (x: number, y: string, z: Object) => Object;
+  +getObjectShape: (arg: {|prop: number|}) => {|prop: number|};
+  +getAlias: (arg: Animal) => Animal;
+  +getRootTag: (arg: RootTag) => RootTag;
+  +getValue: (
+    x: number,
+    getValuegetValuegetValuegetValuegetValuey: string,
+    z: Object,
+  ) => Object;
   +getValueWithCallback: (callback: (value: string) => void) => void;
   +getValueWithPromise: (error: boolean) => Promise<string>;
 }
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js
new file mode 100644
index 00000000000000..fce6f7c0f0fb6a
--- /dev/null
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleArrays.js
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import type {
+  RootTag,
+  TurboModule,
+} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+type Animal = {|
+  name: string,
+|};
+
+export interface Spec extends TurboModule {
+  // Exported methods.
+  +getConstants: () => {|
+    const1: Array<boolean>,
+    const2: Array<number>,
+    const3: Array<string>,
+    id?: Array<?{|prop: number|}>,
+  |};
+  +voidFunc: () => void;
+  +getBool: (id: Array<boolean>) => Array<boolean>;
+  +getNumber: (arg: Array<number>) => Array<number>;
+  +getString: (arg: Array<string>) => Array<string>;
+  +getArray: (arg: Array<Array<any>>) => Array<Array<any>>;
+  +getObject: (arg: Array<Object>) => Array<Object>;
+  +getObjectShape: (arg: Array<{|prop: number|}>) => Array<{|prop: number|}>;
+  +getAlias: (arg: Array<Animal>) => Array<Animal>;
+  +getRootTag: (arg: Array<RootTag>) => Array<RootTag>;
+  +getValue: (
+    x: Array<number>,
+    y: Array<string>,
+    z: Array<Object>,
+  ) => Array<Object>;
+  +getValueWithCallback: (callback: (value: Array<string>) => void) => void;
+  +getValueWithPromise: (error: Array<boolean>) => Promise<Array<string>>;
+}
+
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'SampleTurboModuleArrays',
+): Spec);
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js
new file mode 100644
index 00000000000000..ac7b57e386a2d0
--- /dev/null
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullable.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import type {
+  RootTag,
+  TurboModule,
+} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+type Animal = ?{|
+  name: ?string,
+|};
+
+export interface Spec extends TurboModule {
+  // Exported methods.
+  +getConstants: () => {|
+    const1: ?boolean,
+    const2: ?number,
+    const3: ?string,
+  |};
+  +voidFunc: () => void;
+  +getBool: (arg: ?boolean) => ?boolean;
+  +getNumber: (arg: ?number) => ?number;
+  +getString: (arg: ?string) => ?string;
+  +getArray: (arg: ?Array<any>) => ?Array<any>;
+  +getObject: (arg: ?Object) => ?Object;
+  +getObjectShape: (arg: ?{|prop: ?number|}) => ?{|prop: ?number|};
+  +getAlias: (arg: ?Animal) => ?Animal;
+  +getRootTag: (arg: ?RootTag) => ?RootTag;
+  +getValue: (x: ?number, y: ?string, z: ?Object) => ?Object;
+  +getValueWithCallback: (callback: (value: ?string) => void) => void;
+  +getValueWithPromise: (error: ?boolean) => ?Promise<string>;
+}
+
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'SampleTurboModuleNullable',
+): Spec);
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js
new file mode 100644
index 00000000000000..29e54d8a5c3693
--- /dev/null
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleNullableAndOptional.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import type {
+  RootTag,
+  TurboModule,
+} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+type Animal = ?{|
+  name?: ?string,
+|};
+
+export interface Spec extends TurboModule {
+  // Exported methods.
+  +getConstants?: () => {|
+    const1?: ?boolean,
+    const2?: ?number,
+    const3?: ?string,
+  |};
+  +voidFunc?: () => void;
+  +getBool?: (arg?: ?boolean) => ?boolean;
+  +getNumber?: (arg?: ?number) => ?number;
+  +getString?: (arg?: ?string) => ?string;
+  +getArray?: (arg?: ?Array<any>) => ?Array<any>;
+  +getObject?: (arg?: ?Object) => ?Object;
+  +getObjectShape?: (arg?: {|prop?: ?number|}) => {|prop?: ?number|};
+  +getAlias?: (arg?: ?Animal) => ?Animal;
+  +getRootTag?: (arg?: ?RootTag) => ?RootTag;
+  +getValue?: (x?: ?number, y?: ?string, z?: ?Object) => ?Object;
+  +getValueWithCallback?: (callback?: ?(value?: ?string) => void) => void;
+  +getValueWithPromise?: (error?: ?boolean) => ?Promise<string>;
+}
+
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'SampleTurboModuleNullableAndOptional',
+): Spec);
diff --git a/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js
new file mode 100644
index 00000000000000..9f12225a2d883b
--- /dev/null
+++ b/packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeSampleTurboModuleOptional.js
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow
+ * @format
+ */
+
+'use strict';
+
+import type {
+  RootTag,
+  TurboModule,
+} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+type Animal = {|
+  name?: string,
+|};
+
+export interface Spec extends TurboModule {
+  // Exported methods.
+  +getConstants?: () => {|
+    const1?: boolean,
+    const2?: number,
+    const3?: string,
+  |};
+  +voidFunc?: () => void;
+  +getBool?: (arg?: boolean) => boolean;
+  +getNumber?: (arg?: number) => number;
+  +getString?: (arg?: string) => string;
+  +getArray?: (arg?: Array<any>) => Array<any>;
+  +getObject?: (arg?: Object) => Object;
+  +getObjectShape?: (arg?: {|prop?: number|}) => {|prop?: number|};
+  +getAlias?: (arg?: Animal) => Animal;
+  +getRootTag?: (arg?: RootTag) => RootTag;
+  +getValue?: (x?: number, y?: string, z?: Object) => Object;
+  +getValueWithCallback?: (callback?: (value?: string) => void) => void;
+  +getValueWithPromise?: (error?: boolean) => Promise<string>;
+}
+
+export default (TurboModuleRegistry.getEnforcing<Spec>(
+  'SampleTurboModuleOptional',
+): Spec);
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/BUCK b/packages/react-native-codegen/e2e/__tests__/modules/BUCK
new file mode 100644
index 00000000000000..29df252313e6ea
--- /dev/null
+++ b/packages/react-native-codegen/e2e/__tests__/modules/BUCK
@@ -0,0 +1,11 @@
+load("@fbsource//xplat/js/RKJSModules/Libraries/NativeModules:defs.bzl", "react_native_module_flow_types_library")
+
+react_native_module_flow_types_library(
+    name = "RNCodegenModuleFixtures",
+    android_package_name = "com.facebook.fbreact.specs",
+    js_srcs = glob(
+        [
+            "../../__test_fixtures__/modules/*.js",
+        ],
+    ),
+)
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js b/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
new file mode 100644
index 00000000000000..2b2deec0b0fe33
--- /dev/null
+++ b/packages/react-native-codegen/e2e/__tests__/modules/GenerateModuleObjCpp-test.js
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @emails oncall+react_native
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+const parser = require('../../../src/parsers/flow');
+const generator = require('../../../src/generators/modules/GenerateModuleObjCpp');
+const fs = require('fs');
+
+import type {SchemaType} from '../../../src/CodegenSchema';
+
+const FIXTURE_DIR = `${__dirname}/../../__test_fixtures__/modules`;
+
+function getModules(): SchemaType {
+  const filenames: Array<string> = fs.readdirSync(FIXTURE_DIR);
+  return filenames.reduce<SchemaType>(
+    (accumulator, file) => {
+      const schema = parser.parseFile(`${FIXTURE_DIR}/${file}`);
+      return {
+        modules: {
+          ...accumulator.modules,
+          ...schema.modules,
+        },
+      };
+    },
+    {modules: {}},
+  );
+}
+
+describe('GenerateModuleObjCpp', () => {
+  it('can generate a header file NativeModule specs', () => {
+    const libName = 'RNCodegenModuleFixtures';
+    const output = generator.generate(libName, getModules(), libName);
+    expect(output.get(libName + '.h')).toMatchSnapshot();
+  });
+
+  it('can generate an implementation file NativeModule specs', () => {
+    const libName = 'RNCodegenModuleFixtures';
+    const output = generator.generate(libName, getModules(), libName);
+    expect(output.get(libName + '-generated.mm')).toMatchSnapshot();
+  });
+});
diff --git a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
new file mode 100644
index 00000000000000..73bfce8a865d1b
--- /dev/null
+++ b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
@@ -0,0 +1,2545 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`GenerateModuleObjCpp can generate a header file NativeModule specs 1`] = `
+"
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by codegen project: GenerateModuleHObjCpp.js
+ */
+
+#ifndef __cplusplus
+#error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
+#endif
+
+#import <vector>
+
+#import <Foundation/Foundation.h>
+
+#import <folly/Optional.h>
+
+#import <RCTRequired/RCTRequired.h>
+#import <RCTTypeSafety/RCTConvertHelpers.h>
+#import <RCTTypeSafety/RCTTypedModuleConstants.h>
+
+#import <React/RCTBridgeModule.h>
+#import <React/RCTCxxConvert.h>
+#import <React/RCTManagedPointer.h>
+
+#import <ReactCommon/RCTTurboModule.h>
+
+
+
+@protocol NativeArrayTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSArray<NSString *> *)getArray:(NSArray *)a;
+- (NSArray<NSString *> *)getReadOnlyArray:(NSArray *)a;
+- (NSArray<NSString *> *)getArrayWithAlias:(NSArray *)a
+                                         b:(NSArray *)b;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'ArrayTurboModule'
+     */
+    class JSI_EXPORT NativeArrayTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeArrayTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+@protocol NativeBooleanTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSNumber *)getBoolean:(BOOL)arg;
+- (NSNumber *)getBooleanWithAlias:(BOOL)arg;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'BooleanTurboModule'
+     */
+    class JSI_EXPORT NativeBooleanTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeBooleanTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+@protocol NativeCallbackTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithCallbackWithAlias:(RCTResponseSenderBlock)c;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'CallbackTurboModule'
+     */
+    class JSI_EXPORT NativeCallbackTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeCallbackTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+@protocol NativeNullableTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSNumber * _Nullable)getBool:(NSNumber *)a;
+- (NSNumber * _Nullable)getNumber:(NSNumber *)a;
+- (NSString * _Nullable)getString:(NSNumber *)a;
+- (NSArray<id<NSObject>> * _Nullable)getArray:(NSArray * _Nullable)a;
+- (NSDictionary * _Nullable)getObject:(NSDictionary * _Nullable)a;
+- (void)getValueWithPromise:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NullableTurboModule'
+     */
+    class JSI_EXPORT NativeNullableTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeNullableTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+@protocol NativeNumberTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSNumber *)getNumber:(double)arg;
+- (NSNumber *)getNumberWithAlias:(double)arg;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'NumberTurboModule'
+     */
+    class JSI_EXPORT NativeNumberTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeNumberTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct SpecDifficultObjectAE {
+      bool D() const;
+      double E() const;
+      NSString *F() const;
+
+      SpecDifficultObjectAE(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectAE)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectAE:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct SpecDifficultObjectA {
+      bool D() const;
+      JS::NativeObjectTurboModule::SpecDifficultObjectAE E() const;
+      NSString *F() const;
+
+      SpecDifficultObjectA(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectA)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectA:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct ConstantsEEE {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<double> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEEE */
+        Builder(ConstantsEEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct ConstantsEE {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<JS::NativeObjectTurboModule::ConstantsEEE::Builder> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEE */
+        Builder(ConstantsEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct ConstantsE {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<JS::NativeObjectTurboModule::ConstantsEE::Builder> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsE */
+        Builder(ConstantsE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+
+namespace JS {
+  namespace NativeObjectTurboModule {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> D;
+          RCTRequired<JS::NativeObjectTurboModule::ConstantsE::Builder> E;
+          RCTRequired<NSString *> F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeObjectTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSDictionary *)getGenericObject:(NSDictionary *)arg;
+- (NSDictionary *)getGenericObjectReadOnly:(NSDictionary *)arg;
+- (NSDictionary *)getGenericObjectWithAlias:(NSDictionary *)arg;
+- (NSDictionary *)difficultObject:(JS::NativeObjectTurboModule::SpecDifficultObjectA &)A;
+- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeObjectTurboModule::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'ObjectTurboModule'
+     */
+    class JSI_EXPORT NativeObjectTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct ConstantsEEE {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          folly::Optional<double> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEEE */
+        Builder(ConstantsEEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct ConstantsEE {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          folly::Optional<JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsEE */
+        Builder(ConstantsEE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsEE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsEE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct ConstantsE {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          folly::Optional<JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsE */
+        Builder(ConstantsE i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsE fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsE(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+
+namespace JS {
+  namespace NativeOptionalObjectTurboModule {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> D;
+          id<NSObject> _Nullable  A;
+          folly::Optional<JS::NativeOptionalObjectTurboModule::ConstantsE::Builder> E;
+          NSString *F;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeOptionalObjectTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeOptionalObjectTurboModule::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'OptionalObjectTurboModule'
+     */
+    class JSI_EXPORT NativeOptionalObjectTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeOptionalObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+@protocol NativePromiseTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)getValueWithPromise:(BOOL)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (void)getValueWithPromiseWithAlias:(NSString *)arg
+                             resolve:(RCTPromiseResolveBlock)resolve
+                              reject:(RCTPromiseRejectBlock)reject;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'PromiseTurboModule'
+     */
+    class JSI_EXPORT NativePromiseTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativePromiseTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace JS {
+  namespace NativeSampleTurboModule {
+    struct SpecGetObjectShapeArg {
+      double prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModule_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetObjectShapeArg:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModule {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModule_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_Animal:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModule {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<bool> const1;
+          RCTRequired<double> const2;
+          RCTRequired<NSString *> const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber *)getBool:(BOOL)arg;
+- (NSNumber *)getNumber:(double)arg;
+- (NSString *)getString:(NSString *)arg;
+- (NSArray<id<NSObject>> *)getArray:(NSArray *)arg;
+- (NSDictionary *)getObject:(NSDictionary *)arg;
+- (NSDictionary *)getObjectShape:(JS::NativeSampleTurboModule::SpecGetObjectShapeArg &)arg;
+- (NSDictionary *)getAlias:(JS::NativeSampleTurboModule::Animal &)arg;
+- (NSNumber *)getRootTag:(double)arg;
+- (NSDictionary *)getValue:(double)x
+getValuegetValuegetValuegetValuegetValuey:(NSString *)getValuegetValuegetValuegetValuegetValuey
+                         z:(NSDictionary *)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(BOOL)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModule::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'SampleTurboModule'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleArrays {
+    struct ConstantsIdElement {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<double> prop;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing ConstantsIdElement */
+        Builder(ConstantsIdElement i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static ConstantsIdElement fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      ConstantsIdElement(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+
+namespace JS {
+  namespace NativeSampleTurboModuleArrays {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<std::vector<bool>> const1;
+          RCTRequired<std::vector<double>> const2;
+          RCTRequired<std::vector<NSString *>> const3;
+          folly::Optional<std::vector<folly::Optional<JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder>>> id_;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleArraysSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSArray<NSNumber *> *)getBool:(NSArray *)id;
+- (NSArray<NSNumber *> *)getNumber:(NSArray *)arg;
+- (NSArray<NSString *> *)getString:(NSArray *)arg;
+- (NSArray<NSArray<id<NSObject>> *> *)getArray:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getObject:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getObjectShape:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getAlias:(NSArray *)arg;
+- (NSArray<NSNumber *> *)getRootTag:(NSArray *)arg;
+- (NSArray<NSDictionary *> *)getValue:(NSArray *)x
+                                    y:(NSArray *)y
+                                    z:(NSArray *)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSArray *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleArrays::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'SampleTurboModuleArrays'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleArraysSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleArraysSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleNullable {
+    struct SpecGetObjectShapeArg {
+      folly::Optional<double> prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullable_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_SpecGetObjectShapeArg:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleNullable {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullable_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_Animal:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleNullable {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          RCTRequired<folly::Optional<bool>> const1;
+          RCTRequired<folly::Optional<double>> const2;
+          RCTRequired<NSString *> const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleNullableSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber * _Nullable)getBool:(NSNumber *)arg;
+- (NSNumber * _Nullable)getNumber:(NSNumber *)arg;
+- (NSString * _Nullable)getString:(NSString * _Nullable)arg;
+- (NSArray<id<NSObject>> * _Nullable)getArray:(NSArray * _Nullable)arg;
+- (NSDictionary * _Nullable)getObject:(NSDictionary * _Nullable)arg;
+- (NSDictionary * _Nullable)getObjectShape:(JS::NativeSampleTurboModuleNullable::SpecGetObjectShapeArg &)arg;
+- (NSDictionary * _Nullable)getAlias:(JS::NativeSampleTurboModuleNullable::Animal &)arg;
+- (NSNumber * _Nullable)getRootTag:(NSNumber *)arg;
+- (NSDictionary * _Nullable)getValue:(NSNumber *)x
+                                   y:(NSString * _Nullable)y
+                                   z:(NSDictionary * _Nullable)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSNumber *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullable::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'SampleTurboModuleNullable'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleNullableSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleNullableSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleNullableAndOptional {
+    struct SpecGetObjectShapeArg {
+      folly::Optional<double> prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleNullableAndOptional {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_Animal:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleNullableAndOptional {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> const1;
+          folly::Optional<double> const2;
+          NSString *const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleNullableAndOptionalSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber * _Nullable)getBool:(NSNumber *)arg;
+- (NSNumber * _Nullable)getNumber:(NSNumber *)arg;
+- (NSString * _Nullable)getString:(NSString * _Nullable)arg;
+- (NSArray<id<NSObject>> * _Nullable)getArray:(NSArray * _Nullable)arg;
+- (NSDictionary * _Nullable)getObject:(NSDictionary * _Nullable)arg;
+- (NSDictionary *)getObjectShape:(JS::NativeSampleTurboModuleNullableAndOptional::SpecGetObjectShapeArg &)arg;
+- (NSDictionary * _Nullable)getAlias:(JS::NativeSampleTurboModuleNullableAndOptional::Animal &)arg;
+- (NSNumber * _Nullable)getRootTag:(NSNumber *)arg;
+- (NSDictionary * _Nullable)getValue:(NSNumber *)x
+                                   y:(NSString * _Nullable)y
+                                   z:(NSDictionary * _Nullable)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSNumber *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'SampleTurboModuleNullableAndOptional'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleNullableAndOptionalSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleNullableAndOptionalSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleOptional {
+    struct SpecGetObjectShapeArg {
+      folly::Optional<double> prop() const;
+
+      SpecGetObjectShapeArg(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleOptional_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_SpecGetObjectShapeArg:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleOptional {
+    struct Animal {
+      NSString *name() const;
+
+      Animal(NSDictionary *const v) : _v(v) {}
+    private:
+      NSDictionary *_v;
+    };
+  }
+}
+
+@interface RCTCxxConvert (NativeSampleTurboModuleOptional_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_Animal:(id)json;
+@end
+
+
+namespace JS {
+  namespace NativeSampleTurboModuleOptional {
+    struct Constants {
+
+      struct Builder {
+        struct Input {
+          folly::Optional<bool> const1;
+          folly::Optional<double> const2;
+          NSString *const3;
+        };
+
+        /** Initialize with a set of values */
+        Builder(const Input i);
+        /** Initialize with an existing Constants */
+        Builder(Constants i);
+        /** Builds the object. Generally used only by the infrastructure. */
+        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
+      private:
+        NSDictionary *(^_factory)(void);
+      };
+
+      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
+      NSDictionary *unsafeRawValue() const { return _v; }
+    private:
+      Constants(NSDictionary *const v) : _v(v) {}
+      NSDictionary *_v;
+    };
+  }
+}
+@protocol NativeSampleTurboModuleOptionalSpec <RCTBridgeModule, RCTTurboModule>
+
+- (void)voidFunc;
+- (NSNumber *)getBool:(NSNumber *)arg;
+- (NSNumber *)getNumber:(NSNumber *)arg;
+- (NSString *)getString:(NSString *)arg;
+- (NSArray<id<NSObject>> *)getArray:(NSArray *)arg;
+- (NSDictionary *)getObject:(NSDictionary *)arg;
+- (NSDictionary *)getObjectShape:(JS::NativeSampleTurboModuleOptional::SpecGetObjectShapeArg &)arg;
+- (NSDictionary *)getAlias:(JS::NativeSampleTurboModuleOptional::Animal &)arg;
+- (NSNumber *)getRootTag:(NSNumber *)arg;
+- (NSDictionary *)getValue:(NSNumber *)x
+                         y:(NSString *)y
+                         z:(NSDictionary *)z;
+- (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
+- (void)getValueWithPromise:(NSNumber *)error
+                    resolve:(RCTPromiseResolveBlock)resolve
+                     reject:(RCTPromiseRejectBlock)reject;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)constantsToExport;
+- (facebook::react::ModuleConstants<JS::NativeSampleTurboModuleOptional::Constants::Builder>)getConstants;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'SampleTurboModuleOptional'
+     */
+    class JSI_EXPORT NativeSampleTurboModuleOptionalSpecJSI : public ObjCTurboModule {
+    public:
+      NativeSampleTurboModuleOptionalSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+@protocol NativeStringTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
+
+- (NSString *)getString:(NSString *)arg;
+- (NSString *)getStringWithAlias:(NSString *)arg;
+
+@end
+namespace facebook {
+  namespace react {
+    /**
+     * ObjC++ class for module 'StringTurboModule'
+     */
+    class JSI_EXPORT NativeStringTurboModuleSpecJSI : public ObjCTurboModule {
+    public:
+      NativeStringTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
+    };
+  } // namespace react
+} // namespace facebook
+
+
+
+
+
+
+
+
+inline bool JS::NativeObjectTurboModule::SpecDifficultObjectAE::D() const
+{
+  id const p = _v[@\\"D\\"];
+  return RCTBridgingToBool(p);
+}
+
+
+inline double JS::NativeObjectTurboModule::SpecDifficultObjectAE::E() const
+{
+  id const p = _v[@\\"E\\"];
+  return RCTBridgingToDouble(p);
+}
+
+
+inline NSString *JS::NativeObjectTurboModule::SpecDifficultObjectAE::F() const
+{
+  id const p = _v[@\\"F\\"];
+  return RCTBridgingToString(p);
+}
+
+
+inline bool JS::NativeObjectTurboModule::SpecDifficultObjectA::D() const
+{
+  id const p = _v[@\\"D\\"];
+  return RCTBridgingToBool(p);
+}
+
+
+inline JS::NativeObjectTurboModule::SpecDifficultObjectAE JS::NativeObjectTurboModule::SpecDifficultObjectA::E() const
+{
+  id const p = _v[@\\"E\\"];
+  return JS::NativeObjectTurboModule::SpecDifficultObjectAE(p);
+}
+
+
+inline NSString *JS::NativeObjectTurboModule::SpecDifficultObjectA::F() const
+{
+  id const p = _v[@\\"F\\"];
+  return RCTBridgingToString(p);
+}
+
+
+inline JS::NativeObjectTurboModule::ConstantsEEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = @(E);
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsEEE::Builder::Builder(ConstantsEEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeObjectTurboModule::ConstantsEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = E.buildUnsafeRawValue();
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsEE::Builder::Builder(ConstantsEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeObjectTurboModule::ConstantsE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = E.buildUnsafeRawValue();
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::ConstantsE::Builder::Builder(ConstantsE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeObjectTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D.get();
+  d[@\\"D\\"] = @(D);
+  auto E = i.E.get();
+  d[@\\"E\\"] = E.buildUnsafeRawValue();
+  auto F = i.F.get();
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeObjectTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? @((double)E.value()) : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder::Builder(ConstantsEEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? E.value().buildUnsafeRawValue() : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder::Builder(ConstantsEE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeOptionalObjectTurboModule::ConstantsE::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? E.value().buildUnsafeRawValue() : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::ConstantsE::Builder::Builder(ConstantsE i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeOptionalObjectTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto D = i.D;
+  d[@\\"D\\"] = D.hasValue() ? @((BOOL)D.value()) : nil;
+  auto A = i.A;
+  d[@\\"A\\"] = A;
+  auto E = i.E;
+  d[@\\"E\\"] = E.hasValue() ? E.value().buildUnsafeRawValue() : nil;
+  auto F = i.F;
+  d[@\\"F\\"] = F;
+  return d;
+}) {}
+inline JS::NativeOptionalObjectTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+
+inline double JS::NativeSampleTurboModule::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToDouble(p);
+}
+
+
+inline NSString *JS::NativeSampleTurboModule::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToString(p);
+}
+
+
+inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1.get();
+  d[@\\"const1\\"] = @(const1);
+  auto const2 = i.const2.get();
+  d[@\\"const2\\"] = @(const2);
+  auto const3 = i.const3.get();
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto prop = i.prop.get();
+  d[@\\"prop\\"] = @(prop);
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder::Builder(ConstantsIdElement i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1.get();
+  d[@\\"const1\\"] = RCTConvertVecToArray(const1, ^id(bool el_) { return @(el_); });
+  auto const2 = i.const2.get();
+  d[@\\"const2\\"] = RCTConvertVecToArray(const2, ^id(double el_) { return @(el_); });
+  auto const3 = i.const3.get();
+  d[@\\"const3\\"] = RCTConvertVecToArray(const3, ^id(NSString * el_) { return el_; });
+  auto id_ = i.id_;
+  d[@\\"id_\\"] = RCTConvertOptionalVecToArray(id_, ^id(folly::Optional<JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder> el_) { return el_.hasValue() ? el_.value().buildUnsafeRawValue() : nil; });
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline folly::Optional<double> JS::NativeSampleTurboModuleNullable::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToOptionalDouble(p);
+}
+
+
+inline NSString *JS::NativeSampleTurboModuleNullable::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToOptionalString(p);
+}
+
+
+inline JS::NativeSampleTurboModuleNullable::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1.get();
+  d[@\\"const1\\"] = const1.hasValue() ? @((BOOL)const1.value()) : nil;
+  auto const2 = i.const2.get();
+  d[@\\"const2\\"] = const2.hasValue() ? @((double)const2.value()) : nil;
+  auto const3 = i.const3.get();
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleNullable::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline folly::Optional<double> JS::NativeSampleTurboModuleNullableAndOptional::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToOptionalDouble(p);
+}
+
+
+inline NSString *JS::NativeSampleTurboModuleNullableAndOptional::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToOptionalString(p);
+}
+
+
+inline JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1;
+  d[@\\"const1\\"] = const1.hasValue() ? @((BOOL)const1.value()) : nil;
+  auto const2 = i.const2;
+  d[@\\"const2\\"] = const2.hasValue() ? @((double)const2.value()) : nil;
+  auto const3 = i.const3;
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+inline folly::Optional<double> JS::NativeSampleTurboModuleOptional::SpecGetObjectShapeArg::prop() const
+{
+  id const p = _v[@\\"prop\\"];
+  return RCTBridgingToOptionalDouble(p);
+}
+
+
+inline NSString *JS::NativeSampleTurboModuleOptional::Animal::name() const
+{
+  id const p = _v[@\\"name\\"];
+  return RCTBridgingToOptionalString(p);
+}
+
+
+inline JS::NativeSampleTurboModuleOptional::Constants::Builder::Builder(const Input i) : _factory(^{
+  NSMutableDictionary *d = [NSMutableDictionary new];
+  auto const1 = i.const1;
+  d[@\\"const1\\"] = const1.hasValue() ? @((BOOL)const1.value()) : nil;
+  auto const2 = i.const2;
+  d[@\\"const2\\"] = const2.hasValue() ? @((double)const2.value()) : nil;
+  auto const3 = i.const3;
+  d[@\\"const3\\"] = const3;
+  return d;
+}) {}
+inline JS::NativeSampleTurboModuleOptional::Constants::Builder::Builder(Constants i) : _factory(^{
+  return i.unsafeRawValue();
+}) {}
+
+"
+`;
+
+exports[`GenerateModuleObjCpp can generate an implementation file NativeModule specs 1`] = `
+"
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @generated by an internal genrule from Flow types.
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
+ */
+
+#import \\"RNCodegenModuleFixtures.h\\"
+
+
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI::getReadOnlyArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getReadOnlyArray\\", @selector(getReadOnlyArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI::getArrayWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArrayWithAlias\\", @selector(getArrayWithAlias:b:), args, count);
+    }
+
+
+    NativeArrayTurboModuleSpecJSI::NativeArrayTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeArrayTurboModuleSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getReadOnlyArray\\"] = MethodMetadata {1, __hostFunction_NativeArrayTurboModuleSpecJSI_getReadOnlyArray};
+        
+
+        
+        methodMap_[\\"getArrayWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeArrayTurboModuleSpecJSI_getArrayWithAlias};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI::getBoolean(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBoolean\\", @selector(getBoolean:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI::getBooleanWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBooleanWithAlias\\", @selector(getBooleanWithAlias:), args, count);
+    }
+
+
+    NativeBooleanTurboModuleSpecJSI::NativeBooleanTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getBoolean\\"] = MethodMetadata {1, __hostFunction_NativeBooleanTurboModuleSpecJSI_getBoolean};
+        
+
+        
+        methodMap_[\\"getBooleanWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeBooleanTurboModuleSpecJSI_getBooleanWithAlias};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeCallbackTurboModuleSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeCallbackTurboModuleSpecJSI::getValueWithCallbackWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallbackWithAlias\\", @selector(getValueWithCallbackWithAlias:), args, count);
+    }
+
+
+    NativeCallbackTurboModuleSpecJSI::NativeCallbackTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallback};
+        
+
+        
+        methodMap_[\\"getValueWithCallbackWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallbackWithAlias};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:reject:), args, count);
+    }
+
+
+    NativeNullableTurboModuleSpecJSI::NativeNullableTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getBool};
+        
+
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getObject};
+        
+
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getValueWithPromise};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeNumberTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeNumberTurboModuleSpecJSI::getNumberWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumberWithAlias\\", @selector(getNumberWithAlias:), args, count);
+    }
+
+
+    NativeNumberTurboModuleSpecJSI::NativeNumberTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeNumberTurboModuleSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getNumberWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeNumberTurboModuleSpecJSI_getNumberWithAlias};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectAE)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectAE:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeObjectTurboModule::SpecDifficultObjectAE>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectA)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectA:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeObjectTurboModule::SpecDifficultObjectA>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeObjectTurboModule_ConstantsEEE)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_ConstantsEEE:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeObjectTurboModule::ConstantsEEE>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeObjectTurboModule_ConstantsEE)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_ConstantsEE:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeObjectTurboModule::ConstantsEE>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeObjectTurboModule_ConstantsE)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_ConstantsE:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeObjectTurboModule::ConstantsE>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeObjectTurboModule_Constants)
++ (RCTManagedPointer *)JS_NativeObjectTurboModule_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeObjectTurboModule::Constants>(json);
+}
+@end
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getGenericObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObject\\", @selector(getGenericObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getGenericObjectReadOnly(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObjectReadOnly\\", @selector(getGenericObjectReadOnly:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getGenericObjectWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObjectWithAlias\\", @selector(getGenericObjectWithAlias:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::difficultObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"difficultObject\\", @selector(difficultObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    NativeObjectTurboModuleSpecJSI::NativeObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getGenericObject\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObject};
+        
+
+        
+        methodMap_[\\"getGenericObjectReadOnly\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectReadOnly};
+        
+
+        
+        methodMap_[\\"getGenericObjectWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectWithAlias};
+        
+
+        
+        methodMap_[\\"difficultObject\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_difficultObject};
+        setMethodArgConversionSelector(@\\"difficultObject\\", 0, @\\"JS_NativeObjectTurboModule_SpecDifficultObjectA:\\");
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_ConstantsEEE)
++ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_ConstantsEEE:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::ConstantsEEE>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_ConstantsEE)
++ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_ConstantsEE:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::ConstantsEE>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_ConstantsE)
++ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_ConstantsE:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::ConstantsE>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_Constants)
++ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::Constants>(json);
+}
+@end
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeOptionalObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeOptionalObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    NativeOptionalObjectTurboModuleSpecJSI::NativeOptionalObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativePromiseTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativePromiseTurboModuleSpecJSI::getValueWithPromiseWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromiseWithAlias\\", @selector(getValueWithPromiseWithAlias:resolve:reject:), args, count);
+    }
+
+
+    NativePromiseTurboModuleSpecJSI::NativePromiseTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromise};
+        
+
+        
+        methodMap_[\\"getValueWithPromiseWithAlias\\"] = MethodMetadata {1, __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromiseWithAlias};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModule_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetObjectShapeArg:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecGetObjectShapeArg>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModule_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_Animal:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::Animal>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModule_Constants)
++ (RCTManagedPointer *)JS_NativeSampleTurboModule_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModule::Constants>(json);
+}
+@end
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:getValuegetValuegetValuegetValuegetValuey:z:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        
+
+        
+        methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
+        
+
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
+        
+
+        
+        methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectShape};
+        setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetObjectShapeArg:\\");
+
+        
+        methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getAlias};
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetAliasArg:\\");
+
+        
+        methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
+        
+
+        
+        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
+        
+
+        
+        methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
+        
+
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleArrays_ConstantsIdElement)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleArrays_ConstantsIdElement:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleArrays::ConstantsIdElement>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleArrays_Constants)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleArrays_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleArrays::Constants>(json);
+}
+@end
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getBool\\", @selector(getBool:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getNumber\\", @selector(getNumber:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getString\\", @selector(getString:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getObject\\", @selector(getObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getAlias\\", @selector(getAlias:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    NativeSampleTurboModuleArraysSpecJSI::NativeSampleTurboModuleArraysSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_voidFunc};
+        
+
+        
+        methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getBool};
+        
+
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObject};
+        
+
+        
+        methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObjectShape};
+        
+
+        
+        methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getAlias};
+        
+
+        
+        methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getRootTag};
+        
+
+        
+        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValue};
+        
+
+        
+        methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithCallback};
+        
+
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithPromise};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleNullable_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_SpecGetObjectShapeArg:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullable::SpecGetObjectShapeArg>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleNullable_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_Animal:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullable::Animal>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleNullable_Constants)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullable::Constants>(json);
+}
+@end
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    NativeSampleTurboModuleNullableSpecJSI::NativeSampleTurboModuleNullableSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_voidFunc};
+        
+
+        
+        methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getBool};
+        
+
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObject};
+        
+
+        
+        methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObjectShape};
+        setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModuleNullable_SpecGetObjectShapeArg:\\");
+
+        
+        methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getAlias};
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullable_SpecGetAliasArg:\\");
+
+        
+        methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getRootTag};
+        
+
+        
+        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValue};
+        
+
+        
+        methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithCallback};
+        
+
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithPromise};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullableAndOptional::SpecGetObjectShapeArg>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_Animal:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullableAndOptional::Animal>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_Constants)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullableAndOptional::Constants>(json);
+}
+@end
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    NativeSampleTurboModuleNullableAndOptionalSpecJSI::NativeSampleTurboModuleNullableAndOptionalSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_voidFunc};
+        
+
+        
+        methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getBool};
+        
+
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObject};
+        
+
+        
+        methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObjectShape};
+        setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg:\\");
+
+        
+        methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getAlias};
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullableAndOptional_SpecGetAliasArg:\\");
+
+        
+        methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getRootTag};
+        
+
+        
+        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValue};
+        
+
+        
+        methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithCallback};
+        
+
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithPromise};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleOptional_SpecGetObjectShapeArg)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_SpecGetObjectShapeArg:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleOptional::SpecGetObjectShapeArg>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleOptional_Animal)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_Animal:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleOptional::Animal>(json);
+}
+@end
+
+
+@implementation RCTCxxConvert (NativeSampleTurboModuleOptional_Constants)
++ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_Constants:(id)json
+{
+  return facebook::react::managedPointer<JS::NativeSampleTurboModuleOptional::Constants>(json);
+}
+@end
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    }
+
+
+    NativeSampleTurboModuleOptionalSpecJSI::NativeSampleTurboModuleOptionalSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_voidFunc};
+        
+
+        
+        methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getBool};
+        
+
+        
+        methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getNumber};
+        
+
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getArray};
+        
+
+        
+        methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObject};
+        
+
+        
+        methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObjectShape};
+        setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModuleOptional_SpecGetObjectShapeArg:\\");
+
+        
+        methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getAlias};
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleOptional_SpecGetAliasArg:\\");
+
+        
+        methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getRootTag};
+        
+
+        
+        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValue};
+        
+
+        
+        methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithCallback};
+        
+
+        
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithPromise};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants};
+        
+
+        
+        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+
+
+namespace facebook {
+  namespace react {
+    
+    static facebook::jsi::Value __hostFunction_NativeStringTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
+    }
+
+
+    static facebook::jsi::Value __hostFunction_NativeStringTurboModuleSpecJSI::getStringWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getStringWithAlias\\", @selector(getStringWithAlias:), args, count);
+    }
+
+
+    NativeStringTurboModuleSpecJSI::NativeStringTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
+      : ObjCTurboModule(params) {
+        
+        methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeStringTurboModuleSpecJSI_getString};
+        
+
+        
+        methodMap_[\\"getStringWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeStringTurboModuleSpecJSI_getStringWithAlias};
+        
+
+        }
+    }
+  } // namespace react
+} // namespace facebook
+
+"
+`;

From c0408b56fc045cd142c49e635d79e7d39e6ba653 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 126/241] Fix GenerateModuleCpp

Summary:
Just updating this generator to understand the new RN Codegen Module parser flow types.

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23667254

fbshipit-source-id: 558dd7ac5b4541edf40248b8ab8bb50d31fa8624
---
 .../generators/modules/GenerateModuleCpp.js   | 60 +++++++++++--------
 1 file changed, 34 insertions(+), 26 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
index cf02b4095b1c92..deb38646197c44 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
@@ -10,8 +10,15 @@
 
 'use strict';
 
-import type {SchemaType} from '../../CodegenSchema';
-const {getTypeAliasTypeAnnotation} = require('./Utils');
+import type {
+  SchemaType,
+  NativeModulePropertySchema,
+  NativeModuleMethodParamSchema,
+} from '../../CodegenSchema';
+
+import type {AliasResolver} from './Utils';
+const {createAliasResolver, getModules} = require('./Utils');
+
 type FilesOutput = Map<string, string>;
 
 const propertyHeaderTemplate =
@@ -44,7 +51,7 @@ Native::_MODULE_NAME_::CxxSpecJSI::Native::_MODULE_NAME_::CxxSpecJSI(std::shared
 
 const template = `
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -64,16 +71,21 @@ namespace react {
 } // namespace facebook
 `;
 
-function traverseArg(arg, index, aliases): string {
+function traverseArg(
+  arg: NativeModuleMethodParamSchema,
+  index: number,
+  resolveAlias: AliasResolver,
+): string {
   function wrap(suffix) {
     return `args[${index}]${suffix}`;
   }
   const {typeAnnotation} = arg;
 
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
   switch (realTypeAnnotation.type) {
     case 'ReservedFunctionValueTypeAnnotation':
       switch (realTypeAnnotation.name) {
@@ -90,7 +102,11 @@ function traverseArg(arg, index, aliases): string {
     case 'BooleanTypeAnnotation':
       return wrap('.getBool()');
     case 'NumberTypeAnnotation':
+      return wrap('.getNumber()');
     case 'FloatTypeAnnotation':
+      return wrap('.getNumber()');
+    case 'DoubleTypeAnnotation':
+      return wrap('.getNumber()');
     case 'Int32TypeAnnotation':
       return wrap('.getNumber()');
     case 'ArrayTypeAnnotation':
@@ -98,26 +114,27 @@ function traverseArg(arg, index, aliases): string {
     case 'FunctionTypeAnnotation':
       return `std::move(${wrap('.getObject(rt).getFunction(rt)')})`;
     case 'GenericObjectTypeAnnotation':
+      return wrap('.getObject(rt)');
     case 'ObjectTypeAnnotation':
       return wrap('.getObject(rt)');
-    case 'AnyTypeAnnotation':
-      throw new Error(`Any type is not allowed in params for "${arg.name}"`);
     default:
-      // TODO (T65847278): Figure out why this does not work.
-      // (type: empty);
+      (realTypeAnnotation.type: empty);
       throw new Error(
         `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
       );
   }
 }
 
-function traverseProperty(property, aliases): string {
+function traverseProperty(
+  property: NativeModulePropertySchema,
+  resolveAlias: AliasResolver,
+): string {
   const propertyTemplate =
     property.typeAnnotation.returnTypeAnnotation.type === 'VoidTypeAnnotation'
       ? voidPropertyTemplate
       : nonvoidPropertyTemplate;
   const traversedArgs = property.typeAnnotation.params
-    .map((p, i) => traverseArg(p, i, aliases))
+    .map((p, i) => traverseArg(p, i, resolveAlias))
     .join(', ');
   return propertyTemplate
     .replace(/::_PROPERTY_NAME_::/g, property.name)
@@ -130,23 +147,14 @@ module.exports = {
     schema: SchemaType,
     moduleSpecName: string,
   ): FilesOutput {
-    const nativeModules = Object.keys(schema.modules)
-      .map(moduleName => {
-        const modules = schema.modules[moduleName].nativeModules;
-        if (modules == null) {
-          return null;
-        }
-
-        return modules;
-      })
-      .filter(Boolean)
-      .reduce((acc, modules) => Object.assign(acc, modules), {});
+    const nativeModules = getModules(schema);
 
     const modules = Object.keys(nativeModules)
       .map(name => {
         const {aliases, properties} = nativeModules[name];
+        const resolveAlias = createAliasResolver(aliases);
         const traversedProperties = properties
-          .map(property => traverseProperty(property, aliases))
+          .map(property => traverseProperty(property, resolveAlias))
           .join('\n');
         return moduleTemplate
           .replace(/::_MODULE_PROPERTIES_::/g, traversedProperties)

From 4ab7cc236ae2ab11d304f2ebeeee14779bc4ff18 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 127/241] Fix GenerateModuleH

Summary:
Just updated the generator to work with the new RN Codegen Flow Parser types.

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23667252

fbshipit-source-id: 34404a478ddd67446d82b5f98e1051300064e95c
---
 .../src/generators/modules/GenerateModuleH.js | 57 ++++++++-----------
 .../GenerateModuleH-test.js.snap              | 21 ++++---
 2 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
index f2aaa32f41f133..420b6f6a33fa18 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -10,15 +10,10 @@
 
 'use strict';
 
-import type {
-  SchemaType,
-  FunctionTypeAnnotationParamTypeAnnotation,
-  FunctionTypeAnnotationReturn,
-  TypeAliasTypeAnnotation,
-  ObjectTypeAliasTypeShape,
-} from '../../CodegenSchema';
+import type {SchemaType, NativeModuleTypeAnnotation} from '../../CodegenSchema';
 
-const {getTypeAliasTypeAnnotation} = require('./Utils');
+import type {AliasResolver} from './Utils';
+const {createAliasResolver, getModules} = require('./Utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -32,8 +27,9 @@ public:
 
 };`;
 
-const template = `/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+const template = `
+/**
+ * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -54,17 +50,15 @@ namespace react {
 `;
 
 function translatePrimitiveJSTypeToCpp(
-  typeAnnotation:
-    | FunctionTypeAnnotationParamTypeAnnotation
-    | FunctionTypeAnnotationReturn
-    | TypeAliasTypeAnnotation,
+  typeAnnotation: NativeModuleTypeAnnotation,
   createErrorMessage: (typeName: string) => string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
+  resolveAlias: AliasResolver,
 ) {
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
   switch (realTypeAnnotation.type) {
     case 'ReservedFunctionValueTypeAnnotation':
       switch (realTypeAnnotation.name) {
@@ -79,6 +73,9 @@ function translatePrimitiveJSTypeToCpp(
     case 'StringTypeAnnotation':
       return 'jsi::String';
     case 'NumberTypeAnnotation':
+      return 'double';
+    case 'DoubleTypeAnnotation':
+      return 'double';
     case 'FloatTypeAnnotation':
       return 'double';
     case 'Int32TypeAnnotation':
@@ -86,6 +83,7 @@ function translatePrimitiveJSTypeToCpp(
     case 'BooleanTypeAnnotation':
       return 'bool';
     case 'GenericObjectTypeAnnotation':
+      return 'jsi::Object';
     case 'ObjectTypeAnnotation':
       return 'jsi::Object';
     case 'ArrayTypeAnnotation':
@@ -95,8 +93,7 @@ function translatePrimitiveJSTypeToCpp(
     case 'PromiseTypeAnnotation':
       return 'jsi::Value';
     default:
-      // TODO (T65847278): Figure out why this does not work.
-      // (type: empty);
+      (realTypeAnnotation.type: empty);
       throw new Error(createErrorMessage(realTypeAnnotation.type));
   }
 }
@@ -110,21 +107,13 @@ module.exports = {
     schema: SchemaType,
     moduleSpecName: string,
   ): FilesOutput {
-    const nativeModules = Object.keys(schema.modules)
-      .map(moduleName => {
-        const modules = schema.modules[moduleName].nativeModules;
-        if (modules == null) {
-          return null;
-        }
-
-        return modules;
-      })
-      .filter(Boolean)
-      .reduce((acc, components) => Object.assign(acc, components), {});
+    const nativeModules = getModules(schema);
 
     const modules = Object.keys(nativeModules)
       .map(name => {
         const {aliases, properties} = nativeModules[name];
+        const resolveAlias = createAliasResolver(aliases);
+
         const traversedProperties = properties
           .map(prop => {
             const traversedArgs = prop.typeAnnotation.params
@@ -133,7 +122,7 @@ module.exports = {
                   param.typeAnnotation,
                   typeName =>
                     `Unsupported type for param "${param.name}" in ${prop.name}. Found: ${typeName}`,
-                  aliases,
+                  resolveAlias,
                 );
                 const isObject = translatedParam.startsWith('jsi::');
                 return (
@@ -151,7 +140,7 @@ module.exports = {
                   prop.typeAnnotation.returnTypeAnnotation,
                   typeName =>
                     `Unsupported return type for ${prop.name}. Found: ${typeName}`,
-                  aliases,
+                  resolveAlias,
                 ),
               )
               .replace(
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
index fbdcb15bae2c68..4e55a6343121fe 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
@@ -2,7 +2,8 @@
 
 exports[`GenerateModuleH can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "NativeModules.h" => "/**
+  "NativeModules.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -38,7 +39,8 @@ virtual void getArrays(jsi::Runtime &rt, const jsi::Object &options) = 0;
 
 exports[`GenerateModuleH can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "NativeModules.h" => "/**
+  "NativeModules.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -71,7 +73,8 @@ public:
 
 exports[`GenerateModuleH can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "NativeModules.h" => "/**
+  "NativeModules.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -105,7 +108,8 @@ virtual void cropImage(jsi::Runtime &rt, const jsi::Object &cropData) = 0;
 
 exports[`GenerateModuleH can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "NativeModules.h" => "/**
+  "NativeModules.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -163,7 +167,8 @@ virtual void dismissRedbox(jsi::Runtime &rt) = 0;
 
 exports[`GenerateModuleH can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "NativeModules.h" => "/**
+  "NativeModules.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -206,7 +211,8 @@ virtual jsi::Value getValueWithPromise(jsi::Runtime &rt, bool error) = 0;
 
 exports[`GenerateModuleH can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "NativeModules.h" => "/**
+  "NativeModules.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -249,7 +255,8 @@ virtual void voidFunc(jsi::Runtime &rt) = 0;
 
 exports[`GenerateModuleH can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "NativeModules.h" => "/**
+  "NativeModules.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

From 560ac1a9fac8c0639a5eb3d6778f4913f9ce237a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 128/241] Fix GenerateModuleJavaSpec

Summary:
Just updated the generator to work with the new RN Codegen Flow Parser types.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23667255

fbshipit-source-id: 40b7747aad89f6d5bbb9f42d59a4df9633060c66
---
 .../modules/GenerateModuleJavaSpec.js         | 88 +++++++++++--------
 .../GenerateModuleJavaSpec-test.js.snap       | 33 ++++---
 2 files changed, 72 insertions(+), 49 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
index 45ff4ba8dcfac7..69958ca41d6950 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
@@ -11,18 +11,20 @@
 'use strict';
 
 import type {
-  FunctionTypeAnnotationParam,
-  FunctionTypeAnnotationReturn,
-  NativeModulePropertyShape,
-  ObjectTypeAliasTypeShape,
   SchemaType,
+  NativeModulePropertySchema,
+  NativeModuleMethodParamSchema,
+  NativeModuleReturnTypeAnnotation,
 } from '../../CodegenSchema';
-const {getTypeAliasTypeAnnotation} = require('./Utils');
+
+import type {AliasResolver} from './Utils';
+const {createAliasResolver, getModules} = require('./Utils');
 
 type FilesOutput = Map<string, string>;
 
-const moduleTemplate = `/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+const moduleTemplate = `
+/**
+ * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
  * directory of this source tree.
@@ -46,30 +48,32 @@ public abstract class ::_CLASSNAME_:: extends ReactContextBaseJavaModule impleme
 `;
 
 function translateFunctionParamToJavaType(
-  param: FunctionTypeAnnotationParam,
+  param: NativeModuleMethodParamSchema,
   createErrorMessage: (typeName: string) => string,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
+  resolveAlias: AliasResolver,
   imports: Set<string>,
 ): string {
-  const {nullable, typeAnnotation} = param;
+  const {optional, typeAnnotation} = param;
+  const isRequired = !optional && !typeAnnotation.nullable;
 
   function wrapIntoNullableIfNeeded(generatedType: string) {
-    if (nullable) {
+    if (!isRequired) {
       imports.add('javax.annotation.Nullable');
       return `@Nullable ${generatedType}`;
     }
     return generatedType;
   }
 
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
   switch (realTypeAnnotation.type) {
     case 'ReservedFunctionValueTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
-          return nullable ? 'Double' : 'double';
+          return !isRequired ? 'Double' : 'double';
         default:
           (realTypeAnnotation.name: empty);
           throw new Error(createErrorMessage(realTypeAnnotation.name));
@@ -77,11 +81,15 @@ function translateFunctionParamToJavaType(
     case 'StringTypeAnnotation':
       return wrapIntoNullableIfNeeded('String');
     case 'NumberTypeAnnotation':
+      return !isRequired ? 'Double' : 'double';
     case 'FloatTypeAnnotation':
+      return !isRequired ? 'Double' : 'double';
+    case 'DoubleTypeAnnotation':
+      return !isRequired ? 'Double' : 'double';
     case 'Int32TypeAnnotation':
-      return nullable ? 'Double' : 'double';
+      return !isRequired ? 'Double' : 'double';
     case 'BooleanTypeAnnotation':
-      return nullable ? 'Boolean' : 'boolean';
+      return !isRequired ? 'Boolean' : 'boolean';
     case 'ObjectTypeAnnotation':
       imports.add('com.facebook.react.bridge.ReadableMap');
       if (typeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -100,13 +108,15 @@ function translateFunctionParamToJavaType(
       imports.add('com.facebook.react.bridge.Callback');
       return 'Callback';
     default:
+      (realTypeAnnotation.type: empty);
       throw new Error(createErrorMessage(realTypeAnnotation.type));
   }
 }
 
 function translateFunctionReturnTypeToJavaType(
-  returnTypeAnnotation: FunctionTypeAnnotationReturn,
+  returnTypeAnnotation: NativeModuleReturnTypeAnnotation,
   createErrorMessage: (typeName: string) => string,
+  resolveAlias: AliasResolver,
   imports: Set<string>,
 ): string {
   const {nullable} = returnTypeAnnotation;
@@ -119,23 +129,32 @@ function translateFunctionReturnTypeToJavaType(
     return generatedType;
   }
 
-  // TODO: Support aliased return type. This doesn't exist in React Native Android yet.
-  switch (returnTypeAnnotation.type) {
+  let realTypeAnnotation = returnTypeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
+  switch (realTypeAnnotation.type) {
     case 'ReservedFunctionValueTypeAnnotation':
-      switch (returnTypeAnnotation.name) {
+      switch (realTypeAnnotation.name) {
         case 'RootTag':
           return nullable ? 'Double' : 'double';
         default:
-          (returnTypeAnnotation.name: empty);
-          throw new Error(createErrorMessage(returnTypeAnnotation.name));
+          (realTypeAnnotation.name: empty);
+          throw new Error(createErrorMessage(realTypeAnnotation.name));
       }
     case 'VoidTypeAnnotation':
+      return 'void';
     case 'PromiseTypeAnnotation':
       return 'void';
     case 'StringTypeAnnotation':
       return wrapIntoNullableIfNeeded('String');
     case 'NumberTypeAnnotation':
+      return nullable ? 'Double' : 'double';
     case 'FloatTypeAnnotation':
+      return nullable ? 'Double' : 'double';
+    case 'DoubleTypeAnnotation':
+      return nullable ? 'Double' : 'double';
     case 'Int32TypeAnnotation':
       return nullable ? 'Double' : 'double';
     case 'BooleanTypeAnnotation':
@@ -150,13 +169,14 @@ function translateFunctionReturnTypeToJavaType(
       imports.add('com.facebook.react.bridge.WritableArray');
       return 'WritableArray';
     default:
-      throw new Error(createErrorMessage(returnTypeAnnotation.type));
+      (realTypeAnnotation.type: empty);
+      throw new Error(createErrorMessage(realTypeAnnotation.type));
   }
 }
 
 // Build special-cased runtime check for getConstants().
 function buildGetConstantsMethod(
-  method: NativeModulePropertyShape,
+  method: NativeModulePropertySchema,
   imports: Set<string>,
 ): string {
   if (
@@ -240,20 +260,11 @@ module.exports = {
     const files = new Map();
     // TODO: Allow package configuration.
     const packageName = 'com.facebook.fbreact.specs.beta';
-    const nativeModules = Object.keys(schema.modules)
-      .map(moduleName => {
-        const modules = schema.modules[moduleName].nativeModules;
-        if (modules == null) {
-          return null;
-        }
-
-        return modules;
-      })
-      .filter(Boolean)
-      .reduce((acc, components) => Object.assign(acc, components), {});
+    const nativeModules = getModules(schema);
 
     Object.keys(nativeModules).forEach(name => {
       const {aliases, properties} = nativeModules[name];
+      const resolveAlias = createAliasResolver(aliases);
       const className = `Native${name}Spec`;
 
       const imports: Set<string> = new Set([
@@ -275,6 +286,7 @@ module.exports = {
           method.typeAnnotation.returnTypeAnnotation,
           typeName =>
             `Unsupported return type for method ${method.name}. Found: ${typeName}`,
+          resolveAlias,
           imports,
         );
         const returningPromise =
@@ -290,7 +302,7 @@ module.exports = {
             param,
             typeName =>
               `Unsupported type for param "${param.name}" in ${method.name}. Found: ${typeName}`,
-            aliases,
+            resolveAlias,
             imports,
           );
           return `${translatedParam} ${param.name}`;
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
index 13eeb45cc922e6..c9a415a2064dee 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJavaSpec-test.js.snap
@@ -2,7 +2,8 @@
 
 exports[`GenerateModuleJavaSpec can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "NativeSampleTurboModuleSpec.java" => "/**
+  "NativeSampleTurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -48,7 +49,8 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
 
 exports[`GenerateModuleJavaSpec can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "NativeSampleTurboModuleSpec.java" => "/**
+  "NativeSampleTurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -80,7 +82,8 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
 
 exports[`GenerateModuleJavaSpec can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "NativeAliasTurboModuleSpec.java" => "/**
+  "NativeAliasTurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -114,7 +117,8 @@ public abstract class NativeAliasTurboModuleSpec extends ReactContextBaseJavaMod
 
 exports[`GenerateModuleJavaSpec can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "NativeCameraRollManagerSpec.java" => "/**
+  "NativeCameraRollManagerSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -151,7 +155,8 @@ public abstract class NativeCameraRollManagerSpec extends ReactContextBaseJavaMo
   public abstract void deletePhotos(ReadableArray assets, Promise promise);
 }
 ",
-  "NativeImagePickerIOSSpec.java" => "/**
+  "NativeImagePickerIOSSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -181,7 +186,8 @@ public abstract class NativeImagePickerIOSSpec extends ReactContextBaseJavaModul
   public abstract void openCameraDialog(ReadableMap config, Callback successCallback, Callback cancelCallback);
 }
 ",
-  "NativeExceptionsManagerSpec.java" => "/**
+  "NativeExceptionsManagerSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -228,7 +234,8 @@ public abstract class NativeExceptionsManagerSpec extends ReactContextBaseJavaMo
 
 exports[`GenerateModuleJavaSpec can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "NativeSampleTurboModuleSpec.java" => "/**
+  "NativeSampleTurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -327,7 +334,8 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
 
 exports[`GenerateModuleJavaSpec can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "NativeSampleTurboModuleSpec.java" => "/**
+  "NativeSampleTurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -355,7 +363,8 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   public abstract void voidFunc();
 }
 ",
-  "NativeSample2TurboModuleSpec.java" => "/**
+  "NativeSample2TurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -388,7 +397,8 @@ public abstract class NativeSample2TurboModuleSpec extends ReactContextBaseJavaM
 
 exports[`GenerateModuleJavaSpec can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "NativeSampleTurboModuleSpec.java" => "/**
+  "NativeSampleTurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root
@@ -416,7 +426,8 @@ public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaMo
   public abstract void voidFunc();
 }
 ",
-  "NativeSample2TurboModuleSpec.java" => "/**
+  "NativeSample2TurboModuleSpec.java" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the LICENSE file in the root

From cedd628fc32714d87ad9dae41f083e5e431bb6e7 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 129/241] Fix GenerateModuleJniH

Summary:
Just updated the generator to work with the new RN Codegen Flow Parser types.

Changelog: [Internal]

Reviewed By: PeteTheHeat

Differential Revision: D23667250

fbshipit-source-id: f36b5418101c40331964d1f9ede7c6bd7924383d
---
 .../generators/modules/GenerateModuleJniH.js  | 21 ++++--------
 .../GenerateModuleJniH-test.js.snap           | 33 +++++++++++--------
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
index 4d9a5aac0cf688..18dde67c9b1297 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniH.js
@@ -14,6 +14,8 @@ import type {SchemaType} from '../../CodegenSchema';
 
 type FilesOutput = Map<string, string>;
 
+const {getModules} = require('./Utils');
+
 const moduleTemplate = `/**
  * JNI C++ class for module '::_MODULE_NAME_::'
  */
@@ -23,8 +25,9 @@ public:
 };
 `;
 
-const template = `/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+const template = `
+/**
+ * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -84,19 +87,7 @@ module.exports = {
     schema: SchemaType,
     moduleSpecName: string,
   ): FilesOutput {
-    const nativeModules = Object.keys(schema.modules)
-      .sort()
-      .map(moduleName => {
-        const modules = schema.modules[moduleName].nativeModules;
-        if (modules == null) {
-          return null;
-        }
-
-        return modules;
-      })
-      .filter(Boolean)
-      .reduce((acc, components) => Object.assign(acc, components), {});
-
+    const nativeModules = getModules(schema);
     const modules = Object.keys(nativeModules)
       .map(name => moduleTemplate.replace(/::_MODULE_NAME_::/g, name))
       .join('\n');
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
index efe08283828084..64cbc779b30315 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleJniH-test.js.snap
@@ -2,7 +2,8 @@
 
 exports[`GenerateModuleJniH can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SampleSpec.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -67,7 +68,8 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SampleSpec.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -132,7 +134,8 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SampleSpec.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -197,7 +200,8 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SampleSpec.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -224,19 +228,19 @@ public:
 };
 
 /**
- * JNI C++ class for module 'ExceptionsManager'
+ * JNI C++ class for module 'ImagePickerIOS'
  */
-class JSI_EXPORT NativeExceptionsManagerSpecJSI : public JavaTurboModule {
+class JSI_EXPORT NativeImagePickerIOSSpecJSI : public JavaTurboModule {
 public:
-  NativeExceptionsManagerSpecJSI(const JavaTurboModule::InitParams &params);
+  NativeImagePickerIOSSpecJSI(const JavaTurboModule::InitParams &params);
 };
 
 /**
- * JNI C++ class for module 'ImagePickerIOS'
+ * JNI C++ class for module 'ExceptionsManager'
  */
-class JSI_EXPORT NativeImagePickerIOSSpecJSI : public JavaTurboModule {
+class JSI_EXPORT NativeExceptionsManagerSpecJSI : public JavaTurboModule {
 public:
-  NativeImagePickerIOSSpecJSI(const JavaTurboModule::InitParams &params);
+  NativeExceptionsManagerSpecJSI(const JavaTurboModule::InitParams &params);
 };
 
 
@@ -278,7 +282,8 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SampleSpec.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -343,7 +348,8 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SampleSpec.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -416,7 +422,8 @@ include $(BUILD_SHARED_LIBRARY)
 
 exports[`GenerateModuleJniH can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "SampleSpec.h" => "/**
+  "SampleSpec.h" => "
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

From 1b3dc1d9e32a4596a3a2cf5d476cfc5176fe7203 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 130/241] Fix GenerateModuleJniCpp

Summary:
Just updated the generator to work with the new RN Codegen Flow Parser types.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23667253

fbshipit-source-id: ef94e75287d37dfd7b80f61455a1bfa34bddeb28
---
 .../modules/GenerateModuleJniCpp.js           | 138 ++++++++++--------
 1 file changed, 80 insertions(+), 58 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
index a97083d86bd7f3..72b48a7fcdab72 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
@@ -11,14 +11,14 @@
 'use strict';
 
 import type {
-  FunctionTypeAnnotationParam,
-  FunctionTypeAnnotationReturn,
-  NativeModuleShape,
-  ObjectTypeAliasTypeShape,
   SchemaType,
+  NativeModulePropertySchema,
+  NativeModuleMethodParamSchema,
+  NativeModuleReturnTypeAnnotation,
 } from '../../CodegenSchema';
 
-const {getTypeAliasTypeAnnotation} = require('./Utils');
+import type {AliasResolver} from './Utils';
+const {createAliasResolver, getModules} = require('./Utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -50,7 +50,7 @@ const oneModuleLookupTemplate = `  if (moduleName == "::_MODULE_NAME_::") {
 
 const template = `
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -75,17 +75,23 @@ std::shared_ptr<TurboModule> ::_LIBRARY_NAME_::_ModuleProvider(const std::string
 `;
 
 function translateReturnTypeToKind(
-  typeAnnotation: FunctionTypeAnnotationReturn,
+  typeAnnotation: NativeModuleReturnTypeAnnotation,
+  resolveAlias: AliasResolver,
 ): string {
-  switch (typeAnnotation.type) {
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
+  switch (realTypeAnnotation.type) {
     case 'ReservedFunctionValueTypeAnnotation':
-      switch (typeAnnotation.name) {
+      switch (realTypeAnnotation.name) {
         case 'RootTag':
           return 'NumberKind';
         default:
-          (typeAnnotation.name: empty);
+          (realTypeAnnotation.name: empty);
           throw new Error(
-            `Invalid ReservedFunctionValueTypeName name, got ${typeAnnotation.name}`,
+            `Invalid ReservedFunctionValueTypeName name, got ${realTypeAnnotation.name}`,
           );
       }
     case 'VoidTypeAnnotation':
@@ -95,62 +101,66 @@ function translateReturnTypeToKind(
     case 'BooleanTypeAnnotation':
       return 'BooleanKind';
     case 'NumberTypeAnnotation':
+      return 'NumberKind';
     case 'DoubleTypeAnnotation':
+      return 'NumberKind';
     case 'FloatTypeAnnotation':
+      return 'NumberKind';
     case 'Int32TypeAnnotation':
       return 'NumberKind';
     case 'PromiseTypeAnnotation':
       return 'PromiseKind';
     case 'GenericObjectTypeAnnotation':
+      return 'ObjectKind';
     case 'ObjectTypeAnnotation':
       return 'ObjectKind';
     case 'ArrayTypeAnnotation':
       return 'ArrayKind';
     default:
-      // TODO (T65847278): Figure out why this does not work.
-      // (typeAnnotation.type: empty);
+      (realTypeAnnotation.type: empty);
       throw new Error(
-        `Unknown prop type for returning value, found: ${typeAnnotation.type}"`,
+        `Unknown prop type for returning value, found: ${realTypeAnnotation.type}"`,
       );
   }
 }
 
 function translateParamTypeToJniType(
-  param: FunctionTypeAnnotationParam,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
+  param: NativeModuleMethodParamSchema,
+  resolveAlias: AliasResolver,
 ): string {
-  const {nullable, typeAnnotation} = param;
+  const {optional, typeAnnotation} = param;
+  const isRequired = !optional && !typeAnnotation.nullable;
 
-  const realTypeAnnotation =
-    typeAnnotation.type === 'TypeAliasTypeAnnotation'
-      ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases)
-      : typeAnnotation;
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
 
   switch (realTypeAnnotation.type) {
     case 'ReservedFunctionValueTypeAnnotation':
       switch (realTypeAnnotation.name) {
         case 'RootTag':
-          return 'D';
+          return !isRequired ? 'Ljava/lang/Double;' : 'D';
         default:
           (realTypeAnnotation.name: empty);
           throw new Error(
             `Invalid ReservedFunctionValueTypeName name, got ${realTypeAnnotation.name}`,
           );
       }
-    case 'VoidTypeAnnotation':
-      return 'V';
     case 'StringTypeAnnotation':
       return 'Ljava/lang/String;';
     case 'BooleanTypeAnnotation':
-      return nullable ? 'Ljava/lang/Boolean' : 'Z';
+      return !isRequired ? 'Ljava/lang/Boolean' : 'Z';
     case 'NumberTypeAnnotation':
+      return !isRequired ? 'Ljava/lang/Double;' : 'D';
     case 'DoubleTypeAnnotation':
+      return !isRequired ? 'Ljava/lang/Double;' : 'D';
     case 'FloatTypeAnnotation':
+      return !isRequired ? 'Ljava/lang/Double;' : 'D';
     case 'Int32TypeAnnotation':
-      return nullable ? 'Ljava/lang/Double;' : 'D';
-    case 'PromiseTypeAnnotation':
-      return 'Lcom/facebook/react/bridge/Promise;';
+      return !isRequired ? 'Ljava/lang/Double;' : 'D';
     case 'GenericObjectTypeAnnotation':
+      return 'Lcom/facebook/react/bridge/ReadableMap;';
     case 'ObjectTypeAnnotation':
       return 'Lcom/facebook/react/bridge/ReadableMap;';
     case 'ArrayTypeAnnotation':
@@ -158,6 +168,7 @@ function translateParamTypeToJniType(
     case 'FunctionTypeAnnotation':
       return 'Lcom/facebook/react/bridge/Callback;';
     default:
+      (realTypeAnnotation.type: empty);
       throw new Error(
         `Unknown prop type for method arg, found: ${realTypeAnnotation.type}"`,
       );
@@ -165,19 +176,25 @@ function translateParamTypeToJniType(
 }
 
 function translateReturnTypeToJniType(
-  typeAnnotation: FunctionTypeAnnotationReturn,
+  typeAnnotation: NativeModuleReturnTypeAnnotation,
+  resolveAlias: AliasResolver,
 ): string {
   const {nullable} = typeAnnotation;
 
-  switch (typeAnnotation.type) {
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
+  switch (realTypeAnnotation.type) {
     case 'ReservedFunctionValueTypeAnnotation':
-      switch (typeAnnotation.name) {
+      switch (realTypeAnnotation.name) {
         case 'RootTag':
-          return 'D';
+          return nullable ? 'Ljava/lang/Double;' : 'D';
         default:
-          (typeAnnotation.name: empty);
+          (realTypeAnnotation.name: empty);
           throw new Error(
-            `Invalid ReservedFunctionValueTypeName name, got ${typeAnnotation.name}`,
+            `Invalid ReservedFunctionValueTypeName name, got ${realTypeAnnotation.name}`,
           );
       }
     case 'VoidTypeAnnotation':
@@ -187,27 +204,32 @@ function translateReturnTypeToJniType(
     case 'BooleanTypeAnnotation':
       return nullable ? 'Ljava/lang/Boolean' : 'Z';
     case 'NumberTypeAnnotation':
+      return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'DoubleTypeAnnotation':
+      return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'FloatTypeAnnotation':
+      return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'Int32TypeAnnotation':
       return nullable ? 'Ljava/lang/Double;' : 'D';
     case 'PromiseTypeAnnotation':
       return 'Lcom/facebook/react/bridge/Promise;';
     case 'GenericObjectTypeAnnotation':
+      return 'Lcom/facebook/react/bridge/WritableMap;';
     case 'ObjectTypeAnnotation':
       return 'Lcom/facebook/react/bridge/WritableMap;';
     case 'ArrayTypeAnnotation':
       return 'Lcom/facebook/react/bridge/WritableArray;';
     default:
+      (realTypeAnnotation.type: empty);
       throw new Error(
-        `Unknown prop type for method return type, found: ${typeAnnotation.type}"`,
+        `Unknown prop type for method return type, found: ${realTypeAnnotation.type}"`,
       );
   }
 }
 
 function translateMethodTypeToJniSignature(
-  property,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
+  property: NativeModulePropertySchema,
+  resolveAlias: AliasResolver,
 ): string {
   const {name, typeAnnotation} = property;
   const {returnTypeAnnotation} = typeAnnotation;
@@ -223,24 +245,29 @@ function translateMethodTypeToJniSignature(
   }
 
   const argsSignatureParts = params.map(t => {
-    return translateParamTypeToJniType(t, aliases);
+    return translateParamTypeToJniType(t, resolveAlias);
   });
   if (isPromiseReturn) {
     // Additional promise arg for this case.
-    argsSignatureParts.push(translateReturnTypeToJniType(returnTypeAnnotation));
+    argsSignatureParts.push(
+      translateReturnTypeToJniType(returnTypeAnnotation, resolveAlias),
+    );
   }
   const argsSignature = argsSignatureParts.join('');
   const returnSignature =
     name === 'getConstants'
       ? 'Ljava/util/Map;'
-      : translateReturnTypeToJniType(processedReturnTypeAnnotation);
+      : translateReturnTypeToJniType(
+          processedReturnTypeAnnotation,
+          resolveAlias,
+        );
 
   return `(${argsSignature})${returnSignature}`;
 }
 
 function translateMethodForImplementation(
-  property,
-  aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>,
+  property: NativeModulePropertySchema,
+  resolveAlias: AliasResolver,
 ): string {
   const {returnTypeAnnotation} = property.typeAnnotation;
 
@@ -264,7 +291,10 @@ function translateMethodForImplementation(
     return '';
   }
   return propertyTemplate
-    .replace(/::_KIND_::/g, translateReturnTypeToKind(returnTypeAnnotation))
+    .replace(
+      /::_KIND_::/g,
+      translateReturnTypeToKind(returnTypeAnnotation, resolveAlias),
+    )
     .replace(/::_PROPERTY_NAME_::/g, property.name)
     .replace(
       /::_ARGS_::/g,
@@ -274,7 +304,7 @@ function translateMethodForImplementation(
     )
     .replace(
       /::_SIGNATURE_::/g,
-      translateMethodTypeToJniSignature(property, aliases),
+      translateMethodTypeToJniSignature(property, resolveAlias),
     );
 }
 
@@ -284,25 +314,17 @@ module.exports = {
     schema: SchemaType,
     moduleSpecName: string,
   ): FilesOutput {
-    const nativeModules: {[name: string]: NativeModuleShape, ...} = Object.keys(
-      schema.modules,
-    )
-      .map(moduleName => {
-        const modules = schema.modules[moduleName].nativeModules;
-        if (modules == null) {
-          return null;
-        }
-
-        return modules;
-      })
-      .filter(Boolean)
-      .reduce((acc, modules) => Object.assign(acc, modules), {});
+    const nativeModules = getModules(schema);
 
     const modules = Object.keys(nativeModules)
       .map(name => {
         const {aliases, properties} = nativeModules[name];
+        const resolveAlias = createAliasResolver(aliases);
+
         const translatedMethods = properties
-          .map(property => translateMethodForImplementation(property, aliases))
+          .map(property =>
+            translateMethodForImplementation(property, resolveAlias),
+          )
           .join('\n');
         return moduleTemplate
           .replace(/::_TURBOMODULE_METHOD_INVOKERS_::/g, translatedMethods)

From 97d3e85c294913af4ab21b4bf8343c2839313b4c Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 131/241] Fix ObjC++ module generator output

Summary:
* Removed extraneous closing brace.
* Fixed static method signature, replacing double colon with an underscore (`static facebook::jsi::Value __hostFunction_Native${moduleName}SpecJSI::${methodName}()` -> `static facebook::jsi::Value __hostFunction_Native${moduleName}SpecJSI_${methodName}()`).
* Wrap `getConstants` selector name with `selector()`.
* Pass through `getConstants` and `constantsToExport` to allow de-duping of `getConstants` method in generator output.

Note that the FBReactNativeSpec that is output by the generator still has some issues that need to be addressed before it can be used.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D23910505

fbshipit-source-id: 37d884885b8878f38d40637377c2a74a728c3a13
---
 .../GenerateModuleObjCpp-test.js.snap         | 271 +++++++-----------
 .../modules/GenerateModuleObjCpp/index.js     |   2 +-
 .../GenerateModuleObjCpp/serializeMethod.js   |   4 +-
 .../source/serializeModule.js                 |   3 +-
 .../GenerateModuleMm-test.js.snap             |  80 ++----
 5 files changed, 131 insertions(+), 229 deletions(-)

diff --git a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
index 73bfce8a865d1b..84e76d76df8679 100644
--- a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
+++ b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
@@ -1320,17 +1320,17 @@ exports[`GenerateModuleObjCpp can generate an implementation file NativeModule s
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI::getReadOnlyArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI_getReadOnlyArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getReadOnlyArray\\", @selector(getReadOnlyArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI::getArrayWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI_getArrayWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArrayWithAlias\\", @selector(getArrayWithAlias:b:), args, count);
     }
 
@@ -1349,7 +1349,6 @@ namespace facebook {
         methodMap_[\\"getArrayWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeArrayTurboModuleSpecJSI_getArrayWithAlias};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1359,12 +1358,12 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI::getBoolean(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI_getBoolean(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBoolean\\", @selector(getBoolean:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI::getBooleanWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI_getBooleanWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBooleanWithAlias\\", @selector(getBooleanWithAlias:), args, count);
     }
 
@@ -1379,7 +1378,6 @@ namespace facebook {
         methodMap_[\\"getBooleanWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeBooleanTurboModuleSpecJSI_getBooleanWithAlias};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1389,12 +1387,12 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeCallbackTurboModuleSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeCallbackTurboModuleSpecJSI::getValueWithCallbackWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallbackWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallbackWithAlias\\", @selector(getValueWithCallbackWithAlias:), args, count);
     }
 
@@ -1409,7 +1407,6 @@ namespace facebook {
         methodMap_[\\"getValueWithCallbackWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallbackWithAlias};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1419,32 +1416,32 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:reject:), args, count);
     }
 
@@ -1475,7 +1472,6 @@ namespace facebook {
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getValueWithPromise};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1485,12 +1481,12 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeNumberTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNumberTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeNumberTurboModuleSpecJSI::getNumberWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeNumberTurboModuleSpecJSI_getNumberWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumberWithAlias\\", @selector(getNumberWithAlias:), args, count);
     }
 
@@ -1505,7 +1501,6 @@ namespace facebook {
         methodMap_[\\"getNumberWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeNumberTurboModuleSpecJSI_getNumberWithAlias};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1562,33 +1557,28 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getGenericObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObject\\", @selector(getGenericObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getGenericObjectReadOnly(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectReadOnly(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObjectReadOnly\\", @selector(getGenericObjectReadOnly:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getGenericObjectWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObjectWithAlias\\", @selector(getGenericObjectWithAlias:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::difficultObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_difficultObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"difficultObject\\", @selector(difficultObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -1614,11 +1604,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1659,13 +1644,8 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeOptionalObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeOptionalObjectTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -1675,11 +1655,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1689,12 +1664,12 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativePromiseTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativePromiseTurboModuleSpecJSI::getValueWithPromiseWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromiseWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromiseWithAlias\\", @selector(getValueWithPromiseWithAlias:resolve:reject:), args, count);
     }
 
@@ -1709,7 +1684,6 @@ namespace facebook {
         methodMap_[\\"getValueWithPromiseWithAlias\\"] = MethodMetadata {1, __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromiseWithAlias};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1742,73 +1716,68 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:getValuegetValuegetValuegetValuegetValuey:z:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -1866,11 +1835,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -1895,73 +1859,68 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -2019,11 +1978,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -2056,73 +2010,68 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -2180,11 +2129,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -2217,73 +2161,68 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -2341,11 +2280,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -2378,73 +2312,68 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -2502,11 +2431,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -2516,12 +2440,12 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeStringTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeStringTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeStringTurboModuleSpecJSI::getStringWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeStringTurboModuleSpecJSI_getStringWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getStringWithAlias\\", @selector(getStringWithAlias:), args, count);
     }
 
@@ -2536,7 +2460,6 @@ namespace facebook {
         methodMap_[\\"getStringWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeStringTurboModuleSpecJSI_getStringWithAlias};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
index 0f1852415b206c..ee2d5e1e42d375 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
@@ -184,7 +184,7 @@ module.exports = {
           moduleName,
           generatedStructs,
           methodSerializations.filter(
-            ({selector}) => selector !== 'constantsToExport',
+            ({selector}) => selector !== '@selector(constantsToExport)',
           ),
         ),
       );
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
index 6fe0c47b288e9a..46f77f64437f3e 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
@@ -398,10 +398,10 @@ function serializeConstantsProtocolMethods(
       });
 
       return {
-        methodName: 'getConstants',
+        methodName,
         protocolMethod,
         returnJSType: 'ObjectKind',
-        selector: 'getConstants',
+        selector: `@selector(${methodName})`,
         structParamRecords: [],
       };
     },
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
index 82c69359a06d36..d45f296eadef38 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
@@ -54,7 +54,6 @@ namespace facebook {
             }),
           )
           .join('\n' + ' '.repeat(8))}
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -86,7 +85,7 @@ const InlineHostFunctionTemplate = ({
   returnJSType: string,
   selector: string,
 |}>) => `
-    static facebook::jsi::Value __hostFunction_Native${moduleName}SpecJSI::${methodName}(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_Native${moduleName}SpecJSI_${methodName}(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ${returnJSType}, "${methodName}", ${selector}, args, count);
     }
 `;
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
index 1d9e6034f4baeb..e39700023e3b19 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
@@ -70,22 +70,22 @@ Map {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::difficult(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_difficult(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"difficult\\", @selector(difficult:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::optionals(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_optionals(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"optionals\\", @selector(optionals:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::optionalMethod(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"optionalMethod\\", @selector(optionalMethod:callback:extras:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getArrays(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArrays(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getArrays\\", @selector(getArrays:), args, count);
     }
 
@@ -108,7 +108,6 @@ namespace facebook {
         methodMap_[\\"getArrays\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArrays};
         setMethodArgConversionSelector(@\\"getArrays\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetArraysOptions:\\");
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -144,7 +143,6 @@ namespace facebook {
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -207,7 +205,7 @@ Map {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeAliasTurboModuleSpecJSI::cropImage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeAliasTurboModuleSpecJSI_cropImage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"cropImage\\", @selector(cropImage:), args, count);
     }
 
@@ -218,7 +216,6 @@ namespace facebook {
         methodMap_[\\"cropImage\\"] = MethodMetadata {1, __hostFunction_NativeAliasTurboModuleSpecJSI_cropImage};
         setMethodArgConversionSelector(@\\"cropImage\\", 0, @\\"JS_NativeAliasTurboModule_SpecCropImageCropData:\\");
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -257,17 +254,17 @@ Map {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI::getPhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_getPhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getPhotos\\", @selector(getPhotos:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI::saveToCameraRoll(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"saveToCameraRoll\\", @selector(saveToCameraRoll:type:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI::deletePhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_deletePhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"deletePhotos\\", @selector(deletePhotos:resolve:reject:), args, count);
     }
 
@@ -286,7 +283,6 @@ namespace facebook {
         methodMap_[\\"deletePhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_deletePhotos};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -311,27 +307,27 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::reportFatalException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportFatalException\\", @selector(reportFatalException:stack:exceptionId:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::reportSoftException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportSoftException\\", @selector(reportSoftException:stack:exceptionId:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::reportException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportException\\", @selector(reportException:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::updateExceptionMessage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"updateExceptionMessage\\", @selector(updateExceptionMessage:stack:exceptionId:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI::dismissRedbox(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"dismissRedbox\\", @selector(dismissRedbox), args, count);
     }
 
@@ -358,7 +354,6 @@ namespace facebook {
         methodMap_[\\"dismissRedbox\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -375,7 +370,7 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeImagePickerIOSSpecJSI::openCameraDialog(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"openCameraDialog\\", @selector(openCameraDialog:successCallback:cancelCallback:), args, count);
     }
 
@@ -386,7 +381,6 @@ namespace facebook {
         methodMap_[\\"openCameraDialog\\"] = MethodMetadata {1, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
         setMethodArgConversionSelector(@\\"openCameraDialog\\", 0, @\\"JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:\\");
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -425,63 +419,58 @@ Map {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
 
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
-    }
-
-
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", getConstants, args, count);
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
 
@@ -531,11 +520,6 @@ namespace facebook {
         methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
         
 
-        
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
-        
-
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -567,7 +551,7 @@ Map {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
@@ -578,7 +562,6 @@ namespace facebook {
         methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -588,7 +571,7 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
@@ -599,7 +582,6 @@ namespace facebook {
         methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -631,7 +613,7 @@ Map {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
@@ -642,7 +624,6 @@ namespace facebook {
         methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook
@@ -652,7 +633,7 @@ namespace facebook {
 namespace facebook {
   namespace react {
     
-    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI::voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
+    static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
@@ -663,7 +644,6 @@ namespace facebook {
         methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
 
-        }
     }
   } // namespace react
 } // namespace facebook

From 6d6e04619fff66a255f41a7592d43f065068a75a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 132/241] Fix ObjC++ structs and method mapping

Summary:
Adjust generated ObjC++ code to resolve a few build time and run time errors:

* Suppress CONSTANTS struct implementations
* Use type alias name as struct name when serializing arguments that involve a type alias
* Use actual number of arguments for a method when generating method map.

With these changes in place, RNTester can be built and run using the code that is generated by the new codegen.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23926500

fbshipit-source-id: 88fcbb795fd71dc8155eb26348db943975e13e84
---
 .../GenerateModuleObjCpp-test.js.snap         | 156 +++---------------
 .../GenerateModuleObjCpp/serializeMethod.js   |  16 +-
 .../source/serializeModule.js                 |   9 +-
 .../GenerateModuleMm-test.js.snap             |  41 ++---
 4 files changed, 61 insertions(+), 161 deletions(-)

diff --git a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
index 84e76d76df8679..c0df45acc209bc 100644
--- a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
+++ b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
@@ -1346,7 +1346,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getArrayWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeArrayTurboModuleSpecJSI_getArrayWithAlias};
+        methodMap_[\\"getArrayWithAlias\\"] = MethodMetadata {2, __hostFunction_NativeArrayTurboModuleSpecJSI_getArrayWithAlias};
         
 
     }
@@ -1469,7 +1469,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getValueWithPromise};
+        methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {0, __hostFunction_NativeNullableTurboModuleSpecJSI_getValueWithPromise};
         
 
     }
@@ -1522,38 +1522,6 @@ namespace facebook {
 }
 @end
 
-
-@implementation RCTCxxConvert (NativeObjectTurboModule_ConstantsEEE)
-+ (RCTManagedPointer *)JS_NativeObjectTurboModule_ConstantsEEE:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeObjectTurboModule::ConstantsEEE>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeObjectTurboModule_ConstantsEE)
-+ (RCTManagedPointer *)JS_NativeObjectTurboModule_ConstantsEE:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeObjectTurboModule::ConstantsEE>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeObjectTurboModule_ConstantsE)
-+ (RCTManagedPointer *)JS_NativeObjectTurboModule_ConstantsE:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeObjectTurboModule::ConstantsE>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeObjectTurboModule_Constants)
-+ (RCTManagedPointer *)JS_NativeObjectTurboModule_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeObjectTurboModule::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -1601,7 +1569,7 @@ namespace facebook {
         setMethodArgConversionSelector(@\\"difficultObject\\", 0, @\\"JS_NativeObjectTurboModule_SpecDifficultObjectA:\\");
 
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants};
         
 
     }
@@ -1610,37 +1578,6 @@ namespace facebook {
 
 
 
-@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_ConstantsEEE)
-+ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_ConstantsEEE:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::ConstantsEEE>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_ConstantsEE)
-+ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_ConstantsEE:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::ConstantsEE>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_ConstantsE)
-+ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_ConstantsE:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::ConstantsE>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeOptionalObjectTurboModule_Constants)
-+ (RCTManagedPointer *)JS_NativeOptionalObjectTurboModule_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeOptionalObjectTurboModule::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -1652,7 +1589,7 @@ namespace facebook {
     NativeOptionalObjectTurboModuleSpecJSI::NativeOptionalObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants};
         
 
     }
@@ -1705,14 +1642,6 @@ namespace facebook {
 }
 @end
 
-
-@implementation RCTCxxConvert (NativeSampleTurboModule_Constants)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeSampleTurboModule::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -1784,7 +1713,7 @@ namespace facebook {
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
 
         
@@ -1813,14 +1742,14 @@ namespace facebook {
 
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getAlias};
-        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetAliasArg:\\");
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModule_Animal:\\");
 
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
         
 
         
-        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
+        methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
         
 
         
@@ -1832,7 +1761,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
         
 
     }
@@ -1841,21 +1770,6 @@ namespace facebook {
 
 
 
-@implementation RCTCxxConvert (NativeSampleTurboModuleArrays_ConstantsIdElement)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModuleArrays_ConstantsIdElement:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeSampleTurboModuleArrays::ConstantsIdElement>(json);
-}
-@end
-
-
-@implementation RCTCxxConvert (NativeSampleTurboModuleArrays_Constants)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModuleArrays_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeSampleTurboModuleArrays::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -1927,7 +1841,7 @@ namespace facebook {
     NativeSampleTurboModuleArraysSpecJSI::NativeSampleTurboModuleArraysSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_voidFunc};
         
 
         
@@ -1963,7 +1877,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValue};
+        methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValue};
         
 
         
@@ -1975,7 +1889,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants};
         
 
     }
@@ -1999,14 +1913,6 @@ namespace facebook {
 }
 @end
 
-
-@implementation RCTCxxConvert (NativeSampleTurboModuleNullable_Constants)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullable::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -2078,7 +1984,7 @@ namespace facebook {
     NativeSampleTurboModuleNullableSpecJSI::NativeSampleTurboModuleNullableSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_voidFunc};
         
 
         
@@ -2107,14 +2013,14 @@ namespace facebook {
 
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getAlias};
-        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullable_SpecGetAliasArg:\\");
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullable_Animal:\\");
 
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getRootTag};
         
 
         
-        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValue};
+        methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValue};
         
 
         
@@ -2126,7 +2032,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants};
         
 
     }
@@ -2150,14 +2056,6 @@ namespace facebook {
 }
 @end
 
-
-@implementation RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_Constants)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullableAndOptional::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -2229,7 +2127,7 @@ namespace facebook {
     NativeSampleTurboModuleNullableAndOptionalSpecJSI::NativeSampleTurboModuleNullableAndOptionalSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_voidFunc};
         
 
         
@@ -2258,14 +2156,14 @@ namespace facebook {
 
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getAlias};
-        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullableAndOptional_SpecGetAliasArg:\\");
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullableAndOptional_Animal:\\");
 
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getRootTag};
         
 
         
-        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValue};
+        methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValue};
         
 
         
@@ -2277,7 +2175,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants};
         
 
     }
@@ -2301,14 +2199,6 @@ namespace facebook {
 }
 @end
 
-
-@implementation RCTCxxConvert (NativeSampleTurboModuleOptional_Constants)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeSampleTurboModuleOptional::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -2380,7 +2270,7 @@ namespace facebook {
     NativeSampleTurboModuleOptionalSpecJSI::NativeSampleTurboModuleOptionalSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_voidFunc};
         
 
         
@@ -2409,14 +2299,14 @@ namespace facebook {
 
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getAlias};
-        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleOptional_SpecGetAliasArg:\\");
+        setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleOptional_Animal:\\");
 
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getRootTag};
         
 
         
-        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValue};
+        methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValue};
         
 
         
@@ -2428,7 +2318,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants};
         
 
     }
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
index 46f77f64437f3e..bec84f59d6de76 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
@@ -51,6 +51,7 @@ export type MethodSerializationOutput = $ReadOnly<{|
   selector: string,
   structParamRecords: $ReadOnlyArray<StructParameterRecord>,
   returnJSType: ReturnJSType,
+  argCount: number,
 |}>;
 
 function serializeMethod(
@@ -77,7 +78,7 @@ function serializeMethod(
   const structParamRecords: Array<StructParameterRecord> = [];
 
   params.forEach((param, index) => {
-    const structName = `Spec${capitalize(methodName)}${capitalize(param.name)}`;
+    const structName = getParamStructName(methodName, param);
     const {objCType, isStruct} = getParamObjCType(
       moduleName,
       methodName,
@@ -145,10 +146,22 @@ function serializeMethod(
       selector: `@selector(${selector})`,
       structParamRecords,
       returnJSType,
+      argCount: params.length,
     },
   ];
 }
 
+function getParamStructName(
+  methodName: string,
+  param: NativeModuleMethodParamSchema,
+): string {
+  if (param.typeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    return param.typeAnnotation.name;
+  }
+
+  return `Spec${capitalize(methodName)}${capitalize(param.name)}`;
+}
+
 function getParamObjCType(
   moduleName: string,
   methodName: string,
@@ -403,6 +416,7 @@ function serializeConstantsProtocolMethods(
         returnJSType: 'ObjectKind',
         selector: `@selector(${methodName})`,
         structParamRecords: [],
+        argCount: 0,
       };
     },
   );
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
index d45f296eadef38..72013475009fbe 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
@@ -46,11 +46,12 @@ namespace facebook {
     Native${moduleName}SpecJSI::Native${moduleName}SpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         ${methodSerializationOutputs
-          .map(({methodName, structParamRecords}) =>
+          .map(({methodName, structParamRecords, argCount}) =>
             MethodMapEntryTemplate({
               moduleName,
               methodName,
               structParamRecords,
+              argCount,
             }),
           )
           .join('\n' + ' '.repeat(8))}
@@ -94,12 +95,14 @@ const MethodMapEntryTemplate = ({
   moduleName,
   methodName,
   structParamRecords,
+  argCount,
 }: $ReadOnly<{|
   moduleName: string,
   methodName: string,
   structParamRecords: $ReadOnlyArray<StructParameterRecord>,
+  argCount: number,
 |}>) => `
-        methodMap_["${methodName}"] = MethodMetadata {1, __hostFunction_Native${moduleName}SpecJSI_${methodName}};
+        methodMap_["${methodName}"] = MethodMetadata {${argCount}, __hostFunction_Native${moduleName}SpecJSI_${methodName}};
         ${structParamRecords
           .map(({paramIndex, structName}) => {
             return `setMethodArgConversionSelector(@"${methodName}", ${paramIndex}, @"JS_Native${moduleName}_${structName}:");`;
@@ -114,7 +117,7 @@ function serializeModuleSource(
 ): string {
   return ModuleTemplate({
     moduleName,
-    structs,
+    structs: structs.filter(({context}) => context !== 'CONSTANTS'),
     methodSerializationOutputs,
   });
 }
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
index e39700023e3b19..53e98c9fdf939a 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
@@ -101,7 +101,7 @@ namespace facebook {
         setMethodArgConversionSelector(@\\"optionals\\", 0, @\\"JS_NativeSampleTurboModule_SpecOptionalsA:\\");
 
         
-        methodMap_[\\"optionalMethod\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod};
+        methodMap_[\\"optionalMethod\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod};
         
 
         
@@ -214,7 +214,7 @@ namespace facebook {
       : ObjCTurboModule(params) {
         
         methodMap_[\\"cropImage\\"] = MethodMetadata {1, __hostFunction_NativeAliasTurboModuleSpecJSI_cropImage};
-        setMethodArgConversionSelector(@\\"cropImage\\", 0, @\\"JS_NativeAliasTurboModule_SpecCropImageCropData:\\");
+        setMethodArgConversionSelector(@\\"cropImage\\", 0, @\\"JS_NativeAliasTurboModule_Options:\\");
 
     }
   } // namespace react
@@ -273,10 +273,10 @@ namespace facebook {
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getPhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_getPhotos};
-        setMethodArgConversionSelector(@\\"getPhotos\\", 0, @\\"JS_NativeCameraRollManager_SpecGetPhotosParams:\\");
+        setMethodArgConversionSelector(@\\"getPhotos\\", 0, @\\"JS_NativeCameraRollManager_GetPhotosParams:\\");
 
         
-        methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll};
+        methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {2, __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll};
         
 
         
@@ -335,23 +335,23 @@ namespace facebook {
     NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"reportFatalException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException};
+        methodMap_[\\"reportFatalException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException};
         
 
         
-        methodMap_[\\"reportSoftException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException};
+        methodMap_[\\"reportSoftException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException};
         
 
         
         methodMap_[\\"reportException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportException};
-        setMethodArgConversionSelector(@\\"reportException\\", 0, @\\"JS_NativeExceptionsManager_SpecReportExceptionData:\\");
+        setMethodArgConversionSelector(@\\"reportException\\", 0, @\\"JS_NativeExceptionsManager_ExceptionData:\\");
 
         
-        methodMap_[\\"updateExceptionMessage\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage};
+        methodMap_[\\"updateExceptionMessage\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage};
         
 
         
-        methodMap_[\\"dismissRedbox\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
+        methodMap_[\\"dismissRedbox\\"] = MethodMetadata {0, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
         
 
     }
@@ -378,7 +378,7 @@ namespace facebook {
     NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"openCameraDialog\\"] = MethodMetadata {1, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
+        methodMap_[\\"openCameraDialog\\"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
         setMethodArgConversionSelector(@\\"openCameraDialog\\", 0, @\\"JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:\\");
 
     }
@@ -409,13 +409,6 @@ Map {
 
 
 
-@implementation RCTCxxConvert (NativeSampleTurboModule_Constants)
-+ (RCTManagedPointer *)JS_NativeSampleTurboModule_Constants:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeSampleTurboModule::Constants>(json);
-}
-@end
-
 namespace facebook {
   namespace react {
     
@@ -477,7 +470,7 @@ namespace facebook {
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
 
         
@@ -505,7 +498,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getValue\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
+        methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
         
 
         
@@ -517,7 +510,7 @@ namespace facebook {
         
 
         
-        methodMap_[\\"getConstants\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+        methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
         
 
     }
@@ -559,7 +552,7 @@ namespace facebook {
     NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
         
 
     }
@@ -579,7 +572,7 @@ namespace facebook {
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
 
     }
@@ -621,7 +614,7 @@ namespace facebook {
     NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
         
 
     }
@@ -641,7 +634,7 @@ namespace facebook {
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
-        methodMap_[\\"voidFunc\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+        methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
 
     }

From 6e6443afd04a847ef23fb6254a84e48c70b45896 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 29 Sep 2020 14:33:06 -0700
Subject: [PATCH 133/241] Remove header_namespace from module codegen target
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Making this change because I see this error when compiling Internationalization
```
➜  fbsource buck build //xplat/js/RKJSModules/Libraries/Internationalization:generated_objcpp_modules-InternationalizationApple
buck-out/gen/33fbdb84/xplat/js/RKJSModules/Libraries/Internationalization/generate_module_mm-Internationalization/FBReactNativeInternationalizationSpec-generated.mm:15:9: fatal error: 'FBReactNativeInternationalizationSpec.h' file not found
#import "FBReactNativeInternationalizationSpec.h"
        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
1 error generated.
Command failed with exit code 1.

command: [/Applications/Xcode_11.6.0_fb.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++, @/Users/ramanpreet/fbsource/buck-out/bin/33fbdb84/xplat/js/RKJSModules/Libraries/Internationalization/generated_objcpp_modules-InternationalizationApple#compile-FBReactNativeInternationalizationSpec-generated.mm.o...
```

Since the header namespace is "FBReactNativeInternationalizationSpec", we can only import the header file via "FBReactNativeInternationalizationSpec/FBReactNativeInternationalizationSpec.h", according to this buck documentation: https://buck.build/rule/cxx_library.html#headers. Not entirely sure how this target compiled before.

The legacy codegen buck target also set the header namespace to "": https://fburl.com/diffusion/3p85qhf9.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23978436

fbshipit-source-id: c9cd7c710edf94df6df10778f8603870f92275a7
---
 packages/react-native-codegen/DEFS.bzl | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/react-native-codegen/DEFS.bzl b/packages/react-native-codegen/DEFS.bzl
index 33abd24eeaffe5..4da9f3c420c39e 100644
--- a/packages/react-native-codegen/DEFS.bzl
+++ b/packages/react-native-codegen/DEFS.bzl
@@ -50,7 +50,7 @@ def rn_codegen_modules(
 
     rn_xplat_cxx_library(
         name = "generated_objcpp_modules-{}".format(name),
-        header_namespace = native_module_spec_name,
+        header_namespace = "",
         apple_sdks = (IOS),
         compiler_flags = [
             "-fexceptions",
@@ -61,8 +61,7 @@ def rn_codegen_modules(
         fbobjc_compiler_flags = get_apple_compiler_flags(),
         fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
         ios_exported_headers = {
-            "{}.h".format(native_module_spec_name): ":{}".format(generate_module_hobjcpp_name),
-            "{}-generated.mm".format(native_module_spec_name): ":{}".format(generate_module_mm_name),
+            "{}/{}.h".format(native_module_spec_name, native_module_spec_name): ":{}".format(generate_module_hobjcpp_name),
         },
         ios_headers = [
             ":{}".format(generate_module_hobjcpp_name),

From 521b16730dd07d80261086c2f33eed2a766d404e Mon Sep 17 00:00:00 2001
From: Tommy Nguyen <tonguye@microsoft.com>
Date: Tue, 29 Sep 2020 15:54:39 -0700
Subject: [PATCH 134/241] Align multi-line TextInput onSubmitEditing behavior
 (#29177)

Summary:
Aligns behavior to be consistent with Android and the [documentation](https://reactnative.dev/docs/textinput#bluronsubmit). `onSubmitEditing` should not be called when `blurOnSubmit=false`.

## Changelog

[iOS] [Fixed] - Align multi-line TextInput onSubmitEditing behavior

Pull Request resolved: https://github.com/facebook/react-native/pull/29177

Test Plan: ![textinput-blur-align](https://user-images.githubusercontent.com/4123478/85121116-85b4b200-b224-11ea-86c5-065e9e6d22ba.gif)

Reviewed By: shergin

Differential Revision: D22488870

Pulled By: hramos

fbshipit-source-id: 2dec3a55da6384389a8358896ef1fbfd806d0304
---
 Libraries/Text/TextInput/RCTBaseTextInputView.m | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 01ab7f19d12267..e8b87f333ddcec 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -365,11 +365,13 @@ - (BOOL)textInputShouldReturn
   // `onSubmitEditing` is called when "Submit" button
   // (the blue key on onscreen keyboard) did pressed
   // (no connection to any specific "submitting" process).
-  [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
-                                 reactTag:self.reactTag
-                                     text:[self.backedTextInputView.attributedText.string copy]
-                                      key:nil
-                               eventCount:_nativeEventCount];
+  if (_blurOnSubmit) {
+    [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
+                                   reactTag:self.reactTag
+                                       text:[self.backedTextInputView.attributedText.string copy]
+                                        key:nil
+                                 eventCount:_nativeEventCount];
+  }
 
   return _blurOnSubmit;
 }

From ca51dc6288eb8c8df197239cd53dff649da4e50d Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Tue, 29 Sep 2020 16:35:44 -0700
Subject: [PATCH 135/241] Fix mutation sorting function

Summary:
The sorting function currently forms a partial ordering, not a total ordering. This can cause problems with certain sequences of immediate or conflicting mutations, leading to UI corruption or crashes.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24002668

fbshipit-source-id: edc9b4c1e3104897cb0c5fd6da563ec43d800494
---
 .../LayoutAnimationKeyFrameManager.h           | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
index e6aba6e3c07bcd..891d25d46d11ea 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
@@ -308,6 +308,14 @@ static inline bool shouldFirstComeBeforeSecondMutation(
       return true;
     }
 
+    // Update comes last, before deletes
+    if (rhs.type == ShadowViewMutation::Type::Update) {
+      return true;
+    }
+    if (lhs.type == ShadowViewMutation::Type::Update) {
+      return false;
+    }
+
     // Remove comes before insert
     if (lhs.type == ShadowViewMutation::Type::Remove &&
         rhs.type == ShadowViewMutation::Type::Insert) {
@@ -317,6 +325,16 @@ static inline bool shouldFirstComeBeforeSecondMutation(
         lhs.type == ShadowViewMutation::Type::Insert) {
       return false;
     }
+
+    // Create comes before insert
+    if (lhs.type == ShadowViewMutation::Type::Create &&
+        rhs.type == ShadowViewMutation::Type::Insert) {
+      return true;
+    }
+    if (rhs.type == ShadowViewMutation::Type::Create &&
+        lhs.type == ShadowViewMutation::Type::Insert) {
+      return false;
+    }
   } else {
     // Make sure that removes on the same level are sorted - highest indices
     // must come first.

From b931bd33fee1a2a1fb4e26fcd5a469c16bfe425d Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 29 Sep 2020 18:38:24 -0700
Subject: [PATCH 136/241] TurboModule Android: properly set up RNTester
 ndkBuild and cleanup dependencies

Summary:
Before RNTester compilation starts, it needs to wait for :ReactAndroid NDK build to finish, so that it knows where to find the exported .so files. This tells the `preBuild` task to depends on `:ReactAndroid:prepareReactNdkLibs` task. The .so files are now copied over to the local project build dir, instead of depending on :ReactAndroid's build dir.

For cleanup, the reverse ordering is needed: before `clean` removed our temp dir to store the copied .so files, make sure the ndkBuild cleanup tasks execute beforehand.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23982989

fbshipit-source-id: 955d7c9bccb5855b6b066fca89764df2ede89f63
---
 ReactAndroid/Android-prebuilt.mk            |  2 +-
 packages/rn-tester/android/app/build.gradle | 83 ++++++++++++++-------
 2 files changed, 57 insertions(+), 28 deletions(-)

diff --git a/ReactAndroid/Android-prebuilt.mk b/ReactAndroid/Android-prebuilt.mk
index 4a4fb45ee1ff5b..394032a524ab95 100644
--- a/ReactAndroid/Android-prebuilt.mk
+++ b/ReactAndroid/Android-prebuilt.mk
@@ -24,7 +24,7 @@ REACT_ANDROID_SRC_DIR := $(REACT_ANDROID_DIR)/src/main
 REACT_COMMON_DIR := $(REACT_ANDROID_DIR)/../ReactCommon
 REACT_GENERATED_SRC_DIR := $(REACT_ANDROID_BUILD_DIR)/generated/source
 # Note: this only have .so, not .a
-REACT_NDK_EXPORT_DIR := $(REACT_ANDROID_BUILD_DIR)/react-ndk/exported
+REACT_NDK_EXPORT_DIR := $(PROJECT_BUILD_DIR)/react-ndk/exported
 
 # fb
 include $(CLEAR_VARS)
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index 2e70e9014a3d9b..fe95b03be0ccaf 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -186,33 +186,6 @@ android {
     }
 }
 
-if (enableCodegen) {
-    def reactAndroidProjectDir = project(':ReactAndroid').projectDir;
-    android {
-        defaultConfig {
-            externalNativeBuild {
-                ndkBuild {
-                    abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a"
-                    arguments "APP_PLATFORM=android-16",
-                            "APP_STL=c++_shared",
-                            "NDK_TOOLCHAIN_VERSION=clang",
-                            // The following paths assume building React Native from source.
-                            "GENERATED_SRC_DIR=$buildDir/generated/source",
-                            "REACT_ANDROID_DIR=$reactAndroidProjectDir"
-                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
-                    cppFlags "-std=c++1y"
-                    targets "rntester_appmodules"
-                }
-            }
-        }
-        externalNativeBuild {
-            ndkBuild {
-                path "$projectDir/src/main/jni/Android.mk"
-            }
-        }
-    }
-}
-
 configurations {
   hermesDebugImplementation {}
   hermesReleaseImplementation {}
@@ -258,3 +231,59 @@ react {
     reactNativeRootDir = file("$rootDir")
     useJavaGenerator = System.getenv("USE_CODEGEN_JAVAPOET") ?: false
 }
+
+if (enableCodegen) {
+    // TODO: Move all this logic to CodegenPlugin.java.
+    def reactAndroidProjectDir = project(':ReactAndroid').projectDir;
+    def reactAndroidBuildDir = project(':ReactAndroid').buildDir;
+
+    android {
+        defaultConfig {
+            externalNativeBuild {
+                ndkBuild {
+                    abiFilters "armeabi-v7a", "x86", "x86_64", "arm64-v8a"
+                    arguments "APP_PLATFORM=android-16",
+                            "APP_STL=c++_shared",
+                            "NDK_TOOLCHAIN_VERSION=clang",
+                            // The following paths assume building React Native from source.
+                            "GENERATED_SRC_DIR=$buildDir/generated/source",
+                            "PROJECT_BUILD_DIR=$buildDir",
+                            "REACT_ANDROID_DIR=$reactAndroidProjectDir"
+                    cFlags "-Wall", "-Werror", "-fexceptions", "-frtti", "-DWITH_INSPECTOR=1"
+                    cppFlags "-std=c++1y"
+                    targets "rntester_appmodules"
+                }
+            }
+        }
+        externalNativeBuild {
+            ndkBuild {
+                path "$projectDir/src/main/jni/Android.mk"
+            }
+        }
+    }
+
+    def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) {
+        // TODO: handle extracting .so from prebuilt :ReactAndroid.
+        dependsOn(":ReactAndroid:packageReactNdkLibs")
+        from("$reactAndroidBuildDir/react-ndk/exported")
+        into("$buildDir/react-ndk/exported")
+    }
+
+    def cleanProjectNdkBuild = tasks.register("cleanProjectNdkBuild", Exec) {
+        ignoreExitValue(true)
+        tasks.forEach {
+            t ->
+                if (t.name.startsWith("externalNativeBuildClean")) {
+                    dependsOn(t);
+                }
+        }
+        // This .cxx folder may cause stale ndkBuild configuration.
+        // See https://stackoverflow.com/a/58288851.
+        commandLine("rm", "-rf", "$projectDir/.cxx")
+    }
+
+    afterEvaluate {
+        preBuild.dependsOn(packageReactNdkLibs)
+        clean.dependsOn(cleanProjectNdkBuild)
+    }
+}

From b9a1ea9e9e4586f3ae3e06709193c621c295ecd7 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 29 Sep 2020 18:38:24 -0700
Subject: [PATCH 137/241] TurboModule Android: move SampleTurboModule impl and
 spec to OSS

Summary:
This is the Java/JNI impl of the NativeSampleTurboModule.js, just like on iOS. The files here are supposed to be generated by the react-native-codegen, but they are checked in to the repo for easier build integration with RNTester.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D23985746

fbshipit-source-id: 46340d778f3d964efe5b538d15ebe0f2cab04862
---
 ReactCommon/ReactCommon.podspec               |   2 +-
 ReactCommon/react/nativemodule/samples/BUCK   |  32 ++-
 .../NativeSampleTurboCxxModuleSpecJSI.cpp     |   0
 .../NativeSampleTurboCxxModuleSpecJSI.h       |   0
 .../SampleTurboCxxModule.cpp                  |   0
 .../{ => ReactCommon}/SampleTurboCxxModule.h  |   0
 .../android/NativeSampleTurboModuleSpec.java  |  91 ++++++++
 .../ReactCommon/SampleTurboModuleSpec.cpp     | 200 ++++++++++++++++++
 .../ReactCommon/SampleTurboModuleSpec.h       |  29 +++
 .../platform/android/SampleTurboModule.java   | 186 ++++++++++++++++
 packages/rn-tester/Podfile.lock               |   2 +-
 11 files changed, 536 insertions(+), 6 deletions(-)
 rename ReactCommon/react/nativemodule/samples/{ => ReactCommon}/NativeSampleTurboCxxModuleSpecJSI.cpp (100%)
 rename ReactCommon/react/nativemodule/samples/{ => ReactCommon}/NativeSampleTurboCxxModuleSpecJSI.h (100%)
 rename ReactCommon/react/nativemodule/samples/{ => ReactCommon}/SampleTurboCxxModule.cpp (100%)
 rename ReactCommon/react/nativemodule/samples/{ => ReactCommon}/SampleTurboCxxModule.h (100%)
 create mode 100644 ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java
 create mode 100644 ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp
 create mode 100644 ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h
 create mode 100644 ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java

diff --git a/ReactCommon/ReactCommon.podspec b/ReactCommon/ReactCommon.podspec
index 0c083cf2d5b133..c49fbd8c2c5459 100644
--- a/ReactCommon/ReactCommon.podspec
+++ b/ReactCommon/ReactCommon.podspec
@@ -54,7 +54,7 @@ Pod::Spec.new do |s|
     end
 
     ss.subspec "samples" do |sss|
-      sss.source_files = "react/nativemodule/samples/*.{cpp,h}",
+      sss.source_files = "react/nativemodule/samples/ReactCommon/**/*.{cpp,h}",
                          "react/nativemodule/samples/platform/ios/**/*.{mm,cpp,h}"
       sss.dependency "ReactCommon/turbomodule/core", version
     end
diff --git a/ReactCommon/react/nativemodule/samples/BUCK b/ReactCommon/react/nativemodule/samples/BUCK
index c760c2f06218ab..b6b0fe3b974e52 100644
--- a/ReactCommon/react/nativemodule/samples/BUCK
+++ b/ReactCommon/react/nativemodule/samples/BUCK
@@ -1,13 +1,15 @@
 load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_preprocessor_flags_for_build_mode", "get_static_library_ios_flags")
-load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "react_native_target", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob")
+load("//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "APPLE", "FBJNI_TARGET", "react_native_dep", "react_native_target", "react_native_xplat_target", "rn_android_library", "rn_xplat_cxx_library", "subdir_glob")
 
 rn_xplat_cxx_library(
     name = "samples",
-    srcs = glob(["*.cpp"]),
+    srcs = glob(
+        ["ReactCommon/**/*.cpp"],
+    ),
     header_namespace = "",
     exported_headers = subdir_glob(
         [
-            ("", "*.h"),
+            ("ReactCommon", "*.h"),
         ],
         prefix = "ReactCommon",
     ),
@@ -19,10 +21,11 @@ rn_xplat_cxx_library(
     ],
     fbandroid_deps = [
         react_native_target("jni/react/jni:jni"),
+        FBJNI_TARGET,
     ],
     fbandroid_exported_headers = subdir_glob(
         [
-            ("platform/android", "*.h"),
+            ("platform/android/ReactCommon", "*.h"),
         ],
         prefix = "ReactCommon",
     ),
@@ -78,3 +81,24 @@ rn_xplat_cxx_library(
         react_native_xplat_target("react/nativemodule/core:core"),
     ],
 )
+
+rn_android_library(
+    name = "impl",
+    srcs = glob(["platform/android/*.java"]),
+    required_for_source_only_abi = True,
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        "//fbandroid/java/com/facebook/debug/log:log",
+        react_native_dep("third-party/java/jsr-305:jsr-305"),
+        react_native_dep("third-party/java/jsr-330:jsr-330"),
+        react_native_target("java/com/facebook/react/bridge:bridge"),
+        react_native_target("java/com/facebook/react/common:common"),
+        react_native_target("java/com/facebook/react/module/annotations:annotations"),
+        ":samples",
+    ],
+    exported_deps = [
+        react_native_target("java/com/facebook/react/turbomodule/core/interfaces:interfaces"),
+    ],
+)
diff --git a/ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp b/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.cpp
rename to ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.cpp
diff --git a/ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.h b/ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.h
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/NativeSampleTurboCxxModuleSpecJSI.h
rename to ReactCommon/react/nativemodule/samples/ReactCommon/NativeSampleTurboCxxModuleSpecJSI.h
diff --git a/ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.cpp b/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.cpp
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.cpp
rename to ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.cpp
diff --git a/ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.h b/ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.h
similarity index 100%
rename from ReactCommon/react/nativemodule/samples/SampleTurboCxxModule.h
rename to ReactCommon/react/nativemodule/samples/ReactCommon/SampleTurboCxxModule.h
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java b/ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java
new file mode 100644
index 00000000000000..8475fbc4711299
--- /dev/null
+++ b/ReactCommon/react/nativemodule/samples/platform/android/NativeSampleTurboModuleSpec.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// NOTE: This entire file should be codegen'ed.
+
+package com.facebook.fbreact.specs;
+
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReactModuleWithSpec;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.common.build.ReactBuildConfig;
+import com.facebook.react.turbomodule.core.interfaces.TurboModule;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import javax.annotation.Nullable;
+
+public abstract class NativeSampleTurboModuleSpec extends ReactContextBaseJavaModule
+    implements ReactModuleWithSpec, TurboModule {
+  public NativeSampleTurboModuleSpec(ReactApplicationContext reactContext) {
+    super(reactContext);
+  }
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract double getNumber(double arg);
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract WritableMap getValue(double x, String y, ReadableMap z);
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract WritableMap getObject(ReadableMap arg);
+
+  @ReactMethod
+  public abstract void voidFunc();
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract WritableArray getArray(ReadableArray arg);
+
+  @ReactMethod
+  public abstract void getValueWithPromise(boolean error, Promise promise);
+
+  @ReactMethod
+  public abstract void getValueWithCallback(Callback callback);
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract String getString(String arg);
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract double getRootTag(double arg);
+
+  @ReactMethod(isBlockingSynchronousMethod = true)
+  public abstract boolean getBool(boolean arg);
+
+  protected abstract Map<String, Object> getTypedExportedConstants();
+
+  @Override
+  public final @Nullable Map<String, Object> getConstants() {
+    Map<String, Object> constants = getTypedExportedConstants();
+    if (ReactBuildConfig.DEBUG || ReactBuildConfig.IS_INTERNAL_BUILD) {
+      Set<String> obligatoryFlowConstants =
+          new HashSet<>(Arrays.asList("const2", "const1", "const3"));
+      Set<String> optionalFlowConstants = new HashSet<>();
+      Set<String> undeclaredConstants = new HashSet<>(constants.keySet());
+      undeclaredConstants.removeAll(obligatoryFlowConstants);
+      undeclaredConstants.removeAll(optionalFlowConstants);
+      if (!undeclaredConstants.isEmpty()) {
+        throw new IllegalStateException(
+            String.format("Native Module Flow doesn't declare constants: %s", undeclaredConstants));
+      }
+      undeclaredConstants = obligatoryFlowConstants;
+      undeclaredConstants.removeAll(constants.keySet());
+      if (!undeclaredConstants.isEmpty()) {
+        throw new IllegalStateException(
+            String.format("Native Module doesn't fill in constants: %s", undeclaredConstants));
+      }
+    }
+    return constants;
+  }
+}
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp
new file mode 100644
index 00000000000000..b1c6922e3bb800
--- /dev/null
+++ b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp
@@ -0,0 +1,200 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// NOTE: This entire file should be codegen'ed.
+
+#include <ReactCommon/SampleTurboModuleSpec.h>
+
+namespace facebook {
+namespace react {
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(rt, VoidKind, "voidFunc", "()V", args, count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getBool(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(rt, BooleanKind, "getBool", "(Z)Z", args, count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(rt, NumberKind, "getNumber", "(D)D", args, count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getString(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(
+          rt,
+          StringKind,
+          "getString",
+          "(Ljava/lang/String;)Ljava/lang/String;",
+          args,
+          count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getArray(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(
+          rt,
+          ArrayKind,
+          "getArray",
+          "(Lcom/facebook/react/bridge/ReadableArray;)Lcom/facebook/react/bridge/WritableArray;",
+          args,
+          count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getObject(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(
+          rt,
+          ObjectKind,
+          "getObject",
+          "(Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/bridge/WritableMap;",
+          args,
+          count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(rt, NumberKind, "getRootTag", "(D)D", args, count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getValue(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(
+          rt,
+          ObjectKind,
+          "getValue",
+          "(DLjava/lang/String;Lcom/facebook/react/bridge/ReadableMap;)Lcom/facebook/react/bridge/WritableMap;",
+          args,
+          count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(
+          rt,
+          VoidKind,
+          "getValueWithCallback",
+          "(Lcom/facebook/react/bridge/Callback;)V",
+          args,
+          count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(
+          rt,
+          PromiseKind,
+          "getValueWithPromise",
+          "(ZLcom/facebook/react/bridge/Promise;)V",
+          args,
+          count);
+}
+
+static facebook::jsi::Value
+__hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(
+    facebook::jsi::Runtime &rt,
+    TurboModule &turboModule,
+    const facebook::jsi::Value *args,
+    size_t count) {
+  return static_cast<JavaTurboModule &>(turboModule)
+      .invokeJavaMethod(
+          rt, ObjectKind, "getConstants", "()Ljava/util/Map;", args, count);
+}
+
+NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(
+    const JavaTurboModule::InitParams &params)
+    : JavaTurboModule(params) {
+  methodMap_["voidFunc"] =
+      MethodMetadata{0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
+
+  methodMap_["getBool"] =
+      MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
+
+  methodMap_["getNumber"] = MethodMetadata{
+      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
+
+  methodMap_["getString"] = MethodMetadata{
+      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
+
+  methodMap_["getArray"] =
+      MethodMetadata{1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
+
+  methodMap_["getObject"] = MethodMetadata{
+      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
+
+  methodMap_["getRootTag"] = MethodMetadata{
+      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
+
+  methodMap_["getValue"] =
+      MethodMetadata{3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
+
+  methodMap_["getValueWithCallback"] = MethodMetadata{
+      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
+
+  methodMap_["getValueWithPromise"] = MethodMetadata{
+      1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
+
+  methodMap_["getConstants"] = MethodMetadata{
+      0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h
new file mode 100644
index 00000000000000..fd8f6c3c87eb10
--- /dev/null
+++ b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// NOTE: This entire file should be codegen'ed.
+
+#pragma once
+
+#include <ReactCommon/JavaTurboModule.h>
+#include <ReactCommon/TurboModule.h>
+#include <fbjni/fbjni.h>
+
+namespace facebook {
+namespace react {
+
+/**
+ * C++ class for module 'SampleTurboModule'
+ */
+
+class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public JavaTurboModule {
+ public:
+  NativeSampleTurboModuleSpecJSI(const JavaTurboModule::InitParams &params);
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java b/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java
new file mode 100644
index 00000000000000..bc357d2baa3d9b
--- /dev/null
+++ b/ReactCommon/react/nativemodule/samples/platform/android/SampleTurboModule.java
@@ -0,0 +1,186 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+package com.facebook.fbreact.specs;
+
+import android.app.Activity;
+import android.util.DisplayMetrics;
+import android.widget.Toast;
+import com.facebook.proguard.annotations.DoNotStrip;
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.Callback;
+import com.facebook.react.bridge.Promise;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReadableArray;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.bridge.WritableNativeArray;
+import com.facebook.react.bridge.WritableNativeMap;
+import com.facebook.react.common.MapBuilder;
+import com.facebook.react.module.annotations.ReactModule;
+import java.util.HashMap;
+import java.util.Map;
+
+@ReactModule(name = SampleTurboModule.NAME)
+public class SampleTurboModule extends NativeSampleTurboModuleSpec {
+
+  public static final String NAME = "SampleTurboModule";
+
+  private static final String TAG = SampleTurboModule.class.getName();
+  private final ReactApplicationContext mContext;
+  private Toast mToast;
+
+  public SampleTurboModule(ReactApplicationContext context) {
+    super(context);
+    mContext = context;
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public boolean getBool(boolean arg) {
+    log("getBool", arg, arg);
+    return arg;
+  }
+
+  @Override
+  protected Map<String, Object> getTypedExportedConstants() {
+    Map<String, Object> result = new HashMap<>();
+    DisplayMetrics displayMetrics = new DisplayMetrics();
+    Activity activity = mContext.getCurrentActivity();
+    if (activity != null) {
+      activity.getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+      result.put("const2", displayMetrics.widthPixels);
+    }
+    result.put("const1", true);
+    result.put("const3", "something");
+    log("constantsToExport", "", result);
+    return result;
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public double getNumber(double arg) {
+    log("getNumber", arg, arg);
+    return arg;
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public String getString(String arg) {
+    log("getString", arg, arg);
+    return arg;
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public double getRootTag(double arg) {
+    log("getRootTag", arg, arg);
+    return arg;
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public void voidFunc() {
+    log("voidFunc", "<void>", "<void>");
+    return;
+  }
+
+  // This function returns {@link WritableMap} instead of {@link Map} for backward compat with
+  // existing native modules that use this Writable* as return types or in events. {@link
+  // WritableMap} is modified in the Java side, and read (or consumed) on the C++ side.
+  // In the future, all native modules should ideally return an immutable Map
+  @DoNotStrip
+  @Override
+  @SuppressWarnings("unused")
+  public WritableMap getObject(ReadableMap arg) {
+    WritableNativeMap map = new WritableNativeMap();
+    map.merge(arg);
+    log("getObject", arg, map);
+    return map;
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public WritableMap getValue(double numberArg, String stringArg, ReadableMap mapArg) {
+    WritableMap map = new WritableNativeMap();
+    map.putDouble("x", numberArg);
+    map.putString("y", stringArg);
+    WritableMap zMap = new WritableNativeMap();
+    zMap.merge(mapArg);
+    map.putMap("z", zMap);
+    log(
+        "getValue",
+        MapBuilder.of("1-numberArg", numberArg, "2-stringArg", stringArg, "3-mapArg", mapArg),
+        map);
+    return map;
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public void getValueWithCallback(final Callback callback) {
+    String result = "Value From Callback";
+    log("Callback", "Return Time", result);
+    callback.invoke(result);
+  }
+
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  @Override
+  public WritableArray getArray(ReadableArray arg) {
+    if (arg == null || Arguments.toList(arg) == null) {
+      // Returning an empty array, since the super class always returns non-null
+      return new WritableNativeArray();
+    }
+    WritableArray result = Arguments.makeNativeArray(Arguments.toList(arg));
+    log("getArray", arg, result);
+    return result;
+  }
+
+  @Override
+  @DoNotStrip
+  @SuppressWarnings("unused")
+  public void getValueWithPromise(boolean error, Promise promise) {
+    if (error) {
+      promise.reject(
+          "code 1",
+          "intentional promise rejection",
+          new Throwable("promise intentionally rejected"));
+    } else {
+      promise.resolve("result");
+    }
+  }
+
+  private void log(String method, Object input, Object output) {
+    if (mToast != null) {
+      mToast.cancel();
+    }
+    StringBuilder message = new StringBuilder("Method :");
+    message
+        .append(method)
+        .append("\nInputs: ")
+        .append(input.toString())
+        .append("\nOutputs: ")
+        .append(output.toString());
+    mToast = Toast.makeText(mContext, message.toString(), Toast.LENGTH_LONG);
+    mToast.show();
+  }
+
+  public void invalidate() {}
+
+  @Override
+  public String getName() {
+    return NAME;
+  }
+}
diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index 0ea79d0fad55c3..1e99aa991cc571 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -524,7 +524,7 @@ SPEC CHECKSUMS:
   React-RCTText: 51a41bf9d18a91b2437b833ed4246754baf830d0
   React-RCTVibration: a1cce36dd452eb88296d99d80d66f2c5bd50aad4
   React-runtimeexecutor: 53867815d0a01e53a2c901cb7f01076216c5c799
-  ReactCommon: dc40b68c9a72e99e07f831b0e87a859f4660208b
+  ReactCommon: d101410fc55088c91dc24595715c7b26ec760adf
   Yoga: 69ef0b2bba5387523f793957a9f80dbd61e89631
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 

From 94b198cfd5d7d68a64bc8cb7b5a4df9f2be8b989 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 29 Sep 2020 18:38:24 -0700
Subject: [PATCH 138/241] TurboModule Android: install SampleTurboModule and
 the playground to RNTester

Summary:
This compiles SampleTurboModule into RNTester Android. It also adds the NativeModule playground to show case TurboModule system to RNTester examples, just like in iOS.

{F337854369}

Changelog: [Android][TurboModule] Added TurboModule example to RNTester when `USE_CODEGEN` is set

Reviewed By: hramos

Differential Revision: D24004711

fbshipit-source-id: b682dd51fa998ee2e60f8d6ffd8c39220d13a7fe
---
 .../samples/platform/android/Android.mk       | 18 +++++
 .../ReactCommon/SampleTurboModuleSpec.cpp     |  9 +++
 .../ReactCommon/SampleTurboModuleSpec.h       |  5 +-
 packages/rn-tester/android/app/build.gradle   |  8 ++
 .../react/uiapp/RNTesterApplication.java      | 78 +++++++++++++++----
 .../android/app/src/main/jni/Android.mk       |  4 +
 .../main/jni/RNTesterAppModuleProvider.cpp    |  8 ++
 .../js/utils/RNTesterList.android.js          |  8 ++
 8 files changed, 122 insertions(+), 16 deletions(-)
 create mode 100644 ReactCommon/react/nativemodule/samples/platform/android/Android.mk

diff --git a/ReactCommon/react/nativemodule/samples/platform/android/Android.mk b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
new file mode 100644
index 00000000000000..46dfd7623ae029
--- /dev/null
+++ b/ReactCommon/react/nativemodule/samples/platform/android/Android.mk
@@ -0,0 +1,18 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := sampleturbomodule
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/ReactCommon/*.cpp)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core
+LOCAL_CFLAGS := \
+  -DLOG_TAG=\"ReactNative\"
+LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp
index b1c6922e3bb800..676a79ee5e76c0 100644
--- a/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp
+++ b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.cpp
@@ -196,5 +196,14 @@ NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(
       0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
 }
 
+std::shared_ptr<TurboModule> SampleTurboModuleSpec_ModuleProvider(
+    const std::string moduleName,
+    const JavaTurboModule::InitParams &params) {
+  if (moduleName == "SampleTurboModule") {
+    return std::make_shared<NativeSampleTurboModuleSpecJSI>(params);
+  }
+  return nullptr;
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h
index fd8f6c3c87eb10..6baefae6d890d9 100644
--- a/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h
+++ b/ReactCommon/react/nativemodule/samples/platform/android/ReactCommon/SampleTurboModuleSpec.h
@@ -19,11 +19,14 @@ namespace react {
 /**
  * C++ class for module 'SampleTurboModule'
  */
-
 class JSI_EXPORT NativeSampleTurboModuleSpecJSI : public JavaTurboModule {
  public:
   NativeSampleTurboModuleSpecJSI(const JavaTurboModule::InitParams &params);
 };
 
+std::shared_ptr<TurboModule> SampleTurboModuleSpec_ModuleProvider(
+    const std::string moduleName,
+    const JavaTurboModule::InitParams &params);
+
 } // namespace react
 } // namespace facebook
diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle
index fe95b03be0ccaf..186a325259e28d 100644
--- a/packages/rn-tester/android/app/build.gradle
+++ b/packages/rn-tester/android/app/build.gradle
@@ -184,6 +184,14 @@ android {
             proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
         }
     }
+    sourceSets.main {
+        java {
+            // SampleTurboModule.
+            srcDirs += [
+                "$rootDir/ReactCommon/react/nativemodule/samples/platform/android",
+            ]
+        }
+    }
 }
 
 configurations {
diff --git a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
index c191ecaec94d9d..710d8e0c7254e5 100644
--- a/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
+++ b/packages/rn-tester/android/app/src/main/java/com/facebook/react/uiapp/RNTesterApplication.java
@@ -10,16 +10,19 @@
 import android.app.Application;
 import android.content.Context;
 import androidx.annotation.Nullable;
+import com.facebook.fbreact.specs.SampleTurboModule;
 import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
+import com.facebook.react.TurboReactPackage;
 import com.facebook.react.bridge.JSIModule;
 import com.facebook.react.bridge.JSIModulePackage;
 import com.facebook.react.bridge.JSIModuleProvider;
 import com.facebook.react.bridge.JSIModuleSpec;
 import com.facebook.react.bridge.JSIModuleType;
 import com.facebook.react.bridge.JavaScriptContextHolder;
+import com.facebook.react.bridge.NativeModule;
 import com.facebook.react.bridge.ReactApplicationContext;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.config.ReactFeatureFlags;
@@ -27,6 +30,8 @@
 import com.facebook.react.fabric.CoreComponentsRegistry;
 import com.facebook.react.fabric.FabricJSIModuleProvider;
 import com.facebook.react.fabric.ReactNativeConfig;
+import com.facebook.react.module.model.ReactModuleInfo;
+import com.facebook.react.module.model.ReactModuleInfoProvider;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.react.turbomodule.core.TurboModuleManager;
 import com.facebook.react.views.text.ReactFontManager;
@@ -34,7 +39,9 @@
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 public class RNTesterApplication extends Application implements ReactApplication {
 
@@ -57,7 +64,47 @@ public boolean getUseDeveloperSupport() {
 
         @Override
         public List<ReactPackage> getPackages() {
-          return Arrays.<ReactPackage>asList(new MainReactPackage());
+          return Arrays.<ReactPackage>asList(
+              new MainReactPackage(),
+              new TurboReactPackage() {
+                public NativeModule getModule(
+                    final String name, final ReactApplicationContext reactContext) {
+                  if (!ReactFeatureFlags.useTurboModules) {
+                    return null;
+                  }
+
+                  if (SampleTurboModule.NAME.equals(name)) {
+                    return new SampleTurboModule(reactContext);
+                  }
+
+                  return null;
+                }
+
+                // Note: Specialized annotation processor for @ReactModule isn't configured in OSS
+                // yet. For now, hardcode this information, though it's not necessary for most
+                // modules.
+                public ReactModuleInfoProvider getReactModuleInfoProvider() {
+                  return new ReactModuleInfoProvider() {
+                    public Map<String, ReactModuleInfo> getReactModuleInfos() {
+                      final Map<String, ReactModuleInfo> moduleInfos = new HashMap<>();
+                      if (ReactFeatureFlags.useTurboModules) {
+                        moduleInfos.put(
+                            SampleTurboModule.NAME,
+                            new ReactModuleInfo(
+                                SampleTurboModule.NAME,
+                                "SampleTurboModule",
+                                false, // canOverrideExistingModule
+                                false, // needsEagerInit
+                                true, // hasConstants
+                                false, // isCxxModule
+                                true // isTurboModule
+                                ));
+                      }
+                      return moduleInfos;
+                    }
+                  };
+                }
+              });
         }
 
         @Nullable
@@ -72,7 +119,7 @@ protected JSIModulePackage getJSIModulePackage() {
             public List<JSIModuleSpec> getJSIModules(
                 final ReactApplicationContext reactApplicationContext,
                 final JavaScriptContextHolder jsContext) {
-              List<JSIModuleSpec> specs = new ArrayList<>();
+              final List<JSIModuleSpec> specs = new ArrayList<>();
 
               // Install the new native module system.
               if (ReactFeatureFlags.useTurboModules) {
@@ -88,8 +135,9 @@ public JSIModuleProvider getJSIModuleProvider() {
                         return new JSIModuleProvider() {
                           @Override
                           public JSIModule get() {
-                            ReactInstanceManager reactInstanceManager = getReactInstanceManager();
-                            List<ReactPackage> packages = reactInstanceManager.getPackages();
+                            final ReactInstanceManager reactInstanceManager =
+                                getReactInstanceManager();
+                            final List<ReactPackage> packages = reactInstanceManager.getPackages();
 
                             return new TurboModuleManager(
                                 jsContext,
@@ -118,7 +166,7 @@ public JSIModuleType getJSIModuleType() {
 
                       @Override
                       public JSIModuleProvider<UIManager> getJSIModuleProvider() {
-                        ComponentFactory ComponentFactory = new ComponentFactory();
+                        final ComponentFactory ComponentFactory = new ComponentFactory();
                         CoreComponentsRegistry.register(ComponentFactory);
                         return new FabricJSIModuleProvider(
                             reactApplicationContext,
@@ -126,22 +174,22 @@ public JSIModuleProvider<UIManager> getJSIModuleProvider() {
                             // TODO: T71362667 add ReactNativeConfig's support in RNTester
                             new ReactNativeConfig() {
                               @Override
-                              public boolean getBool(String s) {
+                              public boolean getBool(final String s) {
                                 return false;
                               }
 
                               @Override
-                              public int getInt64(String s) {
+                              public int getInt64(final String s) {
                                 return 0;
                               }
 
                               @Override
-                              public String getString(String s) {
+                              public String getString(final String s) {
                                 return "";
                               }
 
                               @Override
-                              public double getDouble(String s) {
+                              public double getDouble(final String s) {
                                 return 0;
                               }
                             });
@@ -178,24 +226,24 @@ public ReactNativeHost getReactNativeHost() {
    * @param reactInstanceManager
    */
   private static void initializeFlipper(
-      Context context, ReactInstanceManager reactInstanceManager) {
+      final Context context, final ReactInstanceManager reactInstanceManager) {
     if (BuildConfig.DEBUG) {
       try {
         /*
          We use reflection here to pick up the class that initializes Flipper,
         since Flipper library is not available in release mode
         */
-        Class<?> aClass = Class.forName("com.facebook.react.uiapp.ReactNativeFlipper");
+        final Class<?> aClass = Class.forName("com.facebook.react.uiapp.ReactNativeFlipper");
         aClass
             .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);
-      } catch (ClassNotFoundException e) {
+      } catch (final ClassNotFoundException e) {
         e.printStackTrace();
-      } catch (NoSuchMethodException e) {
+      } catch (final NoSuchMethodException e) {
         e.printStackTrace();
-      } catch (IllegalAccessException e) {
+      } catch (final IllegalAccessException e) {
         e.printStackTrace();
-      } catch (InvocationTargetException e) {
+      } catch (final InvocationTargetException e) {
         e.printStackTrace();
       }
     }
diff --git a/packages/rn-tester/android/app/src/main/jni/Android.mk b/packages/rn-tester/android/app/src/main/jni/Android.mk
index 2029b87348dd24..6e003cdb953721 100644
--- a/packages/rn-tester/android/app/src/main/jni/Android.mk
+++ b/packages/rn-tester/android/app/src/main/jni/Android.mk
@@ -7,6 +7,9 @@ THIS_DIR := $(call my-dir)
 
 include $(REACT_ANDROID_DIR)/Android-prebuilt.mk
 
+# SampleNativeModule
+include $(REACT_COMMON_DIR)/react/nativemodule/samples/platform/android/Android.mk
+
 LOCAL_PATH := $(THIS_DIR)
 
 include $(CLEAR_VARS)
@@ -16,6 +19,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SRC_FILES := $(wildcard $(LOCAL_PATH)/*.cpp) $(wildcard $(GENERATED_SRC_DIR)/codegen/jni/*.cpp)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH) $(GENERATED_SRC_DIR)/codegen/jni
 LOCAL_SHARED_LIBRARIES := libfbjni libreact_nativemodule_core libturbomodulejsijni libreact_codegen_reactandroidspec
+LOCAL_STATIC_LIBRARIES := libsampleturbomodule
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 LOCAL_CFLAGS += -fexceptions -frtti -std=c++14 -Wall
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
index 493d8267e3cf03..60d8c7fba84d60 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
@@ -9,6 +9,8 @@
 
 #include <PackagesRnTesterAndroidAppSpec.h>
 #include <ReactAndroidSpec.h>
+// TODO: Remove SampleTurboModule from ReactAndroidSpec, then uncomment.
+// #include <ReactCommon/SampleTurboModuleSpec.h>
 
 namespace facebook {
 namespace react {
@@ -19,6 +21,12 @@ std::shared_ptr<TurboModule> RNTesterAppModuleProvider(const std::string moduleN
     return module;
   }
 
+  // TODO: Remove SampleTurboModule from ReactAndroidSpec, then uncomment.
+  // module = SampleTurboModuleSpec_ModuleProvider(moduleName, params);
+  // if (module != nullptr) {
+  //   return module;
+  // }
+
   // TODO: fix up the ReactAndroidSpec_ModuleProvider() to avoid the Android prefix.
   if (moduleName == "DatePicker") {
     return std::make_shared<NativeDatePickerAndroidSpecJSI>(params);
diff --git a/packages/rn-tester/js/utils/RNTesterList.android.js b/packages/rn-tester/js/utils/RNTesterList.android.js
index bb509d0f3b0103..5971a0facf278c 100644
--- a/packages/rn-tester/js/utils/RNTesterList.android.js
+++ b/packages/rn-tester/js/utils/RNTesterList.android.js
@@ -264,6 +264,14 @@ const APIExamples: Array<RNTesterExample> = [
   },
 ];
 
+if (global.__turboModuleProxy) {
+  APIExamples.push({
+    key: 'TurboModuleExample',
+    category: 'Basic',
+    module: require('../examples/TurboModule/TurboModuleExample'),
+  });
+}
+
 const Modules: any = {};
 
 APIExamples.concat(ComponentExamples).forEach(Example => {

From 1d89ef87b63e1eb2238a839ef2105a52ac1d2270 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Tue, 29 Sep 2020 18:38:24 -0700
Subject: [PATCH 139/241] TurboModule: exclude NativeSampleTurboModule in the
 schema

Summary:
The sample module is meant for demo only, but it lives alongside other core modules in react-native repo.

For now, exclude it in the Flow-type parsing, just like `NativeUIManager.js`

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24005108

fbshipit-source-id: 9ef524bfe2778dd983c94d1701f9ce49da5e0a68
---
 .../src/cli/combine/combine-js-to-schema-cli.js      |  3 +++
 .../app/src/main/jni/RNTesterAppModuleProvider.cpp   | 12 +++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js
index f9a0a07d8c90af..30443a09c35381 100644
--- a/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js
+++ b/packages/react-native-codegen/src/cli/combine/combine-js-to-schema-cli.js
@@ -32,6 +32,9 @@ fileList.forEach(file => {
           // NativeUIManager will be deprecated by Fabric UIManager.
           // For now, ignore this spec completely because the types are not fully supported.
           !f.endsWith('NativeUIManager.js') &&
+          // NativeSampleTurboModule is for demo purpose. It should be added manually to the
+          // app for now.
+          !f.endsWith('NativeSampleTurboModule.js') &&
           !f.includes('__tests'),
       );
     allFiles.push(...dirFiles);
diff --git a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
index 60d8c7fba84d60..06c20c981cd016 100644
--- a/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
+++ b/packages/rn-tester/android/app/src/main/jni/RNTesterAppModuleProvider.cpp
@@ -9,8 +9,7 @@
 
 #include <PackagesRnTesterAndroidAppSpec.h>
 #include <ReactAndroidSpec.h>
-// TODO: Remove SampleTurboModule from ReactAndroidSpec, then uncomment.
-// #include <ReactCommon/SampleTurboModuleSpec.h>
+#include <ReactCommon/SampleTurboModuleSpec.h>
 
 namespace facebook {
 namespace react {
@@ -21,11 +20,10 @@ std::shared_ptr<TurboModule> RNTesterAppModuleProvider(const std::string moduleN
     return module;
   }
 
-  // TODO: Remove SampleTurboModule from ReactAndroidSpec, then uncomment.
-  // module = SampleTurboModuleSpec_ModuleProvider(moduleName, params);
-  // if (module != nullptr) {
-  //   return module;
-  // }
+  module = SampleTurboModuleSpec_ModuleProvider(moduleName, params);
+  if (module != nullptr) {
+    return module;
+  }
 
   // TODO: fix up the ReactAndroidSpec_ModuleProvider() to avoid the Android prefix.
   if (moduleName == "DatePicker") {

From 5bb54c90bddab6b1903ddf88777872fce0aa27a8 Mon Sep 17 00:00:00 2001
From: Joshua Selbo <jselbo@fb.com>
Date: Tue, 29 Sep 2020 18:39:15 -0700
Subject: [PATCH 140/241] Upgrade Robolectric from 4.3.1 -> 4.4

Summary: Changelog: [Internal]

Reviewed By: jiawei-lyu

Differential Revision: D23718455

fbshipit-source-id: 39c684722db1269e2179cf9680cb728be1171afb
---
 ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK | 2 +-
 tools/build_defs/oss/rn_defs.bzl                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
index 2721f9cb923f4a..c774e197673e51 100644
--- a/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
+++ b/ReactAndroid/src/test/java/com/facebook/react/bridge/BUCK
@@ -15,7 +15,7 @@ rn_android_library(
     ],
     deps = [
         react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
-        react_native_dep("third-party/java/robolectric/4.3.1:robolectric"),
+        react_native_dep("third-party/java/robolectric/4.4:robolectric"),
         react_native_target("java/com/facebook/react/bridge:bridge"),
         react_native_target("java/com/facebook/react/uimanager:uimanager"),
         react_native_tests_target("java/org/mockito/configuration:configuration"),
diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl
index 5553eb884af16d..8b83e282bef5e1 100644
--- a/tools/build_defs/oss/rn_defs.bzl
+++ b/tools/build_defs/oss/rn_defs.bzl
@@ -189,7 +189,7 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
     kwargs["deps"] = kwargs.pop("deps", []) + [
         react_native_android_toplevel_dep("third-party/java/mockito2:mockito2"),
         react_native_xplat_dep("libraries/fbcore/src/test/java/com/facebook/powermock:powermock2"),
-        react_native_dep("third-party/java/robolectric/4.3.1:robolectric"),
+        react_native_dep("third-party/java/robolectric/4.4:robolectric"),
     ]
 
     extra_vm_args = [

From c92e7674358da7089b1733c51faf5f2e02111d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 29 Sep 2020 21:46:05 -0700
Subject: [PATCH 141/241] TurboModule iOS: Remove module filters

Summary:
These native modules are now filtered downstream in `combine-js-to-schema-cli.js`.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24003572

fbshipit-source-id: d858dbf4a4b6d522ed528f9c2262f37243317160
---
 scripts/generate-native-modules-specs.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/generate-native-modules-specs.sh b/scripts/generate-native-modules-specs.sh
index c65f85aa8190c8..e72916bc138da1 100755
--- a/scripts/generate-native-modules-specs.sh
+++ b/scripts/generate-native-modules-specs.sh
@@ -42,13 +42,14 @@ step_build_codegen () {
 step_gen_schema () {
   describe "Generating schema from flow types"
   SRCS_DIR=$(cd "$RN_DIR/Libraries" && pwd)
-  grep --exclude NativeSampleTurboModule.js --exclude NativeUIManager.js --include=Native\*.js -rnwl "$SRCS_DIR" -e 'export interface Spec extends TurboModule' -e "export default \(TurboModuleRegistry.get(Enforcing)?<Spec>\('.*\): Spec\);/" \
-    | xargs "$YARN_BINARY" node "$CODEGEN_DIR/lib/cli/combine/combine-js-to-schema-cli.js" "$SCHEMA_FILE"
+  "$YARN_BINARY" node "$CODEGEN_DIR/lib/cli/combine/combine-js-to-schema-cli.js" "$SCHEMA_FILE" "$SRCS_DIR"
 }
 
 step_gen_specs () {
   describe "Generating native code from schema (iOS)"
-  "$YARN_BINARY" --silent node scripts/generate-native-modules-specs-cli.js ios "$SCHEMA_FILE" "$OUTPUT_DIR"
+  pushd "$RN_DIR" >/dev/null || exit
+    "$YARN_BINARY" --silent node scripts/generate-native-modules-specs-cli.js ios "$SCHEMA_FILE" "$OUTPUT_DIR"
+  popd >/dev/null || exit
 }
 
 step_build_codegen

From d373a8d88c30af910133d97ae973d256c4479929 Mon Sep 17 00:00:00 2001
From: Joshua Selbo <jselbo@fb.com>
Date: Tue, 29 Sep 2020 22:49:21 -0700
Subject: [PATCH 142/241] Fix React Native Robolectric 4.4 deps (#30073)

Summary:
Pull Request resolved: https://github.com/facebook/react-native/pull/30073

Changelog: [Android][Added] - Test infra: Robolectric 4.3.1 -> 4.4 upgrade

Reviewed By: fkgozali

Differential Revision: D24009953

fbshipit-source-id: 70549187f4af0abd2ea10f6725eecadbaef7281b
---
 ReactAndroid/gradle.properties                |   2 +-
 .../third-party/java/robolectric/4.4/BUCK     | 216 ++++++++++++++++++
 tools/build_defs/oss/rn_defs.bzl              |   5 +-
 3 files changed, 220 insertions(+), 3 deletions(-)
 create mode 100644 ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK

diff --git a/ReactAndroid/gradle.properties b/ReactAndroid/gradle.properties
index 04ef27362cf6fc..766e22770f7b6c 100644
--- a/ReactAndroid/gradle.properties
+++ b/ReactAndroid/gradle.properties
@@ -7,7 +7,7 @@ POM_PACKAGING=aar
 
 MOCKITO_CORE_VERSION=2.26.0
 POWERMOCK_VERSION=2.0.2
-ROBOLECTRIC_VERSION=4.3.1
+ROBOLECTRIC_VERSION=4.4
 JUNIT_VERSION=4.12
 FEST_ASSERT_CORE_VERSION=2.0M10
 
diff --git a/ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK b/ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK
new file mode 100644
index 00000000000000..9033f5b0ce9705
--- /dev/null
+++ b/ReactAndroid/src/main/third-party/java/robolectric/4.4/BUCK
@@ -0,0 +1,216 @@
+load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
+load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_prebuilt_jar")
+
+rn_android_library(
+    name = "robolectric",
+    visibility = ["PUBLIC"],
+    exported_deps = [
+        ":android-all-4.1.2_r1-robolectric-r1",
+        ":bouncycastle",
+        ":guava",
+        ":javax-annotation-api",
+        ":javax-inject",
+        ":robolectric4-annotations-prebuilt",
+        ":robolectric4-junit-prebuilt",
+        ":robolectric4-pluginapi-prebuilt",
+        ":robolectric4-plugins-maven-dependency-resolver-prebuilt",
+        ":robolectric4-prebuilt",
+        ":robolectric4-resources-prebuilt",
+        ":robolectric4-sandbox-prebuilt",
+        ":robolectric4-shadowapi-prebuilt",
+        ":robolectric4-shadows-framework-prebuilt",
+        ":robolectric4-utils-prebuilt",
+        ":robolectric4-utils-reflector-prebuilt",
+        react_native_dep("third-party/java/asm:asm"),
+        react_native_dep("third-party/java/sqlite:sqlite"),
+        react_native_dep("third-party/java/junit:junit"),
+        react_native_dep("third-party/android/androidx:test-monitor"),
+    ],
+)
+
+rn_prebuilt_jar(
+    name = "android-all-4.1.2_r1-robolectric-r1",  # name defines filename used by robolectric in runtime
+    binary_jar = ":robolectric-android-all-binary.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+# This new rule will make the .jar file appear in the "right" location,
+# though that may change in the future
+fb_native.export_file(
+    name = "robolectric-android-all-binary.jar",
+    src = ":robolectric-android-all-binary-remote.jar",
+    out = "../android-all-4.1.2_r1-robolectric-r1.jar",  # name defines filename used by robolectric in runtime
+)
+
+fb_native.remote_file(
+    name = "robolectric-android-all-binary-remote.jar",
+    sha1 = "8355a2da59fe0233ca45070ca32f08da98d0b806",
+    url = "mvn:org.robolectric:android-all:jar:4.1.2_r1-robolectric-r1",
+)
+
+rn_prebuilt_jar(
+    name = "bouncycastle",
+    binary_jar = ":bouncycastle-binary.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "bouncycastle-binary.jar",
+    sha1 = "320b989112f00a63a3bcfa5a98f31a4f865a20fa",
+    url = "mvn:org.bouncycastle:bcprov-jdk15on:jar:1.65",
+)
+
+rn_prebuilt_jar(
+    name = "guava",
+    binary_jar = ":guava-binary.jar",
+    visibility = ["//ReactAndroid/..."],
+)
+
+fb_native.remote_file(
+    name = "guava-binary.jar",
+    sha1 = "ef69663836b339db335fde0df06fb3cd84e3742b",
+    url = "mvn:com.google.guava:guava:jar:26.0-android",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-prebuilt",
+    binary_jar = ":robolectric4.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4.jar",
+    sha1 = "418c5bfae392fdbf71cd463a42a3e8c3b839a924",
+    url = "mvn:org.robolectric:robolectric:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-annotations-prebuilt",
+    binary_jar = ":robolectric4-annotations.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-annotations.jar",
+    sha1 = "70fc5b1699467dfd7de606fc6c02ff9fc1816d9f",
+    url = "mvn:org.robolectric:annotations:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-junit-prebuilt",
+    binary_jar = ":robolectric4-junit.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-junit.jar",
+    sha1 = "fbcda51d8e6f3a3897ae5cedc7aa481815745290",
+    url = "mvn:org.robolectric:junit:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-pluginapi-prebuilt",
+    binary_jar = ":robolectric4-pluginapi.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-pluginapi.jar",
+    sha1 = "1ee94260f8c51620a35eac33fc1efc01350c751f",
+    url = "mvn:org.robolectric:pluginapi:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-plugins-maven-dependency-resolver-prebuilt",
+    binary_jar = ":robolectric4-plugins-maven-dependency-resolver.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-plugins-maven-dependency-resolver.jar",
+    sha1 = "9241a3c4bd01627447c76d9b67614808c78ffdd9",
+    url = "mvn:org.robolectric:plugins-maven-dependency-resolver:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-resources-prebuilt",
+    binary_jar = ":robolectric4-resources.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-resources.jar",
+    sha1 = "a2ee1324bcb62724e6cbfa655bdb5683948a554c",
+    url = "mvn:org.robolectric:resources:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-sandbox-prebuilt",
+    binary_jar = ":robolectric4-sandbox.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-sandbox.jar",
+    sha1 = "03cedd73c5aedaf79fb9a593552816c9fb3282f2",
+    url = "mvn:org.robolectric:sandbox:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-shadowapi-prebuilt",
+    binary_jar = ":robolectric4-shadowapi.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-shadowapi.jar",
+    sha1 = "529649474b53cf8f6f4a483044ade43aebed8a4c",
+    url = "mvn:org.robolectric:shadowapi:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-shadows-framework-prebuilt",
+    binary_jar = ":robolectric4-shadows-framework.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-shadows-framework.jar",
+    sha1 = "90028766e71353ad6f57d7bcb56ac0d861da18c3",
+    url = "mvn:org.robolectric:shadows-framework:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-utils-prebuilt",
+    binary_jar = ":robolectric4-utils.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-utils.jar",
+    sha1 = "c54b2638d64e7bd4e1e45c4fe8038305402bd711",
+    url = "mvn:org.robolectric:utils:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "robolectric4-utils-reflector-prebuilt",
+    binary_jar = ":robolectric4-utils-reflector.jar",
+)
+
+fb_native.remote_file(
+    name = "robolectric4-utils-reflector.jar",
+    sha1 = "44c40ac0d2ef1e7c8b0f6c4e224ef26d356170f1",
+    url = "mvn:org.robolectric:utils-reflector:jar:4.4",
+)
+
+rn_prebuilt_jar(
+    name = "javax-annotation-api",
+    binary_jar = ":javax-annotation-api.jar",
+)
+
+fb_native.remote_file(
+    name = "javax-annotation-api.jar",
+    sha1 = "934c04d3cfef185a8008e7bf34331b79730a9d43",
+    url = "mvn:javax.annotation:javax.annotation-api:jar:1.3.2",
+)
+
+rn_prebuilt_jar(
+    name = "javax-inject",
+    binary_jar = ":javax-inject.jar",
+)
+
+fb_native.remote_file(
+    name = "javax-inject.jar",
+    sha1 = "6975da39a7040257bd51d21a231b76c915872d38",
+    url = "mvn:javax.inject:javax.inject:jar:1",
+)
diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl
index 8b83e282bef5e1..7112b3a400e8ef 100644
--- a/tools/build_defs/oss/rn_defs.bzl
+++ b/tools/build_defs/oss/rn_defs.bzl
@@ -196,11 +196,12 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs):
         "-XX:+UseConcMarkSweepGC",  # required by -XX:+CMSClassUnloadingEnabled
         "-XX:+CMSClassUnloadingEnabled",
         "-XX:ReservedCodeCacheSize=150M",
-        "-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.3.1",
-        "-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.3.1/*.jar",
+        "-Drobolectric.dependency.dir=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.4",
+        "-Dlibraries=buck-out/gen/ReactAndroid/src/main/third-party/java/robolectric/4.4/*.jar",
         "-Drobolectric.logging.enabled=true",
         "-XX:MaxPermSize=620m",
         "-Drobolectric.offline=true",
+        "-Drobolectric.looperMode=LEGACY",
     ]
     if native.read_config("user", "use_dev_shm"):
         extra_vm_args.append("-Djava.io.tmpdir=/dev/shm")

From 0544568d865c5a8885de1cef692adf6ad7fc285d Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Wed, 30 Sep 2020 08:33:28 -0700
Subject: [PATCH 143/241] Drop old state updates

Summary:
Changelog: [internal]

Components can update state multiple times before the state update queue is flushed. This causes unnecessary layout/diff and mount passes. To solve this, drop stale state updates inside `stateUpdateQueue_ ` for specific `ShadowNodeFamily`.

Delivering stale status updates is redundant. Let's take SafeAreaView as an example. It schedules 5-6 state updates before `stateUpdateQueue_` is flushed. That's unnecessary work blocking JS thread. We only care about the latest state update. Same for TextInput and other components using state updates.

Reviewed By: JoshuaGross

Differential Revision: D23987707

fbshipit-source-id: 2e3f92cc93af61d78ac564aa40aef165af64b8c1
---
 ReactCommon/react/renderer/core/EventQueue.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ReactCommon/react/renderer/core/EventQueue.cpp b/ReactCommon/react/renderer/core/EventQueue.cpp
index 2861d7a14f05ec..2db952292ff9ea 100644
--- a/ReactCommon/react/renderer/core/EventQueue.cpp
+++ b/ReactCommon/react/renderer/core/EventQueue.cpp
@@ -8,6 +8,7 @@
 #include "EventQueue.h"
 
 #include "EventEmitter.h"
+#include "ShadowNodeFamily.h"
 
 namespace facebook {
 namespace react {
@@ -35,6 +36,12 @@ void EventQueue::enqueueEvent(const RawEvent &rawEvent) const {
 void EventQueue::enqueueStateUpdate(const StateUpdate &stateUpdate) const {
   {
     std::lock_guard<std::mutex> lock(queueMutex_);
+    if (!stateUpdateQueue_.empty()) {
+      auto const position = stateUpdateQueue_.back();
+      if (stateUpdate.family == position.family) {
+        stateUpdateQueue_.pop_back();
+      }
+    }
     stateUpdateQueue_.push_back(stateUpdate);
   }
 

From 8c77f7060c8337176e8e4b0a45cdf78361d278ee Mon Sep 17 00:00:00 2001
From: Riley Dulin <dulinr@fb.com>
Date: Wed, 30 Sep 2020 12:06:47 -0700
Subject: [PATCH 144/241] Remove idx package from inspector msggen

Summary:
This was causing a crash in babel:
```
$ babel src --out-dir bin --source-maps
Error: Cannot find module 'babel-plugin-idx' from
'~/fbsource/xplat/js/react-native-github/ReactCommon/hermes/inspector/tools/msggen'
- If you want to resolve "idx", use "module:idx" {
  code: 'MODULE_NOT_FOUND'
}
```
It didn't appear that this module was used, so I deleted it.

Changelog: [Internal]

Reviewed By: neildhar

Differential Revision: D23993272

fbshipit-source-id: dd34f0fc652cb27c87c891ca37d0eba66a19a6cf
---
 ReactCommon/hermes/inspector/tools/msggen/.babelrc     | 1 -
 ReactCommon/hermes/inspector/tools/msggen/package.json | 1 -
 ReactCommon/hermes/inspector/tools/msggen/yarn.lock    | 5 -----
 3 files changed, 7 deletions(-)

diff --git a/ReactCommon/hermes/inspector/tools/msggen/.babelrc b/ReactCommon/hermes/inspector/tools/msggen/.babelrc
index b96eb4c692e218..8ad6d5109ddf39 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/.babelrc
+++ b/ReactCommon/hermes/inspector/tools/msggen/.babelrc
@@ -5,5 +5,4 @@
       }
     }]
   ],
-  "plugins": ["idx"]
 }
diff --git a/ReactCommon/hermes/inspector/tools/msggen/package.json b/ReactCommon/hermes/inspector/tools/msggen/package.json
index 8ee113ea68d624..bcd465c61e42eb 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/package.json
+++ b/ReactCommon/hermes/inspector/tools/msggen/package.json
@@ -33,7 +33,6 @@
   },
   "dependencies": {
     "devtools-protocol": "0.0.730699",
-    "idx": "^2.1.0",
     "yargs": "^14.2.0"
   }
 }
diff --git a/ReactCommon/hermes/inspector/tools/msggen/yarn.lock b/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
index cf4d9eaa94aa58..47b1dacda9373d 100644
--- a/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
+++ b/ReactCommon/hermes/inspector/tools/msggen/yarn.lock
@@ -2519,11 +2519,6 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-idx@^2.1.0:
-  version "2.5.6"
-  resolved "https://registry.yarnpkg.com/idx/-/idx-2.5.6.tgz#1f824595070100ae9ad585c86db08dc74f83a59d"
-  integrity sha512-WFXLF7JgPytbMgelpRY46nHz5tyDcedJ76pLV+RJWdb8h33bxFq4bdZau38DhNSzk5eVniBf1K3jwfK+Lb5nYA==
-
 ieee754@^1.1.4:
   version "1.1.13"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"

From 7054e58de4857a1d2669e596b132256f1a1378a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Wed, 30 Sep 2020 13:24:57 -0700
Subject: [PATCH 145/241] iOS: fix ios-configure-glog.sh syntax issue

Summary:
A `cat` to file was removed accidentally, preventing the configuration script from executing successfully as part of a `pod install`.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24024824

fbshipit-source-id: 94af0c6e663320bfac04ee8f6fb37bd4bdc379a4
---
 scripts/ios-configure-glog.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ios-configure-glog.sh b/scripts/ios-configure-glog.sh
index f527702bbd03c9..9642c5322d48b5 100755
--- a/scripts/ios-configure-glog.sh
+++ b/scripts/ios-configure-glog.sh
@@ -30,6 +30,7 @@ fi
 
 ./configure --host arm-apple-darwin
 
+cat << EOF >> src/config.h
 /* Add in so we have Apple Target Conditionals */
 #ifdef __APPLE__
 #include <TargetConditionals.h>

From 8a31dfe567a22dbc018ea763b0a9706068276c4a Mon Sep 17 00:00:00 2001
From: simek <gosimek@gmail.com>
Date: Wed, 30 Sep 2020 14:34:03 -0700
Subject: [PATCH 146/241] chore: update RNTester example link in PanResponder
 comment (#30051)

Summary:
This PR fixes a small leftover after the RNTester migration to the monorepo package - an invalid link in the `PanResponder` comment.

Refs:
* https://github.com/facebook/react-native/issues/29567
* facebook/react-native-website#2177 (the similar correction was a part of merged PR in the RN docs)

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal][Fixed] PanResponder: correct example link in comment

Pull Request resolved: https://github.com/facebook/react-native/pull/30051

Test Plan: N/A

Reviewed By: fkgozali

Differential Revision: D24025065

Pulled By: hramos

fbshipit-source-id: 190486e458fb8e83a35fa2d3c62f4483f3a4334d
---
 Libraries/Interaction/PanResponder.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Interaction/PanResponder.js b/Libraries/Interaction/PanResponder.js
index 1aaf9fce9ecaee..4106597cb6d40c 100644
--- a/Libraries/Interaction/PanResponder.js
+++ b/Libraries/Interaction/PanResponder.js
@@ -121,7 +121,7 @@ const currentCentroidY = TouchHistoryMath.currentCentroidY;
  * ### Working Example
  *
  * To see it in action, try the
- * [PanResponder example in RNTester](https://github.com/facebook/react-native/blob/master/RNTester/js/PanResponderExample.js)
+ * [PanResponder example in RNTester](https://github.com/facebook/react-native/blob/master/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js)
  */
 
 export type GestureState = {|

From 18f7abae07b8ea60c7530a5d9f34541c50f5edd9 Mon Sep 17 00:00:00 2001
From: Kevin Gozali <fkg@fb.com>
Date: Wed, 30 Sep 2020 17:05:05 -0700
Subject: [PATCH 147/241] Android: removed Robolectric 4.3.1 Buck configuration

Summary:
It was recently upgraded to 4.4, so we don't need the 4.3.1 anymore.

Changelog: [Android][Removed] Removed Robolectric 4.3.1 setup

Reviewed By: jselbo

Differential Revision: D24030822

fbshipit-source-id: 09b3c577d32028723e7bbc02f13459a7ae69b749
---
 .../third-party/java/robolectric/4.3.1/BUCK   | 216 ------------------
 1 file changed, 216 deletions(-)
 delete mode 100644 ReactAndroid/src/main/third-party/java/robolectric/4.3.1/BUCK

diff --git a/ReactAndroid/src/main/third-party/java/robolectric/4.3.1/BUCK b/ReactAndroid/src/main/third-party/java/robolectric/4.3.1/BUCK
deleted file mode 100644
index aeca8ed4f5bd3a..00000000000000
--- a/ReactAndroid/src/main/third-party/java/robolectric/4.3.1/BUCK
+++ /dev/null
@@ -1,216 +0,0 @@
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load("//tools/build_defs/oss:rn_defs.bzl", "react_native_dep", "rn_android_library", "rn_prebuilt_jar")
-
-rn_android_library(
-    name = "robolectric",
-    visibility = ["PUBLIC"],
-    exported_deps = [
-        ":android-all-4.1.2_r1-robolectric-r1",
-        ":bouncycastle",
-        ":guava",
-        ":javax-annotation-api",
-        ":javax-inject",
-        ":robolectric4-annotations-prebuilt",
-        ":robolectric4-junit-prebuilt",
-        ":robolectric4-pluginapi-prebuilt",
-        ":robolectric4-plugins-maven-dependency-resolver-prebuilt",
-        ":robolectric4-prebuilt",
-        ":robolectric4-resources-prebuilt",
-        ":robolectric4-sandbox-prebuilt",
-        ":robolectric4-shadowapi-prebuilt",
-        ":robolectric4-shadows-framework-prebuilt",
-        ":robolectric4-utils-prebuilt",
-        ":robolectric4-utils-reflector-prebuilt",
-        react_native_dep("third-party/java/asm:asm"),
-        react_native_dep("third-party/java/sqlite:sqlite"),
-        react_native_dep("third-party/java/junit:junit"),
-        react_native_dep("third-party/android/androidx:test-monitor"),
-    ],
-)
-
-rn_prebuilt_jar(
-    name = "android-all-4.1.2_r1-robolectric-r1",  # name defines filename used by robolectric in runtime
-    binary_jar = ":robolectric-android-all-binary.jar",
-    visibility = ["//ReactAndroid/..."],
-)
-
-# This new rule will make the .jar file appear in the "right" location,
-# though that may change in the future
-fb_native.export_file(
-    name = "robolectric-android-all-binary.jar",
-    src = ":robolectric-android-all-binary-remote.jar",
-    out = "../android-all-4.1.2_r1-robolectric-r1.jar",  # name defines filename used by robolectric in runtime
-)
-
-fb_native.remote_file(
-    name = "robolectric-android-all-binary-remote.jar",
-    sha1 = "8355a2da59fe0233ca45070ca32f08da98d0b806",
-    url = "mvn:org.robolectric:android-all:jar:4.1.2_r1-robolectric-r1",
-)
-
-rn_prebuilt_jar(
-    name = "bouncycastle",
-    binary_jar = ":bouncycastle-binary.jar",
-    visibility = ["//ReactAndroid/..."],
-)
-
-fb_native.remote_file(
-    name = "bouncycastle-binary.jar",
-    sha1 = "2507204241ab450456bdb8e8c0a8f986e418bd99",
-    url = "mvn:org.bouncycastle:bcprov-jdk15on:jar:1.59",
-)
-
-rn_prebuilt_jar(
-    name = "guava",
-    binary_jar = ":guava-binary.jar",
-    visibility = ["//ReactAndroid/..."],
-)
-
-fb_native.remote_file(
-    name = "guava-binary.jar",
-    sha1 = "ef69663836b339db335fde0df06fb3cd84e3742b",
-    url = "mvn:com.google.guava:guava:jar:26.0-android",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-prebuilt",
-    binary_jar = ":robolectric4.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4.jar",
-    sha1 = "66e4550b96285eadcb5a45a21ad6fbe8842fa960",
-    url = "mvn:org.robolectric:robolectric:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-annotations-prebuilt",
-    binary_jar = ":robolectric4-annotations.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-annotations.jar",
-    sha1 = "3db63d633be908a18db18615b594f824c034ae6d",
-    url = "mvn:org.robolectric:annotations:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-junit-prebuilt",
-    binary_jar = ":robolectric4-junit.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-junit.jar",
-    sha1 = "fcafc9942e8748c8bab832b022672ca21808c492",
-    url = "mvn:org.robolectric:junit:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-pluginapi-prebuilt",
-    binary_jar = ":robolectric4-pluginapi.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-pluginapi.jar",
-    sha1 = "128acea3aed3bbe36f8fde865f3a26b920237718",
-    url = "mvn:org.robolectric:pluginapi:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-plugins-maven-dependency-resolver-prebuilt",
-    binary_jar = ":robolectric4-plugins-maven-dependency-resolver.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-plugins-maven-dependency-resolver.jar",
-    sha1 = "b1ea126cb80dbba0c2947be9234bbe2877ce2a09",
-    url = "mvn:org.robolectric:plugins-maven-dependency-resolver:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-resources-prebuilt",
-    binary_jar = ":robolectric4-resources.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-resources.jar",
-    sha1 = "e40030b0f6808ca378bd2c803713157ee4287ea0",
-    url = "mvn:org.robolectric:resources:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-sandbox-prebuilt",
-    binary_jar = ":robolectric4-sandbox.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-sandbox.jar",
-    sha1 = "2302e406aebab5f6843dbf6c2f21952fa86ec26f",
-    url = "mvn:org.robolectric:sandbox:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-shadowapi-prebuilt",
-    binary_jar = ":robolectric4-shadowapi.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-shadowapi.jar",
-    sha1 = "81dfcf4a45b623b7744e46358d01c7ce054d0fff",
-    url = "mvn:org.robolectric:shadowapi:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-shadows-framework-prebuilt",
-    binary_jar = ":robolectric4-shadows-framework.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-shadows-framework.jar",
-    sha1 = "150103d5732c432906f6130b734e7452855dd67b",
-    url = "mvn:org.robolectric:shadows-framework:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-utils-prebuilt",
-    binary_jar = ":robolectric4-utils.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-utils.jar",
-    sha1 = "97b0331b67d0e1dc8bf50e570b6feb017f62aed1",
-    url = "mvn:org.robolectric:utils:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "robolectric4-utils-reflector-prebuilt",
-    binary_jar = ":robolectric4-utils-reflector.jar",
-)
-
-fb_native.remote_file(
-    name = "robolectric4-utils-reflector.jar",
-    sha1 = "3428887d068b66e33026ac533ae4647355167658",
-    url = "mvn:org.robolectric:utils-reflector:jar:4.3",
-)
-
-rn_prebuilt_jar(
-    name = "javax-annotation-api",
-    binary_jar = ":javax-annotation-api.jar",
-)
-
-fb_native.remote_file(
-    name = "javax-annotation-api.jar",
-    sha1 = "934c04d3cfef185a8008e7bf34331b79730a9d43",
-    url = "mvn:javax.annotation:javax.annotation-api:jar:1.3.2",
-)
-
-rn_prebuilt_jar(
-    name = "javax-inject",
-    binary_jar = ":javax-inject.jar",
-)
-
-fb_native.remote_file(
-    name = "javax-inject.jar",
-    sha1 = "6975da39a7040257bd51d21a231b76c915872d38",
-    url = "mvn:javax.inject:javax.inject:jar:1",
-)

From c42183817dbac1fad9ded547cbcf0b91dfc08070 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Wed, 30 Sep 2020 19:21:57 -0700
Subject: [PATCH 148/241] Fixed incorrect assert in RCTScrollViewComponentView

Summary:
This diff removes an incorrect assert and replaces it with a debug-only verification phase that compares "what we want" with "what we get".

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: PeteTheHeat

Differential Revision: D23983123

fbshipit-source-id: 03a628b4f8baa1f5fe4b55354b7c943e38b5e537
---
 .../ScrollView/RCTScrollViewComponentView.mm  | 26 +++++++++++++++----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
index 859b4582980e8a..848e26d2678584 100644
--- a/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/ScrollView/RCTScrollViewComponentView.mm
@@ -498,16 +498,15 @@ - (void)_remountChildren
   visibleFrame.size.width *= scale;
   visibleFrame.size.height *= scale;
 
+#ifndef NDEBUG
+  NSMutableArray<UIView<RCTComponentViewProtocol> *> *expectedSubviews = [NSMutableArray new];
+#endif
+
   NSInteger mountedIndex = 0;
   for (UIView *componentView in _childComponentViews) {
     BOOL shouldBeMounted = YES;
     BOOL isMounted = componentView.superview != nil;
 
-    // If a view is mounted, it must be mounted exactly at `mountedIndex` position.
-    RCTAssert(
-        !isMounted || [_containerView.subviews objectAtIndex:mountedIndex] == componentView,
-        @"Attempt to unmount improperly mounted component view.");
-
     // It's simpler and faster to not mess with views that are not `RCTViewComponentView` subclasses.
     if ([componentView isKindOfClass:[RCTViewComponentView class]]) {
       RCTViewComponentView *viewComponentView = (RCTViewComponentView *)componentView;
@@ -529,7 +528,24 @@ - (void)_remountChildren
     if (shouldBeMounted) {
       mountedIndex++;
     }
+
+#ifndef NDEBUG
+    if (shouldBeMounted) {
+      [expectedSubviews addObject:componentView];
+    }
+#endif
+  }
+
+#ifndef NDEBUG
+  RCTAssert(
+      _containerView.subviews.count == expectedSubviews.count,
+      @"-[RCTScrollViewComponentView _remountChildren]: Inconsistency detected.");
+  for (NSInteger i = 0; i < expectedSubviews.count; i++) {
+    RCTAssert(
+        [_containerView.subviews objectAtIndex:i] == [expectedSubviews objectAtIndex:i],
+        @"-[RCTScrollViewComponentView _remountChildren]: Inconsistency detected.");
   }
+#endif
 }
 
 #pragma mark - RCTScrollableProtocol

From 553fb8b28d0ad332d75a944d244832be3390b6ba Mon Sep 17 00:00:00 2001
From: Frieder Bluemle <frieder.bluemle@gmail.com>
Date: Wed, 30 Sep 2020 22:14:21 -0700
Subject: [PATCH 149/241] Update Android Gradle plugin to 4.0.1 (#29013)

Summary:
This is a major version update that needs to be tested thoroughly.

Android Studio 4.0.1 is now available in the stable channel

https://androidstudio.googleblog.com/2020/05/android-studio-40-available-in-stable.html
https://developer.android.com/studio/releases/gradle-plugin#4.0.1

## Changelog

[Android] [Changed] - Update Android Gradle plugin to 4.0.1

Pull Request resolved: https://github.com/facebook/react-native/pull/29013

Test Plan:
Build project

Closes https://github.com/facebook/react-native/issues/29044

Reviewed By: shergin

Differential Revision: D24041233

Pulled By: fkgozali

fbshipit-source-id: 68ef0f313aa773866e65796e323ed0f19f41f834
---
 build.gradle.kts                                                | 2 +-
 packages/react-native-codegen/android/build.gradle              | 2 +-
 .../android/gradlePlugin-build/gradlePlugin/build.gradle        | 2 +-
 template/android/build.gradle                                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 571f2db36b6c0f..a55cebbc57e9d2 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.6.4")
+        classpath("com.android.tools.build:gradle:4.0.1")
         classpath("de.undercouch:gradle-download-task:4.0.2")
 
         // NOTE: Do not place your application dependencies here; they belong
diff --git a/packages/react-native-codegen/android/build.gradle b/packages/react-native-codegen/android/build.gradle
index 69934710e3bdca..e0cc63d645bbcf 100644
--- a/packages/react-native-codegen/android/build.gradle
+++ b/packages/react-native-codegen/android/build.gradle
@@ -12,7 +12,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.6.4")
+        classpath("com.android.tools.build:gradle:4.0.1")
     }
 }
 
diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
index 616590c65c97b6..dd269383ec1416 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
+++ b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
@@ -19,7 +19,7 @@ gradlePlugin {
 }
 
 dependencies {
-    implementation 'com.android.tools.build:gradle:3.6.4'
+    implementation 'com.android.tools.build:gradle:4.0.1'
     // Use the same Gson version that `com.android.tools.build:gradle` depends on.
     implementation 'com.google.code.gson:gson:2.8.5'
     implementation 'com.google.guava:guava:29.0-jre'
diff --git a/template/android/build.gradle b/template/android/build.gradle
index 2bafa1f491c53c..2131e76d46d75d 100644
--- a/template/android/build.gradle
+++ b/template/android/build.gradle
@@ -13,7 +13,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:3.6.4")
+        classpath("com.android.tools.build:gradle:4.0.1")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

From 8b7fd37b42469d5633fab943e5eba9b1611d1273 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Wed, 30 Sep 2020 22:38:12 -0700
Subject: [PATCH 150/241] Log View hierarchy if removeViewAt crashes

Summary:
If removeViewAt crashes, log the children of the parent view, and all of the parent's ancestors.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24019515

fbshipit-source-id: c5b1ca0948ebc47f2648e161770affa8542ca5dd
---
 .../fabric/mounting/MountingManager.java      | 32 ++++++++++++++-----
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
index 6ff40bda0ffb18..632f57af48fa38 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
@@ -63,9 +63,9 @@ public MountingManager(@NonNull ViewManagerRegistry viewManagerRegistry) {
     mViewManagerRegistry = viewManagerRegistry;
   }
 
-  private static void logViewHierarchy(ViewGroup parent) {
+  private static void logViewHierarchy(ViewGroup parent, boolean recurse) {
     int parentTag = parent.getId();
-    FLog.e(TAG, "  <ViewGroup tag=" + parentTag + ">");
+    FLog.e(TAG, "  <ViewGroup tag=" + parentTag + " class=" + parent.getClass().toString() + ">");
     for (int i = 0; i < parent.getChildCount(); i++) {
       FLog.e(
           TAG,
@@ -73,11 +73,24 @@ private static void logViewHierarchy(ViewGroup parent) {
               + i
               + " tag="
               + parent.getChildAt(i).getId()
-              + " toString="
-              + parent.getChildAt(i).toString()
+              + " class="
+              + parent.getChildAt(i).getClass().toString()
               + ">");
     }
     FLog.e(TAG, "  </ViewGroup tag=" + parentTag + ">");
+
+    if (recurse) {
+      FLog.e(TAG, "Displaying Ancestors:");
+      ViewParent ancestor = parent.getParent();
+      while (ancestor != null) {
+        ViewGroup ancestorViewGroup = (ancestor instanceof ViewGroup ? (ViewGroup) ancestor : null);
+        int ancestorId = ancestorViewGroup == null ? View.NO_ID : ancestorViewGroup.getId();
+        FLog.e(
+            TAG,
+            "<ViewParent tag=" + ancestorId + " class=" + ancestor.getClass().toString() + ">");
+        ancestor = ancestor.getParent();
+      }
+    }
   }
 
   /**
@@ -218,7 +231,7 @@ public void addViewAt(final int parentTag, final int tag, final int index) {
     // Display children before inserting
     if (SHOW_CHANGED_VIEW_HIERARCHIES) {
       FLog.e(TAG, "addViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " BEFORE");
-      logViewHierarchy(parentView);
+      logViewHierarchy(parentView, false);
     }
 
     try {
@@ -243,7 +256,7 @@ public void addViewAt(final int parentTag, final int tag, final int index) {
             public void run() {
               FLog.e(
                   TAG, "addViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " AFTER");
-              logViewHierarchy(parentView);
+              logViewHierarchy(parentView, false);
             }
           });
     }
@@ -359,7 +372,7 @@ public void removeViewAt(final int tag, final int parentTag, final int index) {
     if (SHOW_CHANGED_VIEW_HIERARCHIES) {
       // Display children before deleting any
       FLog.e(TAG, "removeViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " BEFORE");
-      logViewHierarchy(parentView);
+      logViewHierarchy(parentView, false);
     }
 
     ViewGroupManager<ViewGroup> viewGroupManager = getViewGroupManager(viewState);
@@ -398,6 +411,7 @@ public void removeViewAt(final int tag, final int parentTag, final int index) {
         return;
       }
 
+      logViewHierarchy(parentView, true);
       throw new IllegalStateException(
           "Tried to remove view ["
               + tag
@@ -431,6 +445,8 @@ public void removeViewAt(final int tag, final int parentTag, final int index) {
       // enough that we shouldn't try to change this invariant, without a lot of thought.
       int childCount = viewGroupManager.getChildCount(parentView);
 
+      logViewHierarchy(parentView, true);
+
       throw new IllegalStateException(
           "Cannot remove child at index "
               + index
@@ -451,7 +467,7 @@ public void run() {
               FLog.e(
                   TAG,
                   "removeViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " AFTER");
-              logViewHierarchy(parentView);
+              logViewHierarchy(parentView, false);
             }
           });
     }

From dd35bf534c4ced6af853bf2c9a995808e42b8a95 Mon Sep 17 00:00:00 2001
From: Sam Goldman <samgoldman@fb.com>
Date: Wed, 30 Sep 2020 23:31:51 -0700
Subject: [PATCH 151/241] Deploy Flow v0.135.0

Summary: Changelog: [Internal]

Reviewed By: mroch

Differential Revision: D24040584

fbshipit-source-id: 106caa00cadd6930685c0030ad74685c64572ba9
---
 .flowconfig              | 2 +-
 .flowconfig.android      | 2 +-
 package.json             | 2 +-
 repo-config/package.json | 2 +-
 template/_flowconfig     | 2 +-
 yarn.lock                | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index edd3fc461862b4..c8b28fb8c86800 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -75,4 +75,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.134.0
+^0.135.0
diff --git a/.flowconfig.android b/.flowconfig.android
index 63d4ec5bcecaaa..8008aacbad5243 100644
--- a/.flowconfig.android
+++ b/.flowconfig.android
@@ -75,4 +75,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.134.0
+^0.135.0
diff --git a/package.json b/package.json
index 433b4c90a32c7b..9dad79fee24983 100644
--- a/package.json
+++ b/package.json
@@ -116,7 +116,7 @@
     "ws": "^6.1.4"
   },
   "devDependencies": {
-    "flow-bin": "^0.134.0",
+    "flow-bin": "^0.135.0",
     "react": "16.13.1"
   },
   "detox": {
diff --git a/repo-config/package.json b/repo-config/package.json
index ea2ac36be0f543..3e7a2c74386a8e 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -33,7 +33,7 @@
     "eslint-plugin-react-hooks": "^4.0.7",
     "eslint-plugin-react-native": "3.8.1",
     "eslint-plugin-relay": "1.7.1",
-    "flow-bin": "^0.134.0",
+    "flow-bin": "^0.135.0",
     "jest": "^26.0.1",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.9.0",
diff --git a/template/_flowconfig b/template/_flowconfig
index b1e00ccf3aa23f..644e2a9d6cce2a 100644
--- a/template/_flowconfig
+++ b/template/_flowconfig
@@ -63,4 +63,4 @@ untyped-import
 untyped-type-import
 
 [version]
-^0.134.0
+^0.135.0
diff --git a/yarn.lock b/yarn.lock
index a043e328e032cd..08bfcfa0829276 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3102,10 +3102,10 @@ flatted@^2.0.0:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
-flow-bin@^0.134.0:
-  version "0.134.0"
-  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.134.0.tgz#e98e5724f6ed5a1265cf904bbb5e4c096ea3a026"
-  integrity sha512-j5aCugO3jmwDsUKc+7KReArgnL6aVjHLo6DlozKhxKYN+TaP8BY+mintPSISjSQtKZFJyvoNAc1oXA79X5WjIA==
+flow-bin@^0.135.0:
+  version "0.135.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.135.0.tgz#70bcd7bae0231777dd05cc8707ff34b37824bbad"
+  integrity sha512-E0JIKWopjULE/fl1X+j7rh0zgcgD5nubLs3HWYeYPo+nWFy8dALvrQbFcCFoPePrkhY/fffhN28t8P1zBxB2Yg==
 
 flow-parser@0.*, flow-parser@^0.121.0:
   version "0.121.0"

From 030d2c1931fb9ff97f682343914503a1c359e1c4 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 1 Oct 2020 04:49:15 -0700
Subject: [PATCH 152/241] Fix TextInput crash in non-Fabric

Summary:
This is a check to execute code only in Fabric, and... it's just wrong. This object is *always* present, for Fabric and non-Fabric. We instead need to check if there's actually a state object, as other parts of the code check for.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D24042677

fbshipit-source-id: 5cf6ebc8f07987d917fdf11042d1715876fa8229
---
 .../java/com/facebook/react/views/textinput/ReactEditText.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index 570dd1f2fe07b4..d8bac9ffb79c89 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -936,7 +936,7 @@ public FabricViewStateManager getFabricViewStateManager() {
    */
   private void updateCachedSpannable(boolean resetStyles) {
     // Noops in non-Fabric
-    if (getFabricViewStateManager() == null) {
+    if (mFabricViewStateManager.hasStateWrapper()) {
       return;
     }
     // If this view doesn't have an ID yet, we don't have a cache key, so bail here

From 8f5f3d159b25a0b1893a2026dab510d9d1fe586f Mon Sep 17 00:00:00 2001
From: Mike Vitousek <mvitousek@fb.com>
Date: Thu, 1 Oct 2020 06:04:59 -0700
Subject: [PATCH 153/241] Add Flow annotations to escaped generics in xplat

Summary:
Flow will soon stop allowing generic types to "escape" out of the scope in which they were defined. The fix will be to add annotations to currently-unannotated variables, parameters, and function returns, so that generics don't become inputs to type inference for those positions. This diff adds new type annotations to xplat where possible to minimize the impact of this change.

This diff was generated by running
```
buck run //flow/src/facebook/komodo/binaries:annotate_escaped_generics -- --write ../../xplat/js
```
from within the flow directory, and then reverting changes that led to new errors. Most changes were reverted by running:
```
facebook/flowd check --json --json-version=2 ../../xplat/js &> post-json
jq -f j.jq < post-json | xargs hg revert
```
where `j.jq` is
```
def locs: [.primaryLoc.source, (select(.rootLoc.source != null) | .rootLoc.source), .referenceLocs[].source ] | unique;
[.errors[] | locs[]] | unique | .[]
```

Changelog: [Internal]

Reviewed By: panagosg7

Differential Revision: D24006427

fbshipit-source-id: 0cd6ec8a9611d8b1e9b14c54f9fffd2d7de2fd9e
---
 ReactAndroid/src/androidTest/js/ScrollViewTestModule.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
index 3a6a887919bf26..11ee033dc84987 100644
--- a/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
+++ b/ReactAndroid/src/androidTest/js/ScrollViewTestModule.js
@@ -30,7 +30,7 @@ import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 
 // Shared by integration tests for ScrollView and HorizontalScrollView
 
-let scrollViewApp;
+let scrollViewApp: ScrollViewTestApp | HorizontalScrollViewTestApp;
 
 type ItemProps = $ReadOnly<{|
   onPress: (event: PressEvent) => void,

From edbe154a3043d6116b04af9016711f31311b409e Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@fb.com>
Date: Thu, 1 Oct 2020 06:56:57 -0700
Subject: [PATCH 154/241] Passing JS callback as a parameter in registerSegment

Summary: Changelog: [Internal]

Reviewed By: makovkastar

Differential Revision: D24000338

fbshipit-source-id: 65d901f6d2bf51a150bce6871517d0a30ab9f821
---
 .../src/main/java/com/facebook/react/bridge/ReactContext.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
index 1bbd069bce3749..859d227243f2e8 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactContext.java
@@ -470,7 +470,8 @@ public JavaScriptContextHolder getJavaScriptContextHolder() {
    * @param segmentId
    * @param path
    */
-  public void registerSegment(int segmentId, String path) {
+  public void registerSegment(int segmentId, String path, Callback callback) {
     Assertions.assertNotNull(mCatalystInstance).registerSegment(segmentId, path);
+    Assertions.assertNotNull(callback).invoke();
   }
 }

From 16afda22825776b8e79bfcc5aef367a5ce3a042b Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 1 Oct 2020 09:36:03 -0700
Subject: [PATCH 155/241] Fabric: Making `RCTFabricSurface` to hold a
 `RCTSurfacePresenter` weakly

Summary:
With this change a RCTFabricSurface instance will not longer to hold a `RCTSurfacePresenter`. This change will enforce the guarantee that retaining a `RCTFabricSurface` is not enough for the service to run (something also should retain a `RCTSurfacePresenter`).

For now it's a very small fix that should not anything, but this is a crusial part of some changes I am working on (one aspect of which implied calling unregistration in a `RCTFabricSurface`'s destructor). I need to decouple this part to test this change earlier and decouple this part of the complexity from the future diffs.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D24039581

fbshipit-source-id: c289ae057f0cd5b438f0aa9a1eb8577e1e00b39c
---
 React/Fabric/Surface/RCTFabricSurface.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/React/Fabric/Surface/RCTFabricSurface.mm b/React/Fabric/Surface/RCTFabricSurface.mm
index 9cd25cd8318dad..728bdcf0f8e0aa 100644
--- a/React/Fabric/Surface/RCTFabricSurface.mm
+++ b/React/Fabric/Surface/RCTFabricSurface.mm
@@ -24,7 +24,7 @@
 
 @implementation RCTFabricSurface {
   // Immutable
-  RCTSurfacePresenter *_surfacePresenter;
+  __weak RCTSurfacePresenter *_surfacePresenter;
   NSString *_moduleName;
 
   // Protected by the `_mutex`

From 61cfa97067eec6d33c23670ae2128348fcff5d1b Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 1 Oct 2020 09:36:03 -0700
Subject: [PATCH 156/241] Breaking a retain cycle between
 `RCTSurfaceTouchHandler` and `RCTFabricSurface` (another approach)

Summary:
This is a different approach to break the retain cycle: instead of detaching a view manually, we store a pointer to a view weakly.

I am working on some change that will make possible (and make use of it) to call `start` and `stop` on Surface objects mutiple times, so to make it happens we need to remove detaching from `stop` method.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D24041524

fbshipit-source-id: 700b13d715d2eb84d52bf3e51e0fd2896a55baf8
---
 React/Fabric/RCTSurfaceTouchHandler.h    | 4 ++++
 React/Fabric/RCTSurfaceTouchHandler.mm   | 5 ++++-
 React/Fabric/Surface/RCTFabricSurface.mm | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/React/Fabric/RCTSurfaceTouchHandler.h b/React/Fabric/RCTSurfaceTouchHandler.h
index 1c642be78f5b7f..b20e195322ab94 100644
--- a/React/Fabric/RCTSurfaceTouchHandler.h
+++ b/React/Fabric/RCTSurfaceTouchHandler.h
@@ -11,6 +11,10 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RCTSurfaceTouchHandler : UIGestureRecognizer
 
+/*
+ * Attaches (and detaches) a view to the touch handler.
+ * The receiver does not retain the provided view.
+ */
 - (void)attachToView:(UIView *)view;
 - (void)detachFromView:(UIView *)view;
 
diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm
index c3edd4eed628d1..387908ccf6d729 100644
--- a/React/Fabric/RCTSurfaceTouchHandler.mm
+++ b/React/Fabric/RCTSurfaceTouchHandler.mm
@@ -159,7 +159,10 @@ @implementation RCTSurfaceTouchHandler {
   std::unordered_map<__unsafe_unretained UITouch *, ActiveTouch, PointerHasher<__unsafe_unretained UITouch *>>
       _activeTouches;
 
-  UIView *_rootComponentView;
+  /*
+   * We hold the view weakly to prevent a retain cycle.
+   */
+  __weak UIView *_rootComponentView;
   IdentifierPool<11> _identifierPool;
 }
 
diff --git a/React/Fabric/Surface/RCTFabricSurface.mm b/React/Fabric/Surface/RCTFabricSurface.mm
index 728bdcf0f8e0aa..9d73a3d3caa163 100644
--- a/React/Fabric/Surface/RCTFabricSurface.mm
+++ b/React/Fabric/Surface/RCTFabricSurface.mm
@@ -83,7 +83,6 @@ - (BOOL)stop
   }
 
   [_surfacePresenter unregisterSurface:self];
-  [_touchHandler detachFromView:_view];
   return YES;
 }
 

From b2c022ec54f094f84407151bb2756e1cb7202bc4 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 1 Oct 2020 12:16:08 -0700
Subject: [PATCH 157/241] Prevent Fabric from changing props if they are
 managed by Animated

Summary:
Changelog: [internal]

# Problem

Fabric doesn't know when NativeAnimatedModule control a prop and overrides its change whenever any prop changes. For example component A is animating its opacity from 1 to 0. NativeAnimatedModule starts calling `[RCTViewComponentView updateProps:oldProps:]` method interpolating opacity from 1 to 0.

After it is finished, if any prop is updated on the component. Its opacity will be set to default.

# Fix

This is a temporary problem until Unified Animation System is put in place. To work around the issue for now, we keep a set of prop keys controlled by animated and only update the prop if it isn't in this list. List is cleared when the component is reused.

Reviewed By: JoshuaGross

Differential Revision: D24046848

fbshipit-source-id: 63cca6854f97b2de764cb3ed505d328323c64525
---
 .../View/RCTViewComponentView.mm              | 21 +++++++++++++++++--
 .../Mounting/RCTComponentViewProtocol.h       |  2 ++
 React/Fabric/Mounting/RCTMountingManager.mm   |  2 ++
 .../Mounting/UIView+ComponentViewProtocol.h   |  2 ++
 .../Mounting/UIView+ComponentViewProtocol.mm  |  5 +++++
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index 428d8bc630e1b0..e50f0c2540fc5d 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -23,6 +23,7 @@ @implementation RCTViewComponentView {
   UIColor *_backgroundColor;
   CALayer *_borderLayer;
   BOOL _needsInvalidateLayer;
+  NSSet<NSString *> *_propKeysManagedByAnimated;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -83,6 +84,11 @@ + (ComponentDescriptorProvider)componentDescriptorProvider
   return concreteComponentDescriptorProvider<ViewComponentDescriptor>();
 }
 
+- (void)setPropKeysManagedByAnimated:(nullable NSSet<NSString *> *)propKeys
+{
+  _propKeysManagedByAnimated = propKeys;
+}
+
 - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
 {
 #ifndef NS_BLOCK_ASSERTIONS
@@ -102,7 +108,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   BOOL needsInvalidateLayer = NO;
 
   // `opacity`
-  if (oldViewProps.opacity != newViewProps.opacity) {
+  if (oldViewProps.opacity != newViewProps.opacity && ![_propKeysManagedByAnimated containsObject:@"opacity"]) {
     self.layer.opacity = (CGFloat)newViewProps.opacity;
     needsInvalidateLayer = YES;
   }
@@ -161,7 +167,7 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   }
 
   // `transform`
-  if (oldViewProps.transform != newViewProps.transform) {
+  if (oldViewProps.transform != newViewProps.transform && ![_propKeysManagedByAnimated containsObject:@"transform"]) {
     self.layer.transform = RCTCATransform3DFromTransformMatrix(newViewProps.transform);
     self.layer.allowsEdgeAntialiasing = newViewProps.transform != Transform::Identity();
   }
@@ -286,6 +292,17 @@ - (void)finalizeUpdates:(RNComponentViewUpdateMask)updateMask
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
+
+  // If view was managed by animated, its props need to align with UIView's properties.
+  auto const &props = *std::static_pointer_cast<ViewProps const>(_props);
+  if ([_propKeysManagedByAnimated containsObject:@"transform"]) {
+    self.layer.transform = RCTCATransform3DFromTransformMatrix(props.transform);
+  }
+  if ([_propKeysManagedByAnimated containsObject:@"opacity"]) {
+    self.layer.opacity = (CGFloat)props.opacity;
+  }
+
+  _propKeysManagedByAnimated = nil;
   _eventEmitter.reset();
 }
 
diff --git a/React/Fabric/Mounting/RCTComponentViewProtocol.h b/React/Fabric/Mounting/RCTComponentViewProtocol.h
index 9c6a862aeaa449..2595f3b09f135c 100644
--- a/React/Fabric/Mounting/RCTComponentViewProtocol.h
+++ b/React/Fabric/Mounting/RCTComponentViewProtocol.h
@@ -116,6 +116,8 @@ typedef NS_OPTIONS(NSInteger, RNComponentViewUpdateMask) {
  */
 - (facebook::react::SharedProps)props;
 
+- (void)setPropKeysManagedByAnimated:(nullable NSSet<NSString *> *)propKeys;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/RCTMountingManager.mm b/React/Fabric/Mounting/RCTMountingManager.mm
index 6a886530487ad0..b593f122c7478f 100644
--- a/React/Fabric/Mounting/RCTMountingManager.mm
+++ b/React/Fabric/Mounting/RCTMountingManager.mm
@@ -222,7 +222,9 @@ - (void)synchronouslyUpdateViewOnUIThread:(ReactTag)reactTag
   UIView<RCTComponentViewProtocol> *componentView = [_componentViewRegistry findComponentViewWithTag:reactTag];
   SharedProps oldProps = [componentView props];
   SharedProps newProps = componentDescriptor.cloneProps(oldProps, RawProps(convertIdToFollyDynamic(props)));
+  [componentView setPropKeysManagedByAnimated:nil];
   [componentView updateProps:newProps oldProps:oldProps];
+  [componentView setPropKeysManagedByAnimated:[NSSet setWithArray:props.allKeys]];
 }
 
 - (void)synchronouslyDispatchCommandOnUIThread:(ReactTag)reactTag
diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
index ab8219555b24bb..09d355354693b8 100644
--- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
+++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.h
@@ -39,6 +39,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (facebook::react::SharedProps)props;
 
+- (void)setPropKeysManagedByAnimated:(nullable NSSet<NSString *> *)propKeys;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
index c0de92d8c21df9..39d9af5cc41e5d 100644
--- a/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
+++ b/React/Fabric/Mounting/UIView+ComponentViewProtocol.mm
@@ -132,4 +132,9 @@ - (void)prepareForRecycle
   return nullptr;
 }
 
+- (void)setPropKeysManagedByAnimated:(nullable NSSet<NSString *> *)propKeys
+{
+  // Default implementation does nothing.
+}
+
 @end

From 9a2a4ba57903a63fe0ae3e016582fde95b203331 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Thu, 1 Oct 2020 12:23:27 -0700
Subject: [PATCH 158/241] Remove handling of view commands for Fabric

Summary:
Changelog: [internal]

This code was put in when we didn't have view commands implementation in Fabric. Now we do so let's get rid of it.

Reviewed By: JoshuaGross

Differential Revision: D24046269

fbshipit-source-id: d0f203bc09bf22f5307cb1844d14b295fe3550dd
---
 React/Views/RCTSwitchManager.m | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/React/Views/RCTSwitchManager.m b/React/Views/RCTSwitchManager.m
index 04f7006c74f646..2ea446fac9f5dc 100644
--- a/React/Views/RCTSwitchManager.m
+++ b/React/Views/RCTSwitchManager.m
@@ -42,12 +42,7 @@ - (void)onChange:(RCTSwitch *)sender
     if ([view isKindOfClass:[UISwitch class]]) {
       [(UISwitch *)view setOn:value animated:NO];
     } else {
-      UIView *subview = view.subviews.firstObject;
-      if ([subview isKindOfClass:[UISwitch class]]) {
-        [(UISwitch *)subview setOn:value animated:NO];
-      } else {
-        RCTLogError(@"view type must be UISwitch");
-      }
+      RCTLogError(@"view type must be UISwitch");
     }
   }];
 }

From e85372298109abf258d5154e2a28bc6496fb9529 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 1 Oct 2020 13:17:50 -0700
Subject: [PATCH 159/241] A couple of checks for corner cases in
 RCTGetDimensions and RCTExportedDimensions

Summary: We need this checks to make the results of those function more reliable.

Reviewed By: sammy-SC

Differential Revision: D24038911

fbshipit-source-id: 3b54fe3056c9508cde84ea157beebea57e7e49b6
---
 React/CoreModules/RCTDeviceInfo.mm | 3 ++-
 React/UIUtils/RCTUIUtils.m         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm
index e3ac433991568c..1f0bd576a4b4ec 100644
--- a/React/CoreModules/RCTDeviceInfo.mm
+++ b/React/CoreModules/RCTDeviceInfo.mm
@@ -93,7 +93,8 @@ static BOOL RCTIsIPhoneX()
 static NSDictionary *RCTExportedDimensions(RCTBridge *bridge)
 {
   RCTAssertMainQueue();
-  RCTDimensions dimensions = RCTGetDimensions(bridge.accessibilityManager.multiplier);
+  RCTAssert(bridge, @"Bridge must not be `nil`.");
+  RCTDimensions dimensions = RCTGetDimensions(bridge.accessibilityManager.multiplier ?: 1.0);
   __typeof(dimensions.window) window = dimensions.window;
   NSDictionary<NSString *, NSNumber *> *dimsWindow = @{
     @"width" : @(window.width),
diff --git a/React/UIUtils/RCTUIUtils.m b/React/UIUtils/RCTUIUtils.m
index 2d3243c57832f1..ba9443e298a033 100644
--- a/React/UIUtils/RCTUIUtils.m
+++ b/React/UIUtils/RCTUIUtils.m
@@ -16,7 +16,8 @@ RCTDimensions RCTGetDimensions(CGFloat fontScale)
 
   UIView *mainWindow;
   mainWindow = RCTKeyWindow();
-  CGSize windowSize = mainWindow.bounds.size;
+  // We fallback to screen size if a key window is not found.
+  CGSize windowSize = mainWindow ? mainWindow.bounds.size : screenSize;
 
   RCTDimensions result;
   typeof(result.screen) dimsScreen = {

From 5a1ca38305698c379006a2a55dc399bd6111c917 Mon Sep 17 00:00:00 2001
From: Emily Janzer <janzer@fb.com>
Date: Thu, 1 Oct 2020 14:14:23 -0700
Subject: [PATCH 160/241] Add ReactMarker::logTaggedMarkerWithInstanceKey

Summary:
Adding another method to ReactMarker to log a marker with both a tag and an instanceKey. The instanceKey is used to attach the event to the correct marker instance - this is used already in Java, but not in C++ yet.

The way that ReactMarker is currently set up makes this change a little more complex/confusing. For some reason I'm not totally clear on, we're using C-style exports with some platforms-specific ifdefs in ReactMarker.h (even though the impl is .cpp?). And we swap out the implementation for `logTaggedMarker` at runtime in platform-specific code (JReactMarker and RCTCxxBridge).

In this diff, I just add a new function alongside `logTaggedMarker`, `logTaggedMarkerWithInstanceKey`. I did it this way because I figured modifying `logTaggedMarker` to add an argument would be a breaking change.

Reviewed By: PeteTheHeat

Differential Revision: D23831533

fbshipit-source-id: f5b3eba1f43a80f7723fdb64cfc0a792548db2ba
---
 React/CxxBridge/RCTCxxBridge.mm               |  4 +++
 .../src/main/jni/react/jni/JReactMarker.cpp   | 31 +++++++++++++++----
 .../src/main/jni/react/jni/JReactMarker.h     |  8 +++++
 ReactCommon/cxxreact/ReactMarker.cpp          |  1 +
 ReactCommon/cxxreact/ReactMarker.h            |  7 +++++
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/React/CxxBridge/RCTCxxBridge.mm b/React/CxxBridge/RCTCxxBridge.mm
index 594b1cbeec6536..e459e452ff6226 100644
--- a/React/CxxBridge/RCTCxxBridge.mm
+++ b/React/CxxBridge/RCTCxxBridge.mm
@@ -161,6 +161,10 @@ static void registerPerformanceLoggerHooks(RCTPerformanceLogger *performanceLogg
         break;
     }
   };
+
+  // TODO T76726108 Hook this up to the performance logger
+  ReactMarker::logTaggedMarkerWithInstanceKey =
+      [](const ReactMarker::ReactMarkerId markerId, const char *__unused tag, const __unused int) {};
 }
 
 @interface RCTCxxBridge ()
diff --git a/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp b/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
index 2af23e9d96cd46..6984763ec3540b 100644
--- a/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
+++ b/ReactAndroid/src/main/jni/react/jni/JReactMarker.cpp
@@ -18,6 +18,8 @@ void JReactMarker::setLogPerfMarkerIfNeeded() {
   static std::once_flag flag{};
   std::call_once(flag, []() {
     ReactMarker::logTaggedMarker = JReactMarker::logPerfMarker;
+    ReactMarker::logTaggedMarkerWithInstanceKey =
+        JReactMarker::logPerfMarkerWithInstanceKey;
   });
 }
 
@@ -36,15 +38,32 @@ void JReactMarker::logMarker(
   meth(cls, marker, tag);
 }
 
+void JReactMarker::logMarker(
+    const std::string &marker,
+    const std::string &tag,
+    const int instanceKey) {
+  static auto cls = javaClassStatic();
+  static auto meth =
+      cls->getStaticMethod<void(std::string, std::string, int)>("logMarker");
+  meth(cls, marker, tag, instanceKey);
+}
+
 void JReactMarker::logPerfMarker(
     const ReactMarker::ReactMarkerId markerId,
     const char *tag) {
+  logPerfMarkerWithInstanceKey(markerId, tag, 0);
+}
+
+void JReactMarker::logPerfMarkerWithInstanceKey(
+    const facebook::react::ReactMarker::ReactMarkerId markerId,
+    const char *tag,
+    const int instanceKey) {
   switch (markerId) {
     case ReactMarker::RUN_JS_BUNDLE_START:
-      JReactMarker::logMarker("RUN_JS_BUNDLE_START", tag);
+      JReactMarker::logMarker("RUN_JS_BUNDLE_START", tag, instanceKey);
       break;
     case ReactMarker::RUN_JS_BUNDLE_STOP:
-      JReactMarker::logMarker("RUN_JS_BUNDLE_END", tag);
+      JReactMarker::logMarker("RUN_JS_BUNDLE_END", tag, instanceKey);
       break;
     case ReactMarker::CREATE_REACT_CONTEXT_STOP:
       JReactMarker::logMarker("CREATE_REACT_CONTEXT_END");
@@ -56,16 +75,16 @@ void JReactMarker::logPerfMarker(
       JReactMarker::logMarker("loadApplicationScript_endStringConvert");
       break;
     case ReactMarker::NATIVE_MODULE_SETUP_START:
-      JReactMarker::logMarker("NATIVE_MODULE_SETUP_START", tag);
+      JReactMarker::logMarker("NATIVE_MODULE_SETUP_START", tag, instanceKey);
       break;
     case ReactMarker::NATIVE_MODULE_SETUP_STOP:
-      JReactMarker::logMarker("NATIVE_MODULE_SETUP_END", tag);
+      JReactMarker::logMarker("NATIVE_MODULE_SETUP_END", tag, instanceKey);
       break;
     case ReactMarker::REGISTER_JS_SEGMENT_START:
-      JReactMarker::logMarker("REGISTER_JS_SEGMENT_START", tag);
+      JReactMarker::logMarker("REGISTER_JS_SEGMENT_START", tag, instanceKey);
       break;
     case ReactMarker::REGISTER_JS_SEGMENT_STOP:
-      JReactMarker::logMarker("REGISTER_JS_SEGMENT_STOP", tag);
+      JReactMarker::logMarker("REGISTER_JS_SEGMENT_STOP", tag, instanceKey);
       break;
     case ReactMarker::NATIVE_REQUIRE_START:
     case ReactMarker::NATIVE_REQUIRE_STOP:
diff --git a/ReactAndroid/src/main/jni/react/jni/JReactMarker.h b/ReactAndroid/src/main/jni/react/jni/JReactMarker.h
index 7b5e8e143f242b..d495daf9ec6c93 100644
--- a/ReactAndroid/src/main/jni/react/jni/JReactMarker.h
+++ b/ReactAndroid/src/main/jni/react/jni/JReactMarker.h
@@ -24,9 +24,17 @@ class JReactMarker : public facebook::jni::JavaClass<JReactMarker> {
  private:
   static void logMarker(const std::string &marker);
   static void logMarker(const std::string &marker, const std::string &tag);
+  static void logMarker(
+      const std::string &marker,
+      const std::string &tag,
+      const int instanceKey);
   static void logPerfMarker(
       const ReactMarker::ReactMarkerId markerId,
       const char *tag);
+  static void logPerfMarkerWithInstanceKey(
+      const ReactMarker::ReactMarkerId markerId,
+      const char *tag,
+      const int instanceKey);
 };
 
 } // namespace react
diff --git a/ReactCommon/cxxreact/ReactMarker.cpp b/ReactCommon/cxxreact/ReactMarker.cpp
index 52da94e7d08175..1f9ce2bb5f9a87 100644
--- a/ReactCommon/cxxreact/ReactMarker.cpp
+++ b/ReactCommon/cxxreact/ReactMarker.cpp
@@ -17,6 +17,7 @@ namespace ReactMarker {
 #endif
 
 LogTaggedMarker logTaggedMarker = nullptr;
+LogTaggedMarkerWithInstanceKey logTaggedMarkerWithInstanceKey = nullptr;
 
 #if __clang__
 #pragma clang diagnostic pop
diff --git a/ReactCommon/cxxreact/ReactMarker.h b/ReactCommon/cxxreact/ReactMarker.h
index cc55b9ac77695a..451d8cea8124cc 100644
--- a/ReactCommon/cxxreact/ReactMarker.h
+++ b/ReactCommon/cxxreact/ReactMarker.h
@@ -32,8 +32,14 @@ enum ReactMarkerId {
 #ifdef __APPLE__
 using LogTaggedMarker =
     std::function<void(const ReactMarkerId, const char *tag)>;
+using LogTaggedMarkerWithInstanceKey = std::function<
+    void(const ReactMarkerId, const char *tag, const int instanceKey)>;
 #else
 typedef void (*LogTaggedMarker)(const ReactMarkerId, const char *tag);
+typedef void (*LogTaggedMarkerWithInstanceKey)(
+    const ReactMarkerId,
+    const char *tag,
+    const int instanceKey);
 #endif
 
 #ifndef RN_EXPORT
@@ -41,6 +47,7 @@ typedef void (*LogTaggedMarker)(const ReactMarkerId, const char *tag);
 #endif
 
 extern RN_EXPORT LogTaggedMarker logTaggedMarker;
+extern RN_EXPORT LogTaggedMarkerWithInstanceKey logTaggedMarkerWithInstanceKey;
 
 extern RN_EXPORT void logMarker(const ReactMarkerId markerId);
 

From 0a2e0f777bd41e4bdf26ecb30b16a952a65bafcf Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 161/241] Make Flow Parser snapshots more readable

Summary:
The Flow Parser's snapshots, which are serializations of the CodegenSchema object, are extremely difficult to read. In this diff, I explicitly serialized the schema objects using Node's `util.inspect`.

**Benefits:**
- The snapshots are more readable now.
- You can copy-paste the objects from the snapshot files directly into the Chrome console, or into other JavaScript files. This is a very useful feature, when we're testing the generators, or other infra that depends on the codegen.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24063112

fbshipit-source-id: 2c6ec3424aac8bab2688dc6ae286b73f90e4bef1
---
 .../component-parser-test.js.snap             | 14844 ++++++++--------
 .../__tests__/component-parser-test.js        |     8 +-
 .../module-parser-snapshot-test.js.snap       |  2339 ++-
 .../__tests__/module-parser-snapshot-test.js  |     9 +-
 4 files changed, 8125 insertions(+), 9075 deletions(-)

diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
index 5ae118d770dd63..abfd9047f17acc 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
@@ -35,7979 +35,7153 @@ exports[`RN Codegen Flow Parser Fails with error message PROPS_CONFLICT_WITH_SPR
 exports[`RN Codegen Flow Parser Fails with error message PROPS_SPREAD_CONFLICTS_WITH_PROPS 1`] = `"A prop was already defined with the name isEnabled"`;
 
 exports[`RN Codegen Flow Parser can generate fixture ALL_PROP_TYPES_NO_EVENTS 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "props": Array [
-            Object {
-              "name": "boolean_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": false,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "boolean_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": true,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "boolean_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": true,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "boolean_null_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "boolean_null_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "string_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "string_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": "",
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "string_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": "",
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "string_null_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "string_null_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "stringish_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "stringish_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": "",
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "stringish_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": "",
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "stringish_null_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "stringish_null_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "double_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": 0,
-                "type": "DoubleTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "double_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": 1.1,
-                "type": "DoubleTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "double_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": 1.1,
-                "type": "DoubleTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "float_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": 0,
-                "type": "FloatTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "float_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": 1.1,
-                "type": "FloatTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "float_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": 1.1,
-                "type": "FloatTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "float_null_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "FloatTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "float_null_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "FloatTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "int32_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": 0,
-                "type": "Int32TypeAnnotation",
-              },
-            },
-            Object {
-              "name": "int32_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": 1,
-                "type": "Int32TypeAnnotation",
-              },
-            },
-            Object {
-              "name": "int32_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": 1,
-                "type": "Int32TypeAnnotation",
-              },
-            },
-            Object {
-              "name": "enum_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": "small",
-                "options": Array [
-                  Object {
-                    "name": "small",
-                  },
-                  Object {
-                    "name": "large",
-                  },
-                ],
-                "type": "StringEnumTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "enum_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": "small",
-                "options": Array [
-                  Object {
-                    "name": "small",
-                  },
-                  Object {
-                    "name": "large",
-                  },
-                ],
-                "type": "StringEnumTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "int_enum_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": 0,
-                "options": Array [
-                  Object {
-                    "value": 0,
-                  },
-                  Object {
-                    "value": 1,
-                  },
-                ],
-                "type": "Int32EnumTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "object_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": null,
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "object_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": null,
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "object_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": null,
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "image_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "name": "ImageSourcePrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "image_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ImageSourcePrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "image_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ImageSourcePrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_array_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_array_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_array_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_array_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "ColorPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "name": "PointPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "PointPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "PointPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "PointPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "name": "EdgeInsetsPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "EdgeInsetsPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "EdgeInsetsPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "name": "EdgeInsetsPrimitive",
-                "type": "ReservedPropTypeAnnotation",
-              },
-            },
+          events: [],
+          props: [
+            {
+              name: 'boolean_required',
+              optional: false,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+            },
+            {
+              name: 'boolean_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+            },
+            {
+              name: 'boolean_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+            },
+            {
+              name: 'boolean_null_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: null }
+            },
+            {
+              name: 'boolean_null_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: null }
+            },
+            {
+              name: 'string_required',
+              optional: false,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'string_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+            },
+            {
+              name: 'string_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+            },
+            {
+              name: 'string_null_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'string_null_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'stringish_required',
+              optional: false,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'stringish_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+            },
+            {
+              name: 'stringish_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+            },
+            {
+              name: 'stringish_null_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'stringish_null_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'double_required',
+              optional: false,
+              typeAnnotation: { type: 'DoubleTypeAnnotation', default: 0 }
+            },
+            {
+              name: 'double_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'DoubleTypeAnnotation', default: 1.1 }
+            },
+            {
+              name: 'double_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'DoubleTypeAnnotation', default: 1.1 }
+            },
+            {
+              name: 'float_required',
+              optional: false,
+              typeAnnotation: { type: 'FloatTypeAnnotation', default: 0 }
+            },
+            {
+              name: 'float_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'FloatTypeAnnotation', default: 1.1 }
+            },
+            {
+              name: 'float_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'FloatTypeAnnotation', default: 1.1 }
+            },
+            {
+              name: 'float_null_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'FloatTypeAnnotation', default: null }
+            },
+            {
+              name: 'float_null_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'FloatTypeAnnotation', default: null }
+            },
+            {
+              name: 'int32_required',
+              optional: false,
+              typeAnnotation: { type: 'Int32TypeAnnotation', default: 0 }
+            },
+            {
+              name: 'int32_optional_key',
+              optional: true,
+              typeAnnotation: { type: 'Int32TypeAnnotation', default: 1 }
+            },
+            {
+              name: 'int32_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'Int32TypeAnnotation', default: 1 }
+            },
+            {
+              name: 'enum_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'StringEnumTypeAnnotation',
+                default: 'small',
+                options: [ { name: 'small' }, { name: 'large' } ]
+              }
+            },
+            {
+              name: 'enum_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'StringEnumTypeAnnotation',
+                default: 'small',
+                options: [ { name: 'small' }, { name: 'large' } ]
+              }
+            },
+            {
+              name: 'int_enum_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'Int32EnumTypeAnnotation',
+                default: 0,
+                options: [ { value: 0 }, { value: 1 } ]
+              }
+            },
+            {
+              name: 'object_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'object_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'object_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'image_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ImageSourcePrimitive'
+              }
+            },
+            {
+              name: 'image_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ImageSourcePrimitive'
+              }
+            },
+            {
+              name: 'image_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ImageSourcePrimitive'
+              }
+            },
+            {
+              name: 'color_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'color_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'color_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'color_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'color_array_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'color_array_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'color_array_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'color_array_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'processed_color_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'processed_color_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'processed_color_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'processed_color_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'ColorPrimitive'
+              }
+            },
+            {
+              name: 'point_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'PointPrimitive'
+              }
+            },
+            {
+              name: 'point_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'PointPrimitive'
+              }
+            },
+            {
+              name: 'point_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'PointPrimitive'
+              }
+            },
+            {
+              name: 'point_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'PointPrimitive'
+              }
+            },
+            {
+              name: 'insets_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'EdgeInsetsPrimitive'
+              }
+            },
+            {
+              name: 'insets_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'EdgeInsetsPrimitive'
+              }
+            },
+            {
+              name: 'insets_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'EdgeInsetsPrimitive'
+              }
+            },
+            {
+              name: 'insets_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ReservedPropTypeAnnotation',
+                name: 'EdgeInsetsPrimitive'
+              }
+            }
           ],
-        },
-      },
-    },
-  },
-}
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "props": Array [
-            Object {
-              "name": "array_boolean_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "BooleanTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_boolean_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "BooleanTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_boolean_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "BooleanTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_boolean_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "BooleanTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_string_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "StringTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_string_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "StringTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_string_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "StringTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_string_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "StringTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_double_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "DoubleTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_double_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "DoubleTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_double_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "DoubleTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_double_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "DoubleTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_float_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "FloatTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_float_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "FloatTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_float_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "FloatTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_float_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "FloatTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_int32_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "Int32TypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_int32_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "Int32TypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_int32_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "Int32TypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_int32_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "Int32TypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_enum_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "default": "small",
-                  "options": Array [
-                    Object {
-                      "name": "small",
-                    },
-                    Object {
-                      "name": "large",
-                    },
-                  ],
-                  "type": "StringEnumTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_enum_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "default": "small",
-                  "options": Array [
-                    Object {
-                      "name": "small",
-                    },
-                    Object {
-                      "name": "large",
-                    },
-                  ],
-                  "type": "StringEnumTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_image_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ImageSourcePrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_image_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ImageSourcePrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_image_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ImageSourcePrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_image_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ImageSourcePrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_color_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_color_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_color_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_color_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "ColorPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_point_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "PointPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_point_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "PointPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_point_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "PointPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_point_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "PointPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_insets_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "EdgeInsetsPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_insets_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "EdgeInsetsPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_insets_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "EdgeInsetsPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_insets_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "name": "EdgeInsetsPrimitive",
-                  "type": "ReservedPropTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_object_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "prop",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "default": null,
-                        "type": "StringTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_object_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "prop",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "default": null,
-                        "type": "StringTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_object_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "prop",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "default": null,
-                        "type": "StringTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_object_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "prop",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "default": null,
-                        "type": "StringTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_of_array_object_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "array_object_required",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "elementType": Object {
-                          "properties": Array [
-                            Object {
-                              "name": "prop",
-                              "optional": false,
-                              "typeAnnotation": Object {
-                                "default": null,
-                                "type": "StringTypeAnnotation",
-                              },
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                        "type": "ArrayTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_of_array_object_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "array_object_optional_key",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "elementType": Object {
-                          "properties": Array [
-                            Object {
-                              "name": "prop",
-                              "optional": true,
-                              "typeAnnotation": Object {
-                                "default": null,
-                                "type": "StringTypeAnnotation",
-                              },
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                        "type": "ArrayTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_of_array_object_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "array_object_optional_value",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "elementType": Object {
-                          "properties": Array [
-                            Object {
-                              "name": "prop",
-                              "optional": true,
-                              "typeAnnotation": Object {
-                                "default": null,
-                                "type": "StringTypeAnnotation",
-                              },
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                        "type": "ArrayTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_of_array_object_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "array_object_optional_both",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "elementType": Object {
-                          "properties": Array [
-                            Object {
-                              "name": "prop",
-                              "optional": true,
-                              "typeAnnotation": Object {
-                                "default": null,
-                                "type": "StringTypeAnnotation",
-                              },
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                        "type": "ArrayTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_of_array_of_object_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "elementType": Object {
-                    "properties": Array [
-                      Object {
-                        "name": "prop",
-                        "optional": false,
-                        "typeAnnotation": Object {
-                          "default": null,
-                          "type": "StringTypeAnnotation",
-                        },
-                      },
-                    ],
-                    "type": "ObjectTypeAnnotation",
-                  },
-                  "type": "ArrayTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_of_array_of_object_required_in_file",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "elementType": Object {
-                    "properties": Array [
-                      Object {
-                        "name": "prop",
-                        "optional": false,
-                        "typeAnnotation": Object {
-                          "default": null,
-                          "type": "StringTypeAnnotation",
-                        },
-                      },
-                    ],
-                    "type": "ObjectTypeAnnotation",
-                  },
-                  "type": "ArrayTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array_of_array_of_object_required_with_spread",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "elementType": Object {
-                    "properties": Array [
-                      Object {
-                        "name": "prop",
-                        "optional": false,
-                        "typeAnnotation": Object {
-                          "default": null,
-                          "type": "StringTypeAnnotation",
-                        },
-                      },
-                    ],
-                    "type": "ObjectTypeAnnotation",
-                  },
-                  "type": "ArrayTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
+          events: [],
+          props: [
+            {
+              name: 'array_boolean_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'BooleanTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_boolean_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'BooleanTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_boolean_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'BooleanTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_boolean_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'BooleanTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_string_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'StringTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_string_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'StringTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_string_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'StringTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_string_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'StringTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_double_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'DoubleTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_double_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'DoubleTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_double_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'DoubleTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_double_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'DoubleTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_float_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'FloatTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_float_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'FloatTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_float_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'FloatTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_float_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'FloatTypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_int32_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'Int32TypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_int32_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'Int32TypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_int32_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'Int32TypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_int32_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'Int32TypeAnnotation' }
+              }
+            },
+            {
+              name: 'array_enum_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'StringEnumTypeAnnotation',
+                  default: 'small',
+                  options: [ { name: 'small' }, { name: 'large' } ]
+                }
+              }
+            },
+            {
+              name: 'array_enum_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'StringEnumTypeAnnotation',
+                  default: 'small',
+                  options: [ { name: 'small' }, { name: 'large' } ]
+                }
+              }
+            },
+            {
+              name: 'array_image_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_image_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_image_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_image_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ImageSourcePrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_color_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_color_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_color_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_color_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'ColorPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_point_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'PointPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_point_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'PointPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_point_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'PointPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_point_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'PointPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_insets_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_insets_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_insets_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_insets_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ReservedPropTypeAnnotation',
+                  name: 'EdgeInsetsPrimitive'
+                }
+              }
+            },
+            {
+              name: 'array_object_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'prop',
+                      optional: false,
+                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_object_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'prop',
+                      optional: false,
+                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_object_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'prop',
+                      optional: false,
+                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_object_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'prop',
+                      optional: false,
+                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_of_array_object_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'array_object_required',
+                      optional: false,
+                      typeAnnotation: {
+                        type: 'ArrayTypeAnnotation',
+                        elementType: {
+                          type: 'ObjectTypeAnnotation',
+                          properties: [
+                            {
+                              name: 'prop',
+                              optional: false,
+                              typeAnnotation: {
+                                type: 'StringTypeAnnotation',
+                                default: null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_of_array_object_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'array_object_optional_key',
+                      optional: false,
+                      typeAnnotation: {
+                        type: 'ArrayTypeAnnotation',
+                        elementType: {
+                          type: 'ObjectTypeAnnotation',
+                          properties: [
+                            {
+                              name: 'prop',
+                              optional: true,
+                              typeAnnotation: {
+                                type: 'StringTypeAnnotation',
+                                default: null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_of_array_object_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'array_object_optional_value',
+                      optional: false,
+                      typeAnnotation: {
+                        type: 'ArrayTypeAnnotation',
+                        elementType: {
+                          type: 'ObjectTypeAnnotation',
+                          properties: [
+                            {
+                              name: 'prop',
+                              optional: true,
+                              typeAnnotation: {
+                                type: 'StringTypeAnnotation',
+                                default: null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_of_array_object_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'array_object_optional_both',
+                      optional: false,
+                      typeAnnotation: {
+                        type: 'ArrayTypeAnnotation',
+                        elementType: {
+                          type: 'ObjectTypeAnnotation',
+                          properties: [
+                            {
+                              name: 'prop',
+                              optional: true,
+                              typeAnnotation: {
+                                type: 'StringTypeAnnotation',
+                                default: null
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'array_of_array_of_object_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ArrayTypeAnnotation',
+                  elementType: {
+                    type: 'ObjectTypeAnnotation',
+                    properties: [
+                      {
+                        name: 'prop',
+                        optional: false,
+                        typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              name: 'array_of_array_of_object_required_in_file',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ArrayTypeAnnotation',
+                  elementType: {
+                    type: 'ObjectTypeAnnotation',
+                    properties: [
+                      {
+                        name: 'prop',
+                        optional: false,
+                        typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      }
+                    ]
+                  }
+                }
+              }
+            },
+            {
+              name: 'array_of_array_of_object_required_with_spread',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ArrayTypeAnnotation',
+                  elementType: {
+                    type: 'ObjectTypeAnnotation',
+                    properties: [
+                      {
+                        name: 'prop',
+                        optional: false,
+                        typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
           ],
-        },
-      },
-    },
-  },
-}
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_EXPORTED 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [
-            Object {
-              "name": "scrollTo",
-              "optional": false,
-              "typeAnnotation": Object {
-                "params": Array [
-                  Object {
-                    "name": "y",
-                    "typeAnnotation": Object {
-                      "type": "Int32TypeAnnotation",
-                    },
-                  },
-                  Object {
-                    "name": "animated",
-                    "typeAnnotation": Object {
-                      "type": "BooleanTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "FunctionTypeAnnotation",
-              },
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "events": Array [
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInline",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+          events: [
+            {
+              name: 'onBubblingEventDefinedInline',
+              optional: false,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineWithPaperName',
+              optional: false,
+              bubblingType: 'bubble',
+              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineWithPaperName",
-              "optional": false,
-              "paperTopLevelNameDeprecated": "paperBubblingEventDefinedInlineWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInline',
+              optional: false,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInline",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineWithPaperName',
+              optional: false,
+              bubblingType: 'direct',
+              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineWithPaperName",
-              "optional": false,
-              "paperTopLevelNameDeprecated": "paperDirectEventDefinedInlineWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
-                            },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
-                            },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
-                            },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
           ],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
-          ],
-          "props": Array [],
-        },
-      },
-    },
-  },
-}
+          props: [],
+          commands: [
+            {
+              name: 'scrollTo',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                params: [
+                  {
+                    name: 'y',
+                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                  },
+                  {
+                    name: 'animated',
+                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_TYPES 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [
-            Object {
-              "name": "handleRootTag",
-              "optional": false,
-              "typeAnnotation": Object {
-                "params": Array [
-                  Object {
-                    "name": "rootTag",
-                    "typeAnnotation": Object {
-                      "name": "RootTag",
-                      "type": "ReservedFunctionValueTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "hotspotUpdate",
-              "optional": false,
-              "typeAnnotation": Object {
-                "params": Array [
-                  Object {
-                    "name": "x",
-                    "typeAnnotation": Object {
-                      "type": "Int32TypeAnnotation",
-                    },
-                  },
-                  Object {
-                    "name": "y",
-                    "typeAnnotation": Object {
-                      "type": "Int32TypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "scrollTo",
-              "optional": false,
-              "typeAnnotation": Object {
-                "params": Array [
-                  Object {
-                    "name": "x",
-                    "typeAnnotation": Object {
-                      "type": "FloatTypeAnnotation",
-                    },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
+          ],
+          events: [],
+          props: [],
+          commands: [
+            {
+              name: 'handleRootTag',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                params: [
+                  {
+                    name: 'rootTag',
+                    typeAnnotation: {
+                      type: 'ReservedFunctionValueTypeAnnotation',
+                      name: 'RootTag'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'hotspotUpdate',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                params: [
+                  {
+                    name: 'x',
+                    typeAnnotation: { type: 'Int32TypeAnnotation' }
                   },
-                  Object {
-                    "name": "y",
-                    "typeAnnotation": Object {
-                      "type": "Int32TypeAnnotation",
-                    },
+                  {
+                    name: 'y',
+                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'scrollTo',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                params: [
+                  {
+                    name: 'x',
+                    typeAnnotation: { type: 'FloatTypeAnnotation' }
                   },
-                  Object {
-                    "name": "z",
-                    "typeAnnotation": Object {
-                      "type": "DoubleTypeAnnotation",
-                    },
+                  {
+                    name: 'y',
+                    typeAnnotation: { type: 'Int32TypeAnnotation' }
                   },
-                  Object {
-                    "name": "animated",
-                    "typeAnnotation": Object {
-                      "type": "BooleanTypeAnnotation",
-                    },
+                  {
+                    name: 'z',
+                    typeAnnotation: { type: 'DoubleTypeAnnotation' }
                   },
-                ],
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-          "events": Array [],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
-          ],
-          "props": Array [],
-        },
-      },
-    },
-  },
-}
+                  {
+                    name: 'animated',
+                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture COMMANDS_WITH_EXTERNAL_TYPES 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [
-            Object {
-              "name": "scrollTo",
-              "optional": false,
-              "typeAnnotation": Object {
-                "params": Array [
-                  Object {
-                    "name": "y",
-                    "typeAnnotation": Object {
-                      "type": "Int32TypeAnnotation",
-                    },
-                  },
-                  Object {
-                    "name": "animated",
-                    "typeAnnotation": Object {
-                      "type": "BooleanTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "FunctionTypeAnnotation",
-              },
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "events": Array [],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
-          ],
-          "props": Array [],
-        },
-      },
-    },
-  },
-}
+          events: [],
+          props: [],
+          commands: [
+            {
+              name: 'scrollTo',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                params: [
+                  {
+                    name: 'y',
+                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                  },
+                  {
+                    name: 'animated',
+                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_AS_NULL_INLINE 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineNull",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineNullOptionalKey",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineNullOptionalValue",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineNullOptionalBoth",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineNullWithPaperName",
-              "optional": true,
-              "paperTopLevelNameDeprecated": "paperDirectEventDefinedInlineNullWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineNull",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineNullOptionalKey",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineNullOptionalValue",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineNullOptionalBoth",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineNullWithPaperName",
-              "optional": true,
-              "paperTopLevelNameDeprecated": "paperBubblingEventDefinedInlineNullWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+          events: [
+            {
+              name: 'onDirectEventDefinedInlineNull',
+              optional: false,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineNullOptionalKey',
+              optional: true,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineNullOptionalValue',
+              optional: true,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineNullOptionalBoth',
+              optional: true,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineNullWithPaperName',
+              optional: true,
+              bubblingType: 'direct',
+              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineNullWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineNull',
+              optional: false,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineNullOptionalKey',
+              optional: true,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineNullOptionalValue',
+              optional: true,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineNullOptionalBoth',
+              optional: true,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineNullWithPaperName',
+              optional: true,
+              bubblingType: 'bubble',
+              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineNullWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            }
           ],
-          "props": Array [],
-        },
-      },
-    },
-  },
-}
+          props: [],
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_ALL_TYPES 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInline",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
-                            },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
-                            },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
-                            },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
-                            },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineOptionalKey",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
-                            },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
-                            },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
-                            },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
-                            },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineOptionalValue",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
+          ],
+          events: [
+            {
+              name: 'onDirectEventDefinedInline',
+              optional: false,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineOptionalKey',
+              optional: true,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineOptionalBoth",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineOptionalValue',
+              optional: true,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineWithPaperName",
-              "optional": true,
-              "paperTopLevelNameDeprecated": "paperDirectEventDefinedInlineWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineOptionalBoth',
+              optional: true,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInline",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineWithPaperName',
+              optional: true,
+              bubblingType: 'direct',
+              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineOptionalKey",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInline',
+              optional: false,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineOptionalKey',
+              optional: true,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineOptionalValue",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineOptionalValue',
+              optional: true,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineOptionalBoth",
-              "optional": true,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineOptionalBoth',
+              optional: true,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineWithPaperName",
-              "optional": true,
-              "paperTopLevelNameDeprecated": "paperBubblingEventDefinedInlineWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineWithPaperName',
+              optional: true,
+              bubblingType: 'bubble',
+              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-          ],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
           ],
-          "props": Array [],
-        },
-      },
-    },
-  },
-}
+          props: [],
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NO_PROPS_EVENTS_ONLY_DEPRECATED_VIEW_CONFIG_NAME_OPTION 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "deprecatedViewConfigName": "DeprecateModuleName",
-          "events": Array [],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          deprecatedViewConfigName: 'DeprecateModuleName',
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "props": Array [],
-        },
-      },
-    },
-  },
-}
+          events: [],
+          props: [],
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "props": Array [
-            Object {
-              "name": "boolean_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "boolean_optional",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "default": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "string_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": null,
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "string_optional",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "default": "",
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "double_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": 0,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "double_optional",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "default": 0,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "float_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": 0,
-                      "type": "FloatTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "float_optional",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "default": 0,
-                      "type": "FloatTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "int_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": 0,
-                      "type": "Int32TypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "int_optional",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "default": 0,
-                      "type": "Int32TypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "enum_optional",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "elementType": Object {
-                        "default": "small",
-                        "options": Array [
-                          Object {
-                            "name": "small",
-                          },
-                          Object {
-                            "name": "large",
-                          },
-                        ],
-                        "type": "StringEnumTypeAnnotation",
-                      },
-                      "type": "ArrayTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "image_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "ImageSourcePrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "image_optional_key",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ImageSourcePrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "image_optional_value",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ImageSourcePrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "image_optional_both",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ImageSourcePrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_optional_key",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_optional_value",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "color_optional_both",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_optional_key",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_optional_value",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "processed_color_optional_both",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "ColorPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "PointPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_optional_key",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "PointPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_optional_value",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "PointPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "point_optional_both",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "PointPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "EdgeInsetsPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_optional_key",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "EdgeInsetsPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_optional_value",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "EdgeInsetsPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "insets_optional_both",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": true,
-                    "typeAnnotation": Object {
-                      "name": "EdgeInsetsPrimitive",
-                      "type": "ReservedPropTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "object_required",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "properties": Array [
-                        Object {
-                          "name": "nestedProp",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "default": null,
-                            "type": "StringTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "object_optional_key",
-              "optional": true,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "properties": Array [
-                        Object {
-                          "name": "nestedProp",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "default": null,
-                            "type": "StringTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "object_optional_value",
-              "optional": true,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "properties": Array [
-                        Object {
-                          "name": "nestedProp",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "default": null,
-                            "type": "StringTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "object_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "prop",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "properties": Array [
-                        Object {
-                          "name": "nestedProp",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "default": null,
-                            "type": "StringTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
+          events: [],
+          props: [
+            {
+              name: 'boolean_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'boolean_optional',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'string_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'string_optional',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'double_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'DoubleTypeAnnotation', default: 0 }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'double_optional',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: { type: 'DoubleTypeAnnotation', default: 0 }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'float_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'FloatTypeAnnotation', default: 0 }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'float_optional',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: { type: 'FloatTypeAnnotation', default: 0 }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'int_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: { type: 'Int32TypeAnnotation', default: 0 }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'int_optional',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: { type: 'Int32TypeAnnotation', default: 0 }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'enum_optional',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ArrayTypeAnnotation',
+                      elementType: {
+                        type: 'StringEnumTypeAnnotation',
+                        default: 'small',
+                        options: [ { name: 'small' }, { name: 'large' } ]
+                      }
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'image_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ImageSourcePrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'image_optional_key',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ImageSourcePrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'image_optional_value',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ImageSourcePrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'image_optional_both',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ImageSourcePrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'color_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'color_optional_key',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'color_optional_value',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'color_optional_both',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'processed_color_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'processed_color_optional_key',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'processed_color_optional_value',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'processed_color_optional_both',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'ColorPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'point_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'PointPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'point_optional_key',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'PointPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'point_optional_value',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'PointPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'point_optional_both',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'PointPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'insets_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'EdgeInsetsPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'insets_optional_key',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'EdgeInsetsPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'insets_optional_value',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'EdgeInsetsPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'insets_optional_both',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: true,
+                    typeAnnotation: {
+                      type: 'ReservedPropTypeAnnotation',
+                      name: 'EdgeInsetsPrimitive'
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'object_required',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'nestedProp',
+                          optional: false,
+                          typeAnnotation: {
+                            type: 'StringTypeAnnotation',
+                            default: null
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'object_optional_key',
+              optional: true,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'nestedProp',
+                          optional: false,
+                          typeAnnotation: {
+                            type: 'StringTypeAnnotation',
+                            default: null
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'object_optional_value',
+              optional: true,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'nestedProp',
+                          optional: false,
+                          typeAnnotation: {
+                            type: 'StringTypeAnnotation',
+                            default: null
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'object_optional_both',
+              optional: true,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'prop',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'nestedProp',
+                          optional: false,
+                          typeAnnotation: {
+                            type: 'StringTypeAnnotation',
+                            default: null
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            }
           ],
-        },
-      },
-    },
-  },
-}
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture ONE_OF_EACH_PROP_EVENT_DEFAULT_AND_OPTIONS 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineNull",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineNull",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          interfaceOnly: true,
+          paperComponentName: 'RCTModule',
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+          events: [
+            {
+              name: 'onDirectEventDefinedInlineNull',
+              optional: false,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineNull',
+              optional: false,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            }
           ],
-          "interfaceOnly": true,
-          "paperComponentName": "RCTModule",
-          "props": Array [
-            Object {
-              "name": "boolean_default_true_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": true,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
+          props: [
+            {
+              name: 'boolean_default_true_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+            }
           ],
-        },
-      },
-    },
-  },
-}
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture ONE_OF_EACH_PROP_EVENT_DEFAULT_AND_OPTIONS_NO_CAST 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineNull",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineNull",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          interfaceOnly: true,
+          excludedPlatforms: [ 'android' ],
+          paperComponentName: 'RCTModule',
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "excludedPlatforms": Array [
-            "android",
+          events: [
+            {
+              name: 'onDirectEventDefinedInlineNull',
+              optional: false,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineNull',
+              optional: false,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              }
+            }
           ],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
-          ],
-          "interfaceOnly": true,
-          "paperComponentName": "RCTModule",
-          "props": Array [
-            Object {
-              "name": "boolean_default_true_optional_both",
-              "optional": true,
-              "typeAnnotation": Object {
-                "default": true,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
+          props: [
+            {
+              name: 'boolean_default_true_optional_both',
+              optional: true,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+            }
           ],
-        },
-      },
-    },
-  },
-}
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture PROPS_ALIASED_LOCALLY 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
           ],
-          "props": Array [
-            Object {
-              "name": "otherStringProp",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "isEnabled",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": false,
-                "type": "BooleanTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "label",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "localType",
-              "optional": false,
-              "typeAnnotation": Object {
-                "properties": Array [
-                  Object {
-                    "name": "otherStringProp",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": null,
-                      "type": "StringTypeAnnotation",
-                    },
+          events: [],
+          props: [
+            {
+              name: 'otherStringProp',
+              optional: false,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'isEnabled',
+              optional: false,
+              typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+            },
+            {
+              name: 'label',
+              optional: false,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'localType',
+              optional: false,
+              typeAnnotation: {
+                type: 'ObjectTypeAnnotation',
+                properties: [
+                  {
+                    name: 'otherStringProp',
+                    optional: false,
+                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
                   },
-                  Object {
-                    "name": "isEnabled",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                  },
-                  Object {
-                    "name": "label",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "default": null,
-                      "type": "StringTypeAnnotation",
-                    },
+                  {
+                    name: 'isEnabled',
+                    optional: false,
+                    typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
                   },
-                ],
-                "type": "ObjectTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "localArr",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "otherStringProp",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "default": null,
-                        "type": "StringTypeAnnotation",
-                      },
-                    },
-                    Object {
-                      "name": "isEnabled",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "default": false,
-                        "type": "BooleanTypeAnnotation",
-                      },
-                    },
-                    Object {
-                      "name": "label",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "default": null,
-                        "type": "StringTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
+                  {
+                    name: 'label',
+                    optional: false,
+                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                  }
+                ]
+              }
+            },
+            {
+              name: 'localArr',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'otherStringProp',
+                      optional: false,
+                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    },
+                    {
+                      name: 'isEnabled',
+                      optional: false,
+                      typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+                    },
+                    {
+                      name: 'label',
+                      optional: false,
+                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    }
+                  ]
+                }
+              }
+            }
           ],
-        },
-      },
-    },
-  },
-}
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPORTED 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInline",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
-                            },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
-                            },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
-                            },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
-                            },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [
+            {
+              type: 'ReactNativeBuiltInType',
+              knownTypeName: 'ReactNativeCoreViewProps'
+            }
+          ],
+          events: [
+            {
+              name: 'onBubblingEventDefinedInline',
+              optional: false,
+              bubblingType: 'bubble',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "bubble",
-              "name": "onBubblingEventDefinedInlineWithPaperName",
-              "optional": false,
-              "paperTopLevelNameDeprecated": "paperBubblingEventDefinedInlineWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onBubblingEventDefinedInlineWithPaperName',
+              optional: false,
+              bubblingType: 'bubble',
+              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInline",
-              "optional": false,
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInline',
+              optional: false,
+              bubblingType: 'direct',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
-            Object {
-              "bubblingType": "direct",
-              "name": "onDirectEventDefinedInlineWithPaperName",
-              "optional": false,
-              "paperTopLevelNameDeprecated": "paperDirectEventDefinedInlineWithPaperName",
-              "typeAnnotation": Object {
-                "argument": Object {
-                  "properties": Array [
-                    Object {
-                      "name": "boolean_required",
-                      "optional": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_key",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_value",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "boolean_optional_both",
-                      "optional": true,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_required",
-                      "optional": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_key",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_value",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "string_optional_both",
-                      "optional": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_required",
-                      "optional": false,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_key",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_value",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "double_optional_both",
-                      "optional": true,
-                      "type": "DoubleTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_required",
-                      "optional": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_key",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_value",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "float_optional_both",
-                      "optional": true,
-                      "type": "FloatTypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_required",
-                      "optional": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_key",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_value",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "int32_optional_both",
-                      "optional": true,
-                      "type": "Int32TypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_required",
-                      "optional": false,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_key",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_value",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "enum_optional_both",
-                      "optional": true,
-                      "options": Array [
-                        Object {
-                          "name": "small",
-                        },
-                        Object {
-                          "name": "large",
-                        },
-                      ],
-                      "type": "StringEnumTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_required_nested_2_layers",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "object_optional_nested_1_layer",
-                          "optional": true,
-                          "properties": Array [
-                            Object {
-                              "name": "boolean_required",
-                              "optional": false,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "string_optional_key",
-                              "optional": true,
-                              "type": "StringTypeAnnotation",
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            },
+            {
+              name: 'onDirectEventDefinedInlineWithPaperName',
+              optional: false,
+              bubblingType: 'direct',
+              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineWithPaperName',
+              typeAnnotation: {
+                type: 'EventTypeAnnotation',
+                argument: {
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_required',
+                      optional: false
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'BooleanTypeAnnotation',
+                      name: 'boolean_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_required',
+                      optional: false
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'StringTypeAnnotation',
+                      name: 'string_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_required',
+                      optional: false
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'DoubleTypeAnnotation',
+                      name: 'double_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_required',
+                      optional: false
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'FloatTypeAnnotation',
+                      name: 'float_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_required',
+                      optional: false
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_key',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_value',
+                      optional: true
+                    },
+                    {
+                      type: 'Int32TypeAnnotation',
+                      name: 'int32_optional_both',
+                      optional: true
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_required',
+                      optional: false,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_key',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_value',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'StringEnumTypeAnnotation',
+                      name: 'enum_optional_both',
+                      optional: true,
+                      options: [ { name: 'small' }, { name: 'large' } ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_required_nested_2_layers',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'ObjectTypeAnnotation',
+                          name: 'object_optional_nested_1_layer',
+                          optional: true,
+                          properties: [
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'boolean_required',
+                              optional: false
                             },
-                            Object {
-                              "name": "double_optional_value",
-                              "optional": true,
-                              "type": "DoubleTypeAnnotation",
+                            {
+                              type: 'StringTypeAnnotation',
+                              name: 'string_optional_key',
+                              optional: true
                             },
-                            Object {
-                              "name": "float_optional_value",
-                              "optional": true,
-                              "type": "FloatTypeAnnotation",
+                            {
+                              type: 'DoubleTypeAnnotation',
+                              name: 'double_optional_value',
+                              optional: true
                             },
-                            Object {
-                              "name": "int32_optional_both",
-                              "optional": true,
-                              "type": "Int32TypeAnnotation",
+                            {
+                              type: 'FloatTypeAnnotation',
+                              name: 'float_optional_value',
+                              optional: true
                             },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_required",
-                      "optional": false,
-                      "properties": Array [
-                        Object {
-                          "name": "boolean_required",
-                          "optional": false,
-                          "type": "BooleanTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_key",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "string_optional_key",
-                          "optional": true,
-                          "type": "StringTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_value",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "float_optional_value",
-                          "optional": true,
-                          "type": "FloatTypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                    Object {
-                      "name": "object_readonly_optional_both",
-                      "optional": true,
-                      "properties": Array [
-                        Object {
-                          "name": "int32_optional_both",
-                          "optional": true,
-                          "type": "Int32TypeAnnotation",
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "EventTypeAnnotation",
-              },
-            },
+                            {
+                              type: 'Int32TypeAnnotation',
+                              name: 'int32_optional_both',
+                              optional: true
+                            }
+                          ]
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_required',
+                      optional: false,
+                      properties: [
+                        {
+                          type: 'BooleanTypeAnnotation',
+                          name: 'boolean_required',
+                          optional: false
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_key',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'StringTypeAnnotation',
+                          name: 'string_optional_key',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_value',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'FloatTypeAnnotation',
+                          name: 'float_optional_value',
+                          optional: true
+                        }
+                      ]
+                    },
+                    {
+                      type: 'ObjectTypeAnnotation',
+                      name: 'object_readonly_optional_both',
+                      optional: true,
+                      properties: [
+                        {
+                          type: 'Int32TypeAnnotation',
+                          name: 'int32_optional_both',
+                          optional: true
+                        }
+                      ]
+                    }
+                  ]
+                }
+              }
+            }
           ],
-          "extendsProps": Array [
-            Object {
-              "knownTypeName": "ReactNativeCoreViewProps",
-              "type": "ReactNativeBuiltInType",
-            },
-          ],
-          "props": Array [],
-        },
-      },
-    },
-  },
-}
+          props: [],
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture PROPS_AS_EXTERNAL_TYPES 1`] = `
-Object {
-  "modules": Object {
-    "Module": Object {
-      "components": Object {
-        "Module": Object {
-          "commands": Array [],
-          "events": Array [],
-          "extendsProps": Array [],
-          "props": Array [
-            Object {
-              "name": "disable",
-              "optional": false,
-              "typeAnnotation": Object {
-                "default": null,
-                "type": "StringTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "array",
-              "optional": false,
-              "typeAnnotation": Object {
-                "elementType": Object {
-                  "type": "StringTypeAnnotation",
-                },
-                "type": "ArrayTypeAnnotation",
-              },
-            },
+"{
+  modules: {
+    Module: {
+      components: {
+        Module: {
+          extendsProps: [],
+          events: [],
+          props: [
+            {
+              name: 'disable',
+              optional: false,
+              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+            },
+            {
+              name: 'array',
+              optional: false,
+              typeAnnotation: {
+                type: 'ArrayTypeAnnotation',
+                elementType: { type: 'StringTypeAnnotation' }
+              }
+            }
           ],
-        },
-      },
-    },
-  },
-}
+          commands: []
+        }
+      }
+    }
+  }
+}"
 `;
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js b/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
index 0f5a94a00cffbc..84b196f13cfc4a 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
@@ -14,6 +14,7 @@
 const FlowParser = require('../../index.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
+const util = require('util');
 jest.mock('fs', () => ({
   readFileSync: filename => fixtures[filename] || failureFixtures[filename],
 }));
@@ -23,7 +24,12 @@ describe('RN Codegen Flow Parser', () => {
     .sort()
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(FlowParser.parseFile(fixtureName)).toMatchSnapshot();
+        const schema = FlowParser.parseFile(fixtureName);
+        const serializedSchema = util.inspect(schema, {
+          showHidden: false,
+          depth: null,
+        });
+        expect(serializedSchema).toMatchSnapshot();
       });
     });
 
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
index 6c35735fee2055..64b677c38d84a0 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
@@ -17,1350 +17,1213 @@ exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_EXTENDING_TU
 exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_MODULES_EXPORTED_WITH_DEFAULT 1`] = `"File neither contains a module declaration, nor a component declaration. For module declarations, please make sure your file has an InterfaceDeclaration extending TurboModule. For component declarations, please make sure your file has a default export calling the codegenNativeComponent<Props>(...) macro."`;
 
 exports[`RN Codegen Flow Parser can generate fixture EMPTY_NATIVE_MODULE 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [],
-        },
-      },
-    },
-  },
-}
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: { SampleTurboModule: { aliases: {}, properties: [] } }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {
-            "ObjectAlias": Object {
-              "nullable": false,
-              "properties": Array [
-                Object {
-                  "name": "x",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "nullable": false,
-                    "type": "NumberTypeAnnotation",
-                  },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {
+            ObjectAlias: {
+              nullable: false,
+              type: 'ObjectTypeAnnotation',
+              properties: [
+                {
+                  name: 'x',
+                  optional: false,
+                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
                 },
-                Object {
-                  "name": "y",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "nullable": false,
-                    "type": "NumberTypeAnnotation",
-                  },
+                {
+                  name: 'y',
+                  optional: false,
+                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
                 },
-                Object {
-                  "name": "label",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "nullable": false,
-                    "type": "StringTypeAnnotation",
-                  },
+                {
+                  name: 'label',
+                  optional: false,
+                  typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
                 },
-                Object {
-                  "name": "truthy",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "nullable": false,
-                    "type": "BooleanTypeAnnotation",
-                  },
-                },
-              ],
-              "type": "ObjectTypeAnnotation",
-            },
+                {
+                  name: 'truthy',
+                  optional: false,
+                  typeAnnotation: { nullable: false, type: 'BooleanTypeAnnotation' }
+                }
+              ]
+            }
           },
-          "properties": Array [
-            Object {
-              "name": "getNumber",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "NumberTypeAnnotation",
-                    },
-                  },
+          properties: [
+            {
+              name: 'getNumber',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-            Object {
-              "name": "getVoid",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+            {
+              name: 'getVoid',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [],
+                nullable: false
+              }
             },
-            Object {
-              "name": "getArray",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "a",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "elementType": Object {
-                        "nullable": false,
-                        "type": "NumberTypeAnnotation",
-                      },
-                      "nullable": false,
-                      "type": "ArrayTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "properties": Array [
-                    Object {
-                      "name": "a",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "type": "NumberTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
+            {
+              name: 'getArray',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'a',
+                      optional: false,
+                      typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                    }
+                  ]
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "getStringFromAlias",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "a",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "ObjectAlias",
-                      "nullable": false,
-                      "type": "TypeAliasTypeAnnotation",
-                    },
-                  },
+                params: [
+                  {
+                    name: 'a',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ArrayTypeAnnotation',
+                      elementType: { nullable: false, type: 'NumberTypeAnnotation' }
+                    }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "StringTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-          ],
-        },
-      },
-    },
-  },
-}
+            {
+              name: 'getStringFromAlias',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'StringTypeAnnotation' },
+                params: [
+                  {
+                    name: 'a',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'TypeAliasTypeAnnotation',
+                      name: 'ObjectAlias'
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WITH_ALIAS 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getArray",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "elementType": Object {
-                        "nullable": false,
-                        "type": "StringTypeAnnotation",
-                      },
-                      "nullable": false,
-                      "type": "ArrayTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "elementType": Object {
-                    "nullable": false,
-                    "type": "StringTypeAnnotation",
-                  },
-                  "nullable": false,
-                  "type": "ArrayTypeAnnotation",
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getArray',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ArrayTypeAnnotation',
+                  elementType: { nullable: false, type: 'StringTypeAnnotation' }
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ArrayTypeAnnotation',
+                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WITH_UNION_AND_TOUPLE 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getArray",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "ArrayTypeAnnotation",
-                    },
-                  },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getArray',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'ArrayTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'ArrayTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "ArrayTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_ARRAY 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getArray",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "elementType": Object {
-                        "nullable": false,
-                        "type": "StringTypeAnnotation",
-                      },
-                      "nullable": false,
-                      "type": "ArrayTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "elementType": Object {
-                    "nullable": false,
-                    "type": "StringTypeAnnotation",
-                  },
-                  "nullable": false,
-                  "type": "ArrayTypeAnnotation",
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getArray',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ArrayTypeAnnotation',
+                  elementType: { nullable: false, type: 'StringTypeAnnotation' }
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "getArray",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "elementType": Object {
-                        "nullable": false,
-                        "type": "StringTypeAnnotation",
-                      },
-                      "nullable": false,
-                      "type": "ArrayTypeAnnotation",
-                    },
-                  },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ArrayTypeAnnotation',
+                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                    }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "elementType": Object {
-                    "nullable": false,
-                    "type": "StringTypeAnnotation",
-                  },
-                  "nullable": false,
-                  "type": "ArrayTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-          ],
-        },
-      },
-    },
-  },
-}
+            {
+              name: 'getArray',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ArrayTypeAnnotation',
+                  elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ArrayTypeAnnotation',
+                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_PARAM_TYPES 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "passBool",
-              "optional": true,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "BooleanTypeAnnotation",
-                    },
-                  },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'passBool',
+              optional: true,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'BooleanTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-            Object {
-              "name": "passNumber",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "NumberTypeAnnotation",
-                    },
-                  },
+            {
+              name: 'passNumber',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-            Object {
-              "name": "passString",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
+            {
+              name: 'passString',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-            Object {
-              "name": "passStringish",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
+            {
+              name: 'passStringish',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_CALLBACK 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getValueWithCallback",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "callback",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "params": Array [
-                        Object {
-                          "name": "value",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "nullable": false,
-                            "type": "StringTypeAnnotation",
-                          },
-                        },
-                        Object {
-                          "name": "arr",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "elementType": Object {
-                              "elementType": Object {
-                                "nullable": false,
-                                "type": "StringTypeAnnotation",
-                              },
-                              "nullable": false,
-                              "type": "ArrayTypeAnnotation",
-                            },
-                            "nullable": false,
-                            "type": "ArrayTypeAnnotation",
-                          },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getValueWithCallback',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'callback',
+                    optional: false,
+                    typeAnnotation: {
+                      type: 'FunctionTypeAnnotation',
+                      returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                      params: [
+                        {
+                          name: 'value',
+                          optional: false,
+                          typeAnnotation: {
+                            nullable: false,
+                            type: 'StringTypeAnnotation'
+                          }
                         },
+                        {
+                          name: 'arr',
+                          optional: false,
+                          typeAnnotation: {
+                            nullable: false,
+                            type: 'ArrayTypeAnnotation',
+                            elementType: {
+                              nullable: false,
+                              type: 'ArrayTypeAnnotation',
+                              elementType: {
+                                nullable: false,
+                                type: 'StringTypeAnnotation'
+                              }
+                            }
+                          }
+                        }
                       ],
-                      "returnTypeAnnotation": Object {
-                        "nullable": false,
-                        "type": "VoidTypeAnnotation",
-                      },
-                      "type": "FunctionTypeAnnotation",
-                    },
-                  },
+                      nullable: false
+                    }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_ARRAY 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getArray",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "elementType": Object {
-                        "elementType": Object {
-                          "elementType": Object {
-                            "elementType": Object {
-                              "elementType": Object {
-                                "nullable": false,
-                                "type": "StringTypeAnnotation",
-                              },
-                              "nullable": false,
-                              "type": "ArrayTypeAnnotation",
-                            },
-                            "nullable": false,
-                            "type": "ArrayTypeAnnotation",
-                          },
-                          "nullable": false,
-                          "type": "ArrayTypeAnnotation",
-                        },
-                        "nullable": false,
-                        "type": "ArrayTypeAnnotation",
-                      },
-                      "nullable": false,
-                      "type": "ArrayTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "elementType": Object {
-                    "elementType": Object {
-                      "elementType": Object {
-                        "nullable": false,
-                        "type": "StringTypeAnnotation",
-                      },
-                      "nullable": false,
-                      "type": "ArrayTypeAnnotation",
-                    },
-                    "nullable": false,
-                    "type": "ArrayTypeAnnotation",
-                  },
-                  "nullable": false,
-                  "type": "ArrayTypeAnnotation",
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getArray',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ArrayTypeAnnotation',
+                  elementType: {
+                    nullable: false,
+                    type: 'ArrayTypeAnnotation',
+                    elementType: {
+                      nullable: false,
+                      type: 'ArrayTypeAnnotation',
+                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                    }
+                  }
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ArrayTypeAnnotation',
+                      elementType: {
+                        nullable: false,
+                        type: 'ArrayTypeAnnotation',
+                        elementType: {
+                          nullable: false,
+                          type: 'ArrayTypeAnnotation',
+                          elementType: {
+                            nullable: false,
+                            type: 'ArrayTypeAnnotation',
+                            elementType: {
+                              nullable: false,
+                              type: 'ArrayTypeAnnotation',
+                              elementType: {
+                                nullable: false,
+                                type: 'StringTypeAnnotation'
+                              }
+                            }
+                          }
+                        }
+                      }
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_OBJECTS 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getObject",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "properties": Array [
-                        Object {
-                          "name": "const1",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "nullable": false,
-                            "properties": Array [
-                              Object {
-                                "name": "const1",
-                                "optional": false,
-                                "typeAnnotation": Object {
-                                  "nullable": false,
-                                  "type": "BooleanTypeAnnotation",
-                                },
-                              },
-                            ],
-                            "type": "ObjectTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "properties": Array [
-                    Object {
-                      "name": "const1",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "properties": Array [
-                          Object {
-                            "name": "const1",
-                            "optional": false,
-                            "typeAnnotation": Object {
-                              "nullable": false,
-                              "type": "BooleanTypeAnnotation",
-                            },
-                          },
-                        ],
-                        "type": "ObjectTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getObject',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'const1',
+                      optional: false,
+                      typeAnnotation: {
+                        nullable: false,
+                        type: 'ObjectTypeAnnotation',
+                        properties: [
+                          {
+                            name: 'const1',
+                            optional: false,
+                            typeAnnotation: {
+                              nullable: false,
+                              type: 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "getReadOnlyObject",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "properties": Array [
-                        Object {
-                          "name": "const1",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "nullable": false,
-                            "properties": Array [
-                              Object {
-                                "name": "const1",
-                                "optional": false,
-                                "typeAnnotation": Object {
-                                  "nullable": false,
-                                  "type": "BooleanTypeAnnotation",
-                                },
-                              },
-                            ],
-                            "type": "ObjectTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'const1',
+                          optional: false,
+                          typeAnnotation: {
+                            nullable: false,
+                            type: 'ObjectTypeAnnotation',
+                            properties: [
+                              {
+                                name: 'const1',
+                                optional: false,
+                                typeAnnotation: {
+                                  nullable: false,
+                                  type: 'BooleanTypeAnnotation'
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "properties": Array [
-                    Object {
-                      "name": "const1",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "properties": Array [
-                          Object {
-                            "name": "const1",
-                            "optional": false,
-                            "typeAnnotation": Object {
-                              "nullable": false,
-                              "type": "BooleanTypeAnnotation",
-                            },
-                          },
-                        ],
-                        "type": "ObjectTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-            Object {
-              "name": "getObject2",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "properties": Array [
-                        Object {
-                          "name": "a",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "nullable": false,
-                            "type": "StringTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "GenericObjectTypeAnnotation",
+            {
+              name: 'getReadOnlyObject',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'const1',
+                      optional: false,
+                      typeAnnotation: {
+                        nullable: false,
+                        type: 'ObjectTypeAnnotation',
+                        properties: [
+                          {
+                            name: 'const1',
+                            optional: false,
+                            typeAnnotation: {
+                              nullable: false,
+                              type: 'BooleanTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "getObjectInArray",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "properties": Array [
-                        Object {
-                          "name": "const1",
-                          "optional": false,
-                          "typeAnnotation": Object {
-                            "nullable": false,
-                            "properties": Array [
-                              Object {
-                                "name": "const1",
-                                "optional": false,
-                                "typeAnnotation": Object {
-                                  "nullable": false,
-                                  "type": "BooleanTypeAnnotation",
-                                },
-                              },
-                            ],
-                            "type": "ObjectTypeAnnotation",
-                          },
-                        },
-                      ],
-                      "type": "ObjectTypeAnnotation",
-                    },
-                  },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'const1',
+                          optional: false,
+                          typeAnnotation: {
+                            nullable: false,
+                            type: 'ObjectTypeAnnotation',
+                            properties: [
+                              {
+                                name: 'const1',
+                                optional: false,
+                                typeAnnotation: {
+                                  nullable: false,
+                                  type: 'BooleanTypeAnnotation'
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "elementType": Object {
-                    "nullable": false,
-                    "properties": Array [
-                      Object {
-                        "name": "const1",
-                        "optional": false,
-                        "typeAnnotation": Object {
-                          "nullable": false,
-                          "properties": Array [
-                            Object {
-                              "name": "const1",
-                              "optional": false,
-                              "typeAnnotation": Object {
-                                "nullable": false,
-                                "type": "BooleanTypeAnnotation",
-                              },
-                            },
-                          ],
-                          "type": "ObjectTypeAnnotation",
-                        },
-                      },
-                    ],
-                    "type": "ObjectTypeAnnotation",
-                  },
-                  "nullable": false,
-                  "type": "ArrayTypeAnnotation",
+                nullable: false
+              }
+            },
+            {
+              name: 'getObject2',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'GenericObjectTypeAnnotation'
                 },
-                "type": "FunctionTypeAnnotation",
-              },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'a',
+                          optional: false,
+                          typeAnnotation: {
+                            nullable: false,
+                            type: 'StringTypeAnnotation'
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ],
+                nullable: false
+              }
             },
-          ],
-        },
-      },
-    },
-  },
-}
+            {
+              name: 'getObjectInArray',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ArrayTypeAnnotation',
+                  elementType: {
+                    nullable: false,
+                    type: 'ObjectTypeAnnotation',
+                    properties: [
+                      {
+                        name: 'const1',
+                        optional: false,
+                        typeAnnotation: {
+                          nullable: false,
+                          type: 'ObjectTypeAnnotation',
+                          properties: [
+                            {
+                              name: 'const1',
+                              optional: false,
+                              typeAnnotation: {
+                                nullable: false,
+                                type: 'BooleanTypeAnnotation'
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    ]
+                  }
+                },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ObjectTypeAnnotation',
+                      properties: [
+                        {
+                          name: 'const1',
+                          optional: false,
+                          typeAnnotation: {
+                            nullable: false,
+                            type: 'ObjectTypeAnnotation',
+                            properties: [
+                              {
+                                name: 'const1',
+                                optional: false,
+                                typeAnnotation: {
+                                  nullable: false,
+                                  type: 'BooleanTypeAnnotation'
+                                }
+                              }
+                            ]
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_OBJECTS_WITH_NULLABLE_KEY 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getConstants",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "properties": Array [
-                    Object {
-                      "name": "isTesting",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "type": "BooleanTypeAnnotation",
-                      },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getConstants',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'isTesting',
+                      optional: false,
+                      typeAnnotation: {
+                        nullable: false,
+                        type: 'BooleanTypeAnnotation'
+                      }
                     },
-                    Object {
-                      "name": "reactNativeVersion",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "properties": Array [
-                          Object {
-                            "name": "major",
-                            "optional": false,
-                            "typeAnnotation": Object {
-                              "nullable": false,
-                              "type": "NumberTypeAnnotation",
-                            },
+                    {
+                      name: 'reactNativeVersion',
+                      optional: false,
+                      typeAnnotation: {
+                        nullable: false,
+                        type: 'ObjectTypeAnnotation',
+                        properties: [
+                          {
+                            name: 'major',
+                            optional: false,
+                            typeAnnotation: {
+                              nullable: false,
+                              type: 'NumberTypeAnnotation'
+                            }
                           },
-                          Object {
-                            "name": "minor",
-                            "optional": false,
-                            "typeAnnotation": Object {
-                              "nullable": false,
-                              "type": "NumberTypeAnnotation",
-                            },
+                          {
+                            name: 'minor',
+                            optional: false,
+                            typeAnnotation: {
+                              nullable: false,
+                              type: 'NumberTypeAnnotation'
+                            }
                           },
-                          Object {
-                            "name": "patch",
-                            "optional": true,
-                            "typeAnnotation": Object {
-                              "nullable": false,
-                              "type": "NumberTypeAnnotation",
-                            },
+                          {
+                            name: 'patch',
+                            optional: true,
+                            typeAnnotation: {
+                              nullable: false,
+                              type: 'NumberTypeAnnotation'
+                            }
                           },
-                          Object {
-                            "name": "prerelease",
-                            "optional": false,
-                            "typeAnnotation": Object {
-                              "nullable": true,
-                              "type": "NumberTypeAnnotation",
-                            },
-                          },
-                        ],
-                        "type": "ObjectTypeAnnotation",
-                      },
-                    },
-                    Object {
-                      "name": "forceTouchAvailable",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "type": "BooleanTypeAnnotation",
-                      },
+                          {
+                            name: 'prerelease',
+                            optional: false,
+                            typeAnnotation: {
+                              nullable: true,
+                              type: 'NumberTypeAnnotation'
+                            }
+                          }
+                        ]
+                      }
                     },
-                    Object {
-                      "name": "osVersion",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "type": "StringTypeAnnotation",
-                      },
+                    {
+                      name: 'forceTouchAvailable',
+                      optional: false,
+                      typeAnnotation: {
+                        nullable: false,
+                        type: 'BooleanTypeAnnotation'
+                      }
                     },
-                    Object {
-                      "name": "systemName",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "type": "StringTypeAnnotation",
-                      },
+                    {
+                      name: 'osVersion',
+                      optional: false,
+                      typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
                     },
-                    Object {
-                      "name": "interfaceIdiom",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "type": "StringTypeAnnotation",
-                      },
+                    {
+                      name: 'systemName',
+                      optional: false,
+                      typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
                     },
-                  ],
-                  "type": "ObjectTypeAnnotation",
+                    {
+                      name: 'interfaceIdiom',
+                      optional: false,
+                      typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                    }
+                  ]
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                params: [],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_FLOAT_AND_INT32 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getInt",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "Int32TypeAnnotation",
-                    },
-                  },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getInt',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'Int32TypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'Int32TypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "Int32TypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-            Object {
-              "name": "getFloat",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "FloatTypeAnnotation",
-                    },
-                  },
+            {
+              name: 'getFloat',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'FloatTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: false, type: 'FloatTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "FloatTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NESTED_ALIASES 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {
-            "Bar": Object {
-              "nullable": false,
-              "properties": Array [
-                Object {
-                  "name": "z",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "nullable": false,
-                    "type": "NumberTypeAnnotation",
-                  },
-                },
-              ],
-              "type": "ObjectTypeAnnotation",
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {
+            Bar: {
+              nullable: false,
+              type: 'ObjectTypeAnnotation',
+              properties: [
+                {
+                  name: 'z',
+                  optional: false,
+                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                }
+              ]
             },
-            "Foo": Object {
-              "nullable": false,
-              "properties": Array [
-                Object {
-                  "name": "bar1",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "name": "Bar",
-                    "nullable": false,
-                    "type": "TypeAliasTypeAnnotation",
-                  },
-                },
-                Object {
-                  "name": "bar2",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "name": "Bar",
-                    "nullable": false,
-                    "type": "TypeAliasTypeAnnotation",
-                  },
+            Foo: {
+              nullable: false,
+              type: 'ObjectTypeAnnotation',
+              properties: [
+                {
+                  name: 'bar1',
+                  optional: false,
+                  typeAnnotation: {
+                    nullable: false,
+                    type: 'TypeAliasTypeAnnotation',
+                    name: 'Bar'
+                  }
                 },
-              ],
-              "type": "ObjectTypeAnnotation",
-            },
+                {
+                  name: 'bar2',
+                  optional: false,
+                  typeAnnotation: {
+                    nullable: false,
+                    type: 'TypeAliasTypeAnnotation',
+                    name: 'Bar'
+                  }
+                }
+              ]
+            }
           },
-          "properties": Array [
-            Object {
-              "name": "foo1",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "x",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "Foo",
-                      "nullable": false,
-                      "type": "TypeAliasTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "name": "Foo",
-                  "nullable": false,
-                  "type": "TypeAliasTypeAnnotation",
+          properties: [
+            {
+              name: 'foo1',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'TypeAliasTypeAnnotation',
+                  name: 'Foo'
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-            Object {
-              "name": "foo2",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "x",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "Foo",
-                      "nullable": false,
-                      "type": "TypeAliasTypeAnnotation",
-                    },
-                  },
+                params: [
+                  {
+                    name: 'x',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'TypeAliasTypeAnnotation',
+                      name: 'Foo'
+                    }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+                nullable: false
+              }
             },
-          ],
-        },
-      },
-    },
-  },
-}
+            {
+              name: 'foo2',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'x',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'TypeAliasTypeAnnotation',
+                      name: 'Foo'
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NULLABLE_PARAM 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "voidFunc",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "arg",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": true,
-                      "type": "StringTypeAnnotation",
-                    },
-                  },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'voidFunc',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                params: [
+                  {
+                    name: 'arg',
+                    optional: false,
+                    typeAnnotation: { nullable: true, type: 'StringTypeAnnotation' }
+                  }
                 ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "VoidTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_WITH_OBJECT_DEFINED_IN_FILE_AS_PROPERTY 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {
-            "DisplayMetricsAndroid": Object {
-              "nullable": false,
-              "properties": Array [
-                Object {
-                  "name": "width",
-                  "optional": false,
-                  "typeAnnotation": Object {
-                    "nullable": false,
-                    "type": "NumberTypeAnnotation",
-                  },
-                },
-              ],
-              "type": "ObjectTypeAnnotation",
-            },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {
+            DisplayMetricsAndroid: {
+              nullable: false,
+              type: 'ObjectTypeAnnotation',
+              properties: [
+                {
+                  name: 'width',
+                  optional: false,
+                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                }
+              ]
+            }
           },
-          "properties": Array [
-            Object {
-              "name": "getConstants",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "properties": Array [
-                    Object {
-                      "name": "Dimensions",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "properties": Array [
-                          Object {
-                            "name": "windowPhysicalPixels",
-                            "optional": false,
-                            "typeAnnotation": Object {
-                              "name": "DisplayMetricsAndroid",
-                              "nullable": false,
-                              "type": "TypeAliasTypeAnnotation",
-                            },
-                          },
-                        ],
-                        "type": "ObjectTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
+          properties: [
+            {
+              name: 'getConstants',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'Dimensions',
+                      optional: false,
+                      typeAnnotation: {
+                        nullable: false,
+                        type: 'ObjectTypeAnnotation',
+                        properties: [
+                          {
+                            name: 'windowPhysicalPixels',
+                            optional: false,
+                            typeAnnotation: {
+                              nullable: false,
+                              type: 'TypeAliasTypeAnnotation',
+                              name: 'DisplayMetricsAndroid'
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
                 },
-                "type": "FunctionTypeAnnotation",
-              },
+                params: [],
+                nullable: false
+              }
             },
-            Object {
-              "name": "getConstants2",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "properties": Array [
-                    Object {
-                      "name": "Dimensions",
-                      "optional": false,
-                      "typeAnnotation": Object {
-                        "nullable": false,
-                        "properties": Array [
-                          Object {
-                            "name": "windowPhysicalPixels",
-                            "optional": false,
-                            "typeAnnotation": Object {
-                              "name": "DisplayMetricsAndroid",
-                              "nullable": false,
-                              "type": "TypeAliasTypeAnnotation",
-                            },
-                          },
-                        ],
-                        "type": "ObjectTypeAnnotation",
-                      },
-                    },
-                  ],
-                  "type": "ObjectTypeAnnotation",
+            {
+              name: 'getConstants2',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ObjectTypeAnnotation',
+                  properties: [
+                    {
+                      name: 'Dimensions',
+                      optional: false,
+                      typeAnnotation: {
+                        nullable: false,
+                        type: 'ObjectTypeAnnotation',
+                        properties: [
+                          {
+                            name: 'windowPhysicalPixels',
+                            optional: false,
+                            typeAnnotation: {
+                              nullable: false,
+                              type: 'TypeAliasTypeAnnotation',
+                              name: 'DisplayMetricsAndroid'
+                            }
+                          }
+                        ]
+                      }
+                    }
+                  ]
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                params: [],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_PROMISE 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getValueWithPromise",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "PromiseTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getValueWithPromise',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'PromiseTypeAnnotation' },
+                params: [],
+                nullable: false
+              }
             },
-            Object {
-              "name": "getValueWithPromiseDefinedSomewhereElse",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "PromiseTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
+            {
+              name: 'getValueWithPromiseDefinedSomewhereElse',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'PromiseTypeAnnotation' },
+                params: [],
+                nullable: false
+              }
             },
-            Object {
-              "name": "getValueWithPromiseObjDefinedSomewhereElse",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "PromiseTypeAnnotation",
-                },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+            {
+              name: 'getValueWithPromiseObjDefinedSomewhereElse',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: { nullable: false, type: 'PromiseTypeAnnotation' },
+                params: [],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ROOT_TAG 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getRootTag",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "rootTag",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "name": "RootTag",
-                      "nullable": false,
-                      "type": "ReservedFunctionValueTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "name": "RootTag",
-                  "nullable": false,
-                  "type": "ReservedFunctionValueTypeAnnotation",
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getRootTag',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'ReservedFunctionValueTypeAnnotation',
+                  name: 'RootTag'
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                params: [
+                  {
+                    name: 'rootTag',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'ReservedFunctionValueTypeAnnotation',
+                      name: 'RootTag'
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_SIMPLE_OBJECT 1`] = `
-Object {
-  "modules": Object {
-    "NativeSampleTurboModule": Object {
-      "nativeModules": Object {
-        "SampleTurboModule": Object {
-          "aliases": Object {},
-          "properties": Array [
-            Object {
-              "name": "getObject",
-              "optional": false,
-              "typeAnnotation": Object {
-                "nullable": false,
-                "params": Array [
-                  Object {
-                    "name": "o",
-                    "optional": false,
-                    "typeAnnotation": Object {
-                      "nullable": false,
-                      "type": "GenericObjectTypeAnnotation",
-                    },
-                  },
-                ],
-                "returnTypeAnnotation": Object {
-                  "nullable": false,
-                  "type": "GenericObjectTypeAnnotation",
+"{
+  modules: {
+    NativeSampleTurboModule: {
+      nativeModules: {
+        SampleTurboModule: {
+          aliases: {},
+          properties: [
+            {
+              name: 'getObject',
+              optional: false,
+              typeAnnotation: {
+                type: 'FunctionTypeAnnotation',
+                returnTypeAnnotation: {
+                  nullable: false,
+                  type: 'GenericObjectTypeAnnotation'
                 },
-                "type": "FunctionTypeAnnotation",
-              },
-            },
-          ],
-        },
-      },
-    },
-  },
-}
+                params: [
+                  {
+                    name: 'o',
+                    optional: false,
+                    typeAnnotation: {
+                      nullable: false,
+                      type: 'GenericObjectTypeAnnotation'
+                    }
+                  }
+                ],
+                nullable: false
+              }
+            }
+          ]
+        }
+      }
+    }
+  }
+}"
 `;
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
index 23114e86caa207..4cd509405487f5 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
@@ -14,6 +14,7 @@
 const FlowParser = require('../../index.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
+const util = require('util');
 jest.mock('fs', () => ({
   readFileSync: filename => fixtures[filename] || failureFixtures[filename],
 }));
@@ -23,7 +24,13 @@ describe('RN Codegen Flow Parser', () => {
     .sort()
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
-        expect(FlowParser.parseModuleFixture(fixtureName)).toMatchSnapshot();
+        const schema = FlowParser.parseModuleFixture(fixtureName);
+        const serializedSchema = util.inspect(schema, {
+          showHidden: false,
+          depth: null,
+        });
+
+        expect(serializedSchema).toMatchSnapshot();
       });
     });
 

From 8d807dfbc30d46c3c09fd5f745ea222b9624c661 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 162/241] Introduce NullableTypeAnnotation for Flow Module
 Parser

Summary:
Previously, all our type annotations contained a `nullable` property. This diff removes that property from all our NativeModule type annotations, and instead introduces a `NullableTypeAnnotation`.

**Some Benefits:**
- In all our serialization functions, we use Flow exhaustive checking to ensure that all type-annotations can be serialized. Since nullability is now recorded as a type annotation, Flow will ensure we always explicitly handle nullability. Previously, with nullability as a property, we could ignore it without any feedback from flow.
- This aligns the NativeModule schema with the ESTree spec.
- After this diff, we're one step closer to sharing type annotations with Codegen's schema. Many NativeModule type annotations now have the same shape as their Codegen counterparts. They will be merged in a subsequent diff.

**Downsides:**
- If you want to check whether a type annotation is of type `T`, you have to remember to unwrap the type annotation *yourself*. Flow won't warn you if you forget to unwrap the type, which can lead to incomplete handling to nullable types in our generators.
- When you're creating type annotations in code, previously, you *had* to specify nullability, since it was a property on all type annotation objects. Now, it's very possible for you to forget to wrap the type annotation, which will just lead to nullability bugs.

**Notes:**
- In the scheam, exported type annotations are *always* required. They can be made nullable using the new `Nullable` genric type.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24026887

fbshipit-source-id: 9e71e2c6102dc506824403dbb712488ca8507d08
---
 .../react-native-codegen/src/CodegenSchema.js |  45 +--
 .../module-parser-snapshot-test.js.snap       | 358 +++++-------------
 .../__tests__/module-parser-e2e-test.js       | 313 ++++++++++-----
 .../src/parsers/flow/modules/index.js         | 164 ++++----
 .../src/parsers/flow/modules/utils.js         |  45 +++
 5 files changed, 469 insertions(+), 456 deletions(-)
 create mode 100644 packages/react-native-codegen/src/parsers/flow/modules/utils.js

diff --git a/packages/react-native-codegen/src/CodegenSchema.js b/packages/react-native-codegen/src/CodegenSchema.js
index 7e35b52207aac7..a341f1757d3ddc 100644
--- a/packages/react-native-codegen/src/CodegenSchema.js
+++ b/packages/react-native-codegen/src/CodegenSchema.js
@@ -258,13 +258,7 @@ export type SchemaType = $ReadOnly<{|
 
 /**
  * NativeModule Types
- *
- * TODO(T71923114): Remove nullable from NativeModule type annotations.
- * This is necessary for us to start unifying the notion of a "type
- * annotation" across the codegen schema as a whole.
  */
-export type Required<T> = $ReadOnly<{...T, nullable: false}>;
-
 export type NativeModuleSchema = $ReadOnly<{|
   // We only support aliases to Objects
   aliases: NativeModuleAliasMap,
@@ -272,26 +266,36 @@ export type NativeModuleSchema = $ReadOnly<{|
 |}>;
 
 export type NativeModuleAliasMap = $ReadOnly<{|
-  [aliasName: string]: Required<NativeModuleObjectTypeAnnotation>,
+  [aliasName: string]: NativeModuleObjectTypeAnnotation,
 |}>;
 
 export type NativeModulePropertySchema = $ReadOnly<{|
   name: string,
   optional: boolean,
-  typeAnnotation: NativeModuleFunctionTypeAnnotation,
+  typeAnnotation: Nullable<NativeModuleFunctionTypeAnnotation>,
+|}>;
+
+export type Nullable<+T: NativeModuleTypeAnnotation> =
+  | NullableTypeAnnotation<T>
+  | T;
+
+export type NullableTypeAnnotation<
+  +T: NativeModuleTypeAnnotation,
+> = $ReadOnly<{|
+  type: 'NullableTypeAnnotation',
+  typeAnnotation: T,
 |}>;
 
 export type NativeModuleFunctionTypeAnnotation = $ReadOnly<{|
   type: 'FunctionTypeAnnotation',
   params: $ReadOnlyArray<NativeModuleMethodParamSchema>,
-  returnTypeAnnotation: NativeModuleReturnTypeAnnotation,
-  nullable: boolean,
+  returnTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
 |}>;
 
 export type NativeModuleMethodParamSchema = $ReadOnly<{|
   name: string,
   optional: boolean,
-  typeAnnotation: NativeModuleParamTypeAnnotation,
+  typeAnnotation: Nullable<NativeModuleParamTypeAnnotation>,
 |}>;
 
 export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
@@ -300,14 +304,13 @@ export type NativeModuleObjectTypeAnnotation = $ReadOnly<{|
     $ReadOnly<{|
       name: string,
       optional: boolean,
-      typeAnnotation: NativeModuleBaseTypeAnnotation,
+      typeAnnotation: Nullable<NativeModuleBaseTypeAnnotation>,
     |}>,
   >,
-  nullable: boolean,
 |}>;
 
 export type NativeModuleArrayTypeAnnotation<
-  T = NativeModuleBaseTypeAnnotation,
+  +T: Nullable<NativeModuleBaseTypeAnnotation>,
 > = $ReadOnly<{|
   type: 'ArrayTypeAnnotation',
   /**
@@ -315,64 +318,52 @@ export type NativeModuleArrayTypeAnnotation<
    * invalid Array ElementTypes. Then, make the elementType required.
    */
   elementType?: T,
-  nullable: boolean,
 |}>;
 
 export type NativeModuleStringTypeAnnotation = $ReadOnly<{|
   type: 'StringTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleNumberTypeAnnotation = $ReadOnly<{|
   type: 'NumberTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleInt32TypeAnnotation = $ReadOnly<{|
   type: 'Int32TypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleDoubleTypeAnnotation = $ReadOnly<{|
   type: 'DoubleTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleFloatTypeAnnotation = $ReadOnly<{|
   type: 'FloatTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleBooleanTypeAnnotation = $ReadOnly<{|
   type: 'BooleanTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleGenericObjectTypeAnnotation = $ReadOnly<{|
   type: 'GenericObjectTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleReservedFunctionValueTypeAnnotation = $ReadOnly<{|
   type: 'ReservedFunctionValueTypeAnnotation',
   name: ReservedFunctionValueTypeName,
-  nullable: boolean,
 |}>;
 
 export type NativeModuleTypeAliasTypeAnnotation = $ReadOnly<{|
   type: 'TypeAliasTypeAnnotation',
   name: string,
-  nullable: boolean,
 |}>;
 
 export type NativeModulePromiseTypeAnnotation = $ReadOnly<{|
   type: 'PromiseTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleVoidTypeAnnotation = $ReadOnly<{|
   type: 'VoidTypeAnnotation',
-  nullable: boolean,
 |}>;
 
 export type NativeModuleBaseTypeAnnotation =
@@ -385,7 +376,7 @@ export type NativeModuleBaseTypeAnnotation =
   | NativeModuleGenericObjectTypeAnnotation
   | NativeModuleReservedFunctionValueTypeAnnotation
   | NativeModuleTypeAliasTypeAnnotation
-  | NativeModuleArrayTypeAnnotation<>
+  | NativeModuleArrayTypeAnnotation<Nullable<NativeModuleBaseTypeAnnotation>>
   | NativeModuleObjectTypeAnnotation;
 
 export type NativeModuleParamTypeAnnotation =
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
index 64b677c38d84a0..f5ec83220a0d10 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
@@ -34,28 +34,27 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES
         SampleTurboModule: {
           aliases: {
             ObjectAlias: {
-              nullable: false,
               type: 'ObjectTypeAnnotation',
               properties: [
                 {
                   name: 'x',
                   optional: false,
-                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                  typeAnnotation: { type: 'NumberTypeAnnotation' }
                 },
                 {
                   name: 'y',
                   optional: false,
-                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                  typeAnnotation: { type: 'NumberTypeAnnotation' }
                 },
                 {
                   name: 'label',
                   optional: false,
-                  typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                  typeAnnotation: { type: 'StringTypeAnnotation' }
                 },
                 {
                   name: 'truthy',
                   optional: false,
-                  typeAnnotation: { nullable: false, type: 'BooleanTypeAnnotation' }
+                  typeAnnotation: { type: 'BooleanTypeAnnotation' }
                 }
               ]
             }
@@ -66,15 +65,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                    typeAnnotation: { type: 'NumberTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -82,9 +80,8 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
-                params: [],
-                nullable: false
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
+                params: []
               }
             },
             {
@@ -93,13 +90,12 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
                       name: 'a',
                       optional: false,
-                      typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                      typeAnnotation: { type: 'NumberTypeAnnotation' }
                     }
                   ]
                 },
@@ -108,13 +104,11 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES
                     name: 'a',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ArrayTypeAnnotation',
-                      elementType: { nullable: false, type: 'NumberTypeAnnotation' }
+                      elementType: { type: 'NumberTypeAnnotation' }
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -122,19 +116,17 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'StringTypeAnnotation' },
+                returnTypeAnnotation: { type: 'StringTypeAnnotation' },
                 params: [
                   {
                     name: 'a',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'TypeAliasTypeAnnotation',
                       name: 'ObjectAlias'
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -159,22 +151,19 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WI
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ArrayTypeAnnotation',
-                  elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                  elementType: { type: 'StringTypeAnnotation' }
                 },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ArrayTypeAnnotation',
-                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                      elementType: { type: 'StringTypeAnnotation' }
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -198,15 +187,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WI
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'ArrayTypeAnnotation' },
+                returnTypeAnnotation: { type: 'ArrayTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'ArrayTypeAnnotation' }
+                    typeAnnotation: { type: 'ArrayTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -231,22 +219,19 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_AR
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ArrayTypeAnnotation',
-                  elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                  elementType: { type: 'StringTypeAnnotation' }
                 },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ArrayTypeAnnotation',
-                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                      elementType: { type: 'StringTypeAnnotation' }
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -255,22 +240,19 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_AR
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ArrayTypeAnnotation',
-                  elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                  elementType: { type: 'StringTypeAnnotation' }
                 },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ArrayTypeAnnotation',
-                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                      elementType: { type: 'StringTypeAnnotation' }
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -294,15 +276,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_PA
               optional: true,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'BooleanTypeAnnotation' }
+                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -310,15 +291,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_PA
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                    typeAnnotation: { type: 'NumberTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -326,15 +306,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_PA
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                    typeAnnotation: { type: 'StringTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -342,15 +321,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_PA
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                    typeAnnotation: { type: 'StringTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -374,45 +352,35 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_CALLBACK
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'callback',
                     optional: false,
                     typeAnnotation: {
                       type: 'FunctionTypeAnnotation',
-                      returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                      returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                       params: [
                         {
                           name: 'value',
                           optional: false,
-                          typeAnnotation: {
-                            nullable: false,
-                            type: 'StringTypeAnnotation'
-                          }
+                          typeAnnotation: { type: 'StringTypeAnnotation' }
                         },
                         {
                           name: 'arr',
                           optional: false,
                           typeAnnotation: {
-                            nullable: false,
                             type: 'ArrayTypeAnnotation',
                             elementType: {
-                              nullable: false,
                               type: 'ArrayTypeAnnotation',
-                              elementType: {
-                                nullable: false,
-                                type: 'StringTypeAnnotation'
-                              }
+                              elementType: { type: 'StringTypeAnnotation' }
                             }
                           }
                         }
-                      ],
-                      nullable: false
+                      ]
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -437,15 +405,12 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ArrayTypeAnnotation',
                   elementType: {
-                    nullable: false,
                     type: 'ArrayTypeAnnotation',
                     elementType: {
-                      nullable: false,
                       type: 'ArrayTypeAnnotation',
-                      elementType: { nullable: false, type: 'StringTypeAnnotation' }
+                      elementType: { type: 'StringTypeAnnotation' }
                     }
                   }
                 },
@@ -454,32 +419,23 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ArrayTypeAnnotation',
                       elementType: {
-                        nullable: false,
                         type: 'ArrayTypeAnnotation',
                         elementType: {
-                          nullable: false,
                           type: 'ArrayTypeAnnotation',
                           elementType: {
-                            nullable: false,
                             type: 'ArrayTypeAnnotation',
                             elementType: {
-                              nullable: false,
                               type: 'ArrayTypeAnnotation',
-                              elementType: {
-                                nullable: false,
-                                type: 'StringTypeAnnotation'
-                              }
+                              elementType: { type: 'StringTypeAnnotation' }
                             }
                           }
                         }
                       }
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -504,23 +460,18 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
                       name: 'const1',
                       optional: false,
                       typeAnnotation: {
-                        nullable: false,
                         type: 'ObjectTypeAnnotation',
                         properties: [
                           {
                             name: 'const1',
                             optional: false,
-                            typeAnnotation: {
-                              nullable: false,
-                              type: 'BooleanTypeAnnotation'
-                            }
+                            typeAnnotation: { type: 'BooleanTypeAnnotation' }
                           }
                         ]
                       }
@@ -532,23 +483,18 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ObjectTypeAnnotation',
                       properties: [
                         {
                           name: 'const1',
                           optional: false,
                           typeAnnotation: {
-                            nullable: false,
                             type: 'ObjectTypeAnnotation',
                             properties: [
                               {
                                 name: 'const1',
                                 optional: false,
-                                typeAnnotation: {
-                                  nullable: false,
-                                  type: 'BooleanTypeAnnotation'
-                                }
+                                typeAnnotation: { type: 'BooleanTypeAnnotation' }
                               }
                             ]
                           }
@@ -556,8 +502,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                       ]
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -566,23 +511,18 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
                       name: 'const1',
                       optional: false,
                       typeAnnotation: {
-                        nullable: false,
                         type: 'ObjectTypeAnnotation',
                         properties: [
                           {
                             name: 'const1',
                             optional: false,
-                            typeAnnotation: {
-                              nullable: false,
-                              type: 'BooleanTypeAnnotation'
-                            }
+                            typeAnnotation: { type: 'BooleanTypeAnnotation' }
                           }
                         ]
                       }
@@ -594,23 +534,18 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ObjectTypeAnnotation',
                       properties: [
                         {
                           name: 'const1',
                           optional: false,
                           typeAnnotation: {
-                            nullable: false,
                             type: 'ObjectTypeAnnotation',
                             properties: [
                               {
                                 name: 'const1',
                                 optional: false,
-                                typeAnnotation: {
-                                  nullable: false,
-                                  type: 'BooleanTypeAnnotation'
-                                }
+                                typeAnnotation: { type: 'BooleanTypeAnnotation' }
                               }
                             ]
                           }
@@ -618,8 +553,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                       ]
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -627,31 +561,23 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  nullable: false,
-                  type: 'GenericObjectTypeAnnotation'
-                },
+                returnTypeAnnotation: { type: 'GenericObjectTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ObjectTypeAnnotation',
                       properties: [
                         {
                           name: 'a',
                           optional: false,
-                          typeAnnotation: {
-                            nullable: false,
-                            type: 'StringTypeAnnotation'
-                          }
+                          typeAnnotation: { type: 'StringTypeAnnotation' }
                         }
                       ]
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -660,26 +586,20 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ArrayTypeAnnotation',
                   elementType: {
-                    nullable: false,
                     type: 'ObjectTypeAnnotation',
                     properties: [
                       {
                         name: 'const1',
                         optional: false,
                         typeAnnotation: {
-                          nullable: false,
                           type: 'ObjectTypeAnnotation',
                           properties: [
                             {
                               name: 'const1',
                               optional: false,
-                              typeAnnotation: {
-                                nullable: false,
-                                type: 'BooleanTypeAnnotation'
-                              }
+                              typeAnnotation: { type: 'BooleanTypeAnnotation' }
                             }
                           ]
                         }
@@ -692,23 +612,18 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                     name: 'arg',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ObjectTypeAnnotation',
                       properties: [
                         {
                           name: 'const1',
                           optional: false,
                           typeAnnotation: {
-                            nullable: false,
                             type: 'ObjectTypeAnnotation',
                             properties: [
                               {
                                 name: 'const1',
                                 optional: false,
-                                typeAnnotation: {
-                                  nullable: false,
-                                  type: 'BooleanTypeAnnotation'
-                                }
+                                typeAnnotation: { type: 'BooleanTypeAnnotation' }
                               }
                             ]
                           }
@@ -716,8 +631,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                       ]
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -742,54 +656,40 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
                       name: 'isTesting',
                       optional: false,
-                      typeAnnotation: {
-                        nullable: false,
-                        type: 'BooleanTypeAnnotation'
-                      }
+                      typeAnnotation: { type: 'BooleanTypeAnnotation' }
                     },
                     {
                       name: 'reactNativeVersion',
                       optional: false,
                       typeAnnotation: {
-                        nullable: false,
                         type: 'ObjectTypeAnnotation',
                         properties: [
                           {
                             name: 'major',
                             optional: false,
-                            typeAnnotation: {
-                              nullable: false,
-                              type: 'NumberTypeAnnotation'
-                            }
+                            typeAnnotation: { type: 'NumberTypeAnnotation' }
                           },
                           {
                             name: 'minor',
                             optional: false,
-                            typeAnnotation: {
-                              nullable: false,
-                              type: 'NumberTypeAnnotation'
-                            }
+                            typeAnnotation: { type: 'NumberTypeAnnotation' }
                           },
                           {
                             name: 'patch',
                             optional: true,
-                            typeAnnotation: {
-                              nullable: false,
-                              type: 'NumberTypeAnnotation'
-                            }
+                            typeAnnotation: { type: 'NumberTypeAnnotation' }
                           },
                           {
                             name: 'prerelease',
                             optional: false,
                             typeAnnotation: {
-                              nullable: true,
-                              type: 'NumberTypeAnnotation'
+                              type: 'NullableTypeAnnotation',
+                              typeAnnotation: { type: 'NumberTypeAnnotation' }
                             }
                           }
                         ]
@@ -798,30 +698,26 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                     {
                       name: 'forceTouchAvailable',
                       optional: false,
-                      typeAnnotation: {
-                        nullable: false,
-                        type: 'BooleanTypeAnnotation'
-                      }
+                      typeAnnotation: { type: 'BooleanTypeAnnotation' }
                     },
                     {
                       name: 'osVersion',
                       optional: false,
-                      typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                      typeAnnotation: { type: 'StringTypeAnnotation' }
                     },
                     {
                       name: 'systemName',
                       optional: false,
-                      typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                      typeAnnotation: { type: 'StringTypeAnnotation' }
                     },
                     {
                       name: 'interfaceIdiom',
                       optional: false,
-                      typeAnnotation: { nullable: false, type: 'StringTypeAnnotation' }
+                      typeAnnotation: { type: 'StringTypeAnnotation' }
                     }
                   ]
                 },
-                params: [],
-                nullable: false
+                params: []
               }
             }
           ]
@@ -845,15 +741,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_FLOAT_AN
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'Int32TypeAnnotation' },
+                returnTypeAnnotation: { type: 'Int32TypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'Int32TypeAnnotation' }
+                    typeAnnotation: { type: 'Int32TypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -861,15 +756,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_FLOAT_AN
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'FloatTypeAnnotation' },
+                returnTypeAnnotation: { type: 'FloatTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: false, type: 'FloatTypeAnnotation' }
+                    typeAnnotation: { type: 'FloatTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -888,37 +782,27 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NESTED_A
         SampleTurboModule: {
           aliases: {
             Bar: {
-              nullable: false,
               type: 'ObjectTypeAnnotation',
               properties: [
                 {
                   name: 'z',
                   optional: false,
-                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                  typeAnnotation: { type: 'NumberTypeAnnotation' }
                 }
               ]
             },
             Foo: {
-              nullable: false,
               type: 'ObjectTypeAnnotation',
               properties: [
                 {
                   name: 'bar1',
                   optional: false,
-                  typeAnnotation: {
-                    nullable: false,
-                    type: 'TypeAliasTypeAnnotation',
-                    name: 'Bar'
-                  }
+                  typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Bar' }
                 },
                 {
                   name: 'bar2',
                   optional: false,
-                  typeAnnotation: {
-                    nullable: false,
-                    type: 'TypeAliasTypeAnnotation',
-                    name: 'Bar'
-                  }
+                  typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Bar' }
                 }
               ]
             }
@@ -929,23 +813,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NESTED_A
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  nullable: false,
-                  type: 'TypeAliasTypeAnnotation',
-                  name: 'Foo'
-                },
+                returnTypeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Foo' },
                 params: [
                   {
                     name: 'x',
                     optional: false,
-                    typeAnnotation: {
-                      nullable: false,
-                      type: 'TypeAliasTypeAnnotation',
-                      name: 'Foo'
-                    }
+                    typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Foo' }
                   }
-                ],
-                nullable: false
+                ]
               }
             },
             {
@@ -953,19 +828,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NESTED_A
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'x',
                     optional: false,
-                    typeAnnotation: {
-                      nullable: false,
-                      type: 'TypeAliasTypeAnnotation',
-                      name: 'Foo'
-                    }
+                    typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Foo' }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -989,15 +859,17 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NULLABLE
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'VoidTypeAnnotation' },
+                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
                 params: [
                   {
                     name: 'arg',
                     optional: false,
-                    typeAnnotation: { nullable: true, type: 'StringTypeAnnotation' }
+                    typeAnnotation: {
+                      type: 'NullableTypeAnnotation',
+                      typeAnnotation: { type: 'StringTypeAnnotation' }
+                    }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -1016,13 +888,12 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
         SampleTurboModule: {
           aliases: {
             DisplayMetricsAndroid: {
-              nullable: false,
               type: 'ObjectTypeAnnotation',
               properties: [
                 {
                   name: 'width',
                   optional: false,
-                  typeAnnotation: { nullable: false, type: 'NumberTypeAnnotation' }
+                  typeAnnotation: { type: 'NumberTypeAnnotation' }
                 }
               ]
             }
@@ -1034,21 +905,18 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
                       name: 'Dimensions',
                       optional: false,
                       typeAnnotation: {
-                        nullable: false,
                         type: 'ObjectTypeAnnotation',
                         properties: [
                           {
                             name: 'windowPhysicalPixels',
                             optional: false,
                             typeAnnotation: {
-                              nullable: false,
                               type: 'TypeAliasTypeAnnotation',
                               name: 'DisplayMetricsAndroid'
                             }
@@ -1058,8 +926,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
                     }
                   ]
                 },
-                params: [],
-                nullable: false
+                params: []
               }
             },
             {
@@ -1068,21 +935,18 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
                       name: 'Dimensions',
                       optional: false,
                       typeAnnotation: {
-                        nullable: false,
                         type: 'ObjectTypeAnnotation',
                         properties: [
                           {
                             name: 'windowPhysicalPixels',
                             optional: false,
                             typeAnnotation: {
-                              nullable: false,
                               type: 'TypeAliasTypeAnnotation',
                               name: 'DisplayMetricsAndroid'
                             }
@@ -1092,8 +956,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
                     }
                   ]
                 },
-                params: [],
-                nullable: false
+                params: []
               }
             }
           ]
@@ -1117,9 +980,8 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_PROMISE
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'PromiseTypeAnnotation' },
-                params: [],
-                nullable: false
+                returnTypeAnnotation: { type: 'PromiseTypeAnnotation' },
+                params: []
               }
             },
             {
@@ -1127,9 +989,8 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_PROMISE
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'PromiseTypeAnnotation' },
-                params: [],
-                nullable: false
+                returnTypeAnnotation: { type: 'PromiseTypeAnnotation' },
+                params: []
               }
             },
             {
@@ -1137,9 +998,8 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_PROMISE
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { nullable: false, type: 'PromiseTypeAnnotation' },
-                params: [],
-                nullable: false
+                returnTypeAnnotation: { type: 'PromiseTypeAnnotation' },
+                params: []
               }
             }
           ]
@@ -1164,7 +1024,6 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ROOT_TAG
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ReservedFunctionValueTypeAnnotation',
                   name: 'RootTag'
                 },
@@ -1173,13 +1032,11 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ROOT_TAG
                     name: 'rootTag',
                     optional: false,
                     typeAnnotation: {
-                      nullable: false,
                       type: 'ReservedFunctionValueTypeAnnotation',
                       name: 'RootTag'
                     }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
@@ -1203,21 +1060,14 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_SIMPLE_O
               optional: false,
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  nullable: false,
-                  type: 'GenericObjectTypeAnnotation'
-                },
+                returnTypeAnnotation: { type: 'GenericObjectTypeAnnotation' },
                 params: [
                   {
                     name: 'o',
                     optional: false,
-                    typeAnnotation: {
-                      nullable: false,
-                      type: 'GenericObjectTypeAnnotation'
-                    }
+                    typeAnnotation: { type: 'GenericObjectTypeAnnotation' }
                   }
-                ],
-                nullable: false
+                ]
               }
             }
           ]
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
index b48f155accf153..602efd71759099 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js
@@ -10,9 +10,13 @@
 
 import type {
   ReservedFunctionValueTypeName,
+  NativeModuleReturnTypeAnnotation,
+  NativeModuleBaseTypeAnnotation,
   NativeModuleSchema,
+  NativeModuleParamTypeAnnotation,
 } from '../../../../CodegenSchema';
 const {parseString} = require('../../index.js');
+const {unwrapNullable} = require('../utils');
 const {
   FlowGenericNotTypeParameterizedParserError,
   UnrecognizedFlowTypeAnnotationParserError,
@@ -58,14 +62,16 @@ function expectAnimalTypeAliasToExist(module: NativeModuleSchema) {
   expect(animalAlias).not.toBe(null);
   invariant(animalAlias != null, '');
   expect(animalAlias.type).toBe('ObjectTypeAnnotation');
-  expect(animalAlias.nullable).toBe(false);
   expect(animalAlias.properties.length).toBe(1);
   expect(animalAlias.properties[0].name).toBe('name');
   expect(animalAlias.properties[0].optional).toBe(false);
-  expect(animalAlias.properties[0].typeAnnotation.type).toBe(
-    'StringTypeAnnotation',
+
+  const [typeAnnotation, nullable] = unwrapNullable(
+    animalAlias.properties[0].typeAnnotation,
   );
-  expect(animalAlias.properties[0].typeAnnotation.nullable).toBe(false);
+
+  expect(typeAnnotation.type).toBe('StringTypeAnnotation');
+  expect(nullable).toBe(false);
 }
 
 describe('Flow Module Parser', () => {
@@ -133,7 +139,10 @@ describe('Flow Module Parser', () => {
         return `${paramName}: ${paramType}`;
       }
 
-      function parseParamType(paramName: string, paramType: string) {
+      function parseParamType(
+        paramName: string,
+        paramType: string,
+      ): [NativeModuleParamTypeAnnotation, NativeModuleSchema] {
         const module = parseModule(`
           import type {TurboModule} from 'RCTExport';
           import * as TurboModuleRegistry from 'TurboModuleRegistry';
@@ -147,13 +156,18 @@ describe('Flow Module Parser', () => {
         `);
 
         expect(module.properties[0]).not.toBe(null);
-        const param = module.properties[0].typeAnnotation.params[0];
+        const param = unwrapNullable(module.properties[0].typeAnnotation)[0]
+          .params[0];
         expect(param).not.toBe(null);
         expect(param.name).toBe(paramName);
         expect(param.optional).toBe(optional);
-        expect(param.typeAnnotation.nullable).toBe(nullable);
+        const [
+          paramTypeAnnotation,
+          isParamTypeAnnotationNullable,
+        ] = unwrapNullable(param.typeAnnotation);
+        expect(isParamTypeAnnotationNullable).toBe(nullable);
 
-        return [param, module];
+        return [paramTypeAnnotation, module];
       }
 
       describe(
@@ -174,15 +188,15 @@ describe('Flow Module Parser', () => {
           describe('Primitive types', () => {
             PRIMITIVES.forEach(([FLOW_TYPE, PARSED_TYPE_NAME]) => {
               it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} primitive parameter of type '${FLOW_TYPE}'`, () => {
-                const [param] = parseParamType('arg', FLOW_TYPE);
-                expect(param.typeAnnotation.type).toBe(PARSED_TYPE_NAME);
+                const [paramTypeAnnotation] = parseParamType('arg', FLOW_TYPE);
+                expect(paramTypeAnnotation.type).toBe(PARSED_TYPE_NAME);
               });
             });
           });
 
           it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of type 'Object'`, () => {
-            const [param] = parseParamType('arg', 'Object');
-            expect(param.typeAnnotation.type).toBe(
+            const [paramTypeAnnotation] = parseParamType('arg', 'Object');
+            expect(paramTypeAnnotation.type).toBe(
               'GenericObjectTypeAnnotation',
             );
           });
@@ -190,18 +204,18 @@ describe('Flow Module Parser', () => {
           describe('Reserved Types', () => {
             RESERVED_FUNCTION_VALUE_TYPE_NAME.forEach(FLOW_TYPE => {
               it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter of reserved type '${FLOW_TYPE}'`, () => {
-                const [param] = parseParamType('arg', FLOW_TYPE);
+                const [paramTypeAnnotation] = parseParamType('arg', FLOW_TYPE);
 
-                expect(param.typeAnnotation.type).toBe(
+                expect(paramTypeAnnotation.type).toBe(
                   'ReservedFunctionValueTypeAnnotation',
                 );
                 invariant(
-                  param.typeAnnotation.type ===
+                  paramTypeAnnotation.type ===
                     'ReservedFunctionValueTypeAnnotation',
                   'Param must be a Reserved type',
                 );
 
-                expect(param.typeAnnotation.name).toBe(FLOW_TYPE);
+                expect(paramTypeAnnotation.name).toBe(FLOW_TYPE);
               });
             });
           });
@@ -219,21 +233,25 @@ describe('Flow Module Parser', () => {
             function parseParamArrayElementType(
               paramName: string,
               paramType: string,
-            ) {
-              const [param, module] = parseParamType(
+            ): [NativeModuleBaseTypeAnnotation, NativeModuleSchema] {
+              const [paramTypeAnnotation, module] = parseParamType(
                 paramName,
                 `Array<${paramType}>`,
               );
 
-              expect(param.typeAnnotation.type).toBe('ArrayTypeAnnotation');
-              invariant(
-                param.typeAnnotation.type === 'ArrayTypeAnnotation',
-                '',
-              );
+              expect(paramTypeAnnotation.type).toBe('ArrayTypeAnnotation');
+              invariant(paramTypeAnnotation.type === 'ArrayTypeAnnotation', '');
 
-              expect(param.typeAnnotation.elementType).not.toBe(null);
-              invariant(param.typeAnnotation.elementType != null, '');
-              return [param.typeAnnotation.elementType, module];
+              expect(paramTypeAnnotation.elementType).not.toBe(null);
+              invariant(paramTypeAnnotation.elementType != null, '');
+              const [
+                elementType,
+                isElementTypeNullable,
+              ] = unwrapNullable<NativeModuleBaseTypeAnnotation>(
+                paramTypeAnnotation.elementType,
+              );
+              expect(isElementTypeNullable).toBe(false);
+              return [elementType, module];
             }
 
             // TODO: Do we support nullable element types?
@@ -304,35 +322,44 @@ describe('Flow Module Parser', () => {
               expect(properties[0]).not.toBe(null);
               expect(properties[0].name).toBe('foo');
               expect(properties[0].typeAnnotation).not.toBe(null);
-              expect(properties[0].typeAnnotation?.type).toBe(
-                'StringTypeAnnotation',
+
+              const [typeAnnotation, isPropertyNullable] = unwrapNullable(
+                properties[0].typeAnnotation,
               );
-              expect(properties[0].typeAnnotation?.nullable).toBe(true);
+
+              expect(typeAnnotation.type).toBe('StringTypeAnnotation');
+              expect(isPropertyNullable).toBe(true);
               expect(properties[0].optional).toBe(false);
             });
           });
 
           it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some type alias`, () => {
-            const [param, module] = parseParamType('arg', 'Animal');
-            expect(param.typeAnnotation.type).toBe('TypeAliasTypeAnnotation');
+            const [paramTypeAnnotation, module] = parseParamType(
+              'arg',
+              'Animal',
+            );
+            expect(paramTypeAnnotation.type).toBe('TypeAliasTypeAnnotation');
             invariant(
-              param.typeAnnotation.type === 'TypeAliasTypeAnnotation',
+              paramTypeAnnotation.type === 'TypeAliasTypeAnnotation',
               '',
             );
 
-            expect(param.typeAnnotation.name).toBe('Animal');
+            expect(paramTypeAnnotation.name).toBe('Animal');
             expectAnimalTypeAliasToExist(module);
           });
 
           it(`should parse methods that have ${PARAM_TYPE_DESCRIPTION} parameter type of some type alias that points to another type alias`, () => {
-            const [param, module] = parseParamType('arg', 'AnimalPointer');
-            expect(param.typeAnnotation.type).toBe('TypeAliasTypeAnnotation');
+            const [paramTypeAnnotation, module] = parseParamType(
+              'arg',
+              'AnimalPointer',
+            );
+            expect(paramTypeAnnotation.type).toBe('TypeAliasTypeAnnotation');
             invariant(
-              param.typeAnnotation.type === 'TypeAliasTypeAnnotation',
+              paramTypeAnnotation.type === 'TypeAliasTypeAnnotation',
               '',
             );
 
-            expect(param.typeAnnotation.name).toBe('Animal');
+            expect(paramTypeAnnotation.name).toBe('Animal');
             expectAnimalTypeAliasToExist(module);
           });
 
@@ -354,18 +381,23 @@ describe('Flow Module Parser', () => {
             `);
 
             expect(module.properties[0]).not.toBe(null);
-            const param = module.properties[0].typeAnnotation.params[0];
+            const param = unwrapNullable(module.properties[0].typeAnnotation)[0]
+              .params[0];
             expect(param.name).toBe('arg');
             expect(param.optional).toBe(optional);
 
             // The TypeAliasAnnotation is called Animal, and is nullable
-            expect(param.typeAnnotation.type).toBe('TypeAliasTypeAnnotation');
+            const [
+              paramTypeAnnotation,
+              isParamTypeAnnotationNullable,
+            ] = unwrapNullable(param.typeAnnotation);
+            expect(paramTypeAnnotation.type).toBe('TypeAliasTypeAnnotation');
             invariant(
-              param.typeAnnotation.type === 'TypeAliasTypeAnnotation',
+              paramTypeAnnotation.type === 'TypeAliasTypeAnnotation',
               '',
             );
-            expect(param.typeAnnotation.name).toBe('Animal');
-            expect(param.typeAnnotation.nullable).toBe(true);
+            expect(paramTypeAnnotation.name).toBe('Animal');
+            expect(isParamTypeAnnotationNullable).toBe(true);
 
             // The Animal type alias RHS is valid, and non-null
             expectAnimalTypeAliasToExist(module);
@@ -402,19 +434,26 @@ describe('Flow Module Parser', () => {
             function parseParamTypeObjectLiteralProp(
               propName: string,
               propType: string,
-            ) {
-              const [param, module] = parseParamType(
+            ): [
+              $ReadOnly<{
+                name: string,
+                optional: boolean,
+                typeAnnotation: NativeModuleBaseTypeAnnotation,
+              }>,
+              NativeModuleSchema,
+            ] {
+              const [paramTypeAnnotation, module] = parseParamType(
                 'arg',
                 `{|${annotateProp(propName, propType)}|}`,
               );
 
-              expect(param.typeAnnotation.type).toBe('ObjectTypeAnnotation');
+              expect(paramTypeAnnotation.type).toBe('ObjectTypeAnnotation');
               invariant(
-                param.typeAnnotation.type === 'ObjectTypeAnnotation',
+                paramTypeAnnotation.type === 'ObjectTypeAnnotation',
                 '',
               );
 
-              const {properties} = param.typeAnnotation;
+              const {properties} = paramTypeAnnotation;
 
               expect(properties).not.toBe(null);
               invariant(properties != null, '');
@@ -422,16 +461,19 @@ describe('Flow Module Parser', () => {
               expect(properties.length).toBe(1);
               expect(properties[0].name).toBe(propName);
               expect(properties[0].optional).toBe(isPropOptional);
-              expect(properties[0].typeAnnotation).not.toBe(null);
-              expect(properties[0].typeAnnotation.nullable).toBe(
-                isPropNullable,
-              );
-              invariant(properties[0].typeAnnotation != null, '');
+
+              const [
+                propertyTypeAnnotation,
+                isPropertyTypeAnnotationNullable,
+              ] = unwrapNullable(properties[0].typeAnnotation);
+
+              expect(propertyTypeAnnotation).not.toBe(null);
+              expect(isPropertyTypeAnnotationNullable).toBe(isPropNullable);
 
               return [
                 {
                   ...properties[0],
-                  typeAnnotation: properties[0].typeAnnotation,
+                  typeAnnotation: propertyTypeAnnotation,
                 },
                 module,
               ];
@@ -504,7 +546,7 @@ describe('Flow Module Parser', () => {
                   function parseArrayElementType(
                     propName: string,
                     arrayElementType: string,
-                  ) {
+                  ): [NativeModuleBaseTypeAnnotation, NativeModuleSchema] {
                     const [property, module] = parseParamTypeObjectLiteralProp(
                       'propName',
                       `Array<${arrayElementType}>`,
@@ -517,9 +559,21 @@ describe('Flow Module Parser', () => {
                       '',
                     );
 
-                    const {elementType} = property.typeAnnotation;
-                    expect(elementType).not.toBe(null);
-                    invariant(elementType != null, '');
+                    const {
+                      elementType: nullableElementType,
+                    } = property.typeAnnotation;
+                    expect(nullableElementType).not.toBe(null);
+                    invariant(nullableElementType != null, '');
+
+                    const [
+                      elementType,
+                      isElementTypeNullable,
+                    ] = unwrapNullable<NativeModuleBaseTypeAnnotation>(
+                      nullableElementType,
+                    );
+
+                    expect(isElementTypeNullable).toBe(false);
+
                     return [elementType, module];
                   }
 
@@ -595,10 +649,16 @@ describe('Flow Module Parser', () => {
                     expect(properties[0]).not.toBe(null);
                     expect(properties[0].name).toBe('foo');
                     expect(properties[0].typeAnnotation).not.toBe(null);
-                    expect(properties[0].typeAnnotation?.type).toBe(
+
+                    const [
+                      propertyTypeAnnotation,
+                      isPropertyTypeAnnotationNullable,
+                    ] = unwrapNullable(properties[0].typeAnnotation);
+
+                    expect(propertyTypeAnnotation.type).toBe(
                       'StringTypeAnnotation',
                     );
-                    expect(properties[0].typeAnnotation?.nullable).toBe(true);
+                    expect(isPropertyTypeAnnotationNullable).toBe(true);
                     expect(properties[0].optional).toBe(false);
                   });
                 });
@@ -623,11 +683,16 @@ describe('Flow Module Parser', () => {
 
                   expect(properties[0]).not.toBe(null);
                   expect(properties[0].name).toBe('foo');
-                  expect(properties[0].typeAnnotation).not.toBe(null);
-                  expect(properties[0].typeAnnotation?.type).toBe(
+
+                  const [
+                    propertyTypeAnnotation,
+                    isPropertyTypeAnnotationNullable,
+                  ] = unwrapNullable(properties[0].typeAnnotation);
+
+                  expect(propertyTypeAnnotation.type).toBe(
                     'StringTypeAnnotation',
                   );
-                  expect(properties[0].typeAnnotation?.nullable).toBe(true);
+                  expect(isPropertyTypeAnnotationNullable).toBe(true);
                   expect(properties[0].optional).toBe(false);
                 });
 
@@ -668,10 +733,19 @@ describe('Flow Module Parser', () => {
       `);
 
       expect(module.properties[0]).not.toBe(null);
-      const {returnTypeAnnotation} = module.properties[0].typeAnnotation;
-      expect(returnTypeAnnotation).not.toBe(null);
+
+      const [
+        functionTypeAnnotation,
+        isFunctionTypeAnnotationNullable,
+      ] = unwrapNullable(module.properties[0].typeAnnotation);
+      expect(isFunctionTypeAnnotationNullable).toBe(false);
+
+      const [
+        returnTypeAnnotation,
+        isReturnTypeAnnotationNullable,
+      ] = unwrapNullable(functionTypeAnnotation.returnTypeAnnotation);
       expect(returnTypeAnnotation.type).toBe('VoidTypeAnnotation');
-      expect(returnTypeAnnotation.nullable).toBe(false);
+      expect(isReturnTypeAnnotationNullable).toBe(false);
     });
 
     [true, false].forEach(IS_RETURN_TYPE_NULLABLE => {
@@ -681,7 +755,9 @@ describe('Flow Module Parser', () => {
       const annotateRet = retType =>
         IS_RETURN_TYPE_NULLABLE ? `?${retType}` : retType;
 
-      function parseReturnType(flowType: string) {
+      function parseReturnType(
+        flowType: string,
+      ): [NativeModuleReturnTypeAnnotation, NativeModuleSchema] {
         const module = parseModule(`
           import type {TurboModule} from 'RCTExport';
           import * as TurboModuleRegistry from 'TurboModuleRegistry';
@@ -695,9 +771,18 @@ describe('Flow Module Parser', () => {
         `);
 
         expect(module.properties[0]).not.toBe(null);
-        const {returnTypeAnnotation} = module.properties[0].typeAnnotation;
-        expect(returnTypeAnnotation).not.toBe(null);
-        expect(returnTypeAnnotation.nullable).toBe(IS_RETURN_TYPE_NULLABLE);
+        const [
+          functionTypeAnnotation,
+          isFunctionTypeAnnotationNullable,
+        ] = unwrapNullable(module.properties[0].typeAnnotation);
+        expect(isFunctionTypeAnnotationNullable).toBe(false);
+
+        const [
+          returnTypeAnnotation,
+          isReturnTypeAnnotationNullable,
+        ] = unwrapNullable(functionTypeAnnotation.returnTypeAnnotation);
+        expect(isReturnTypeAnnotationNullable).toBe(IS_RETURN_TYPE_NULLABLE);
+
         return [returnTypeAnnotation, module];
       }
 
@@ -749,7 +834,9 @@ describe('Flow Module Parser', () => {
               );
             });
 
-            function parseArrayElementReturnType(flowType: string) {
+            function parseArrayElementReturnType(
+              flowType: string,
+            ): [NativeModuleBaseTypeAnnotation, NativeModuleSchema] {
               const [returnTypeAnnotation, module] = parseReturnType(
                 'Array' + (flowType != null ? `<${flowType}>` : ''),
               );
@@ -759,10 +846,19 @@ describe('Flow Module Parser', () => {
                 '',
               );
 
-              const {elementType} = returnTypeAnnotation;
+              const arrayTypeAnnotation = returnTypeAnnotation;
+
+              const {elementType} = arrayTypeAnnotation;
               expect(elementType).not.toBe(null);
               invariant(elementType != null, '');
-              return [elementType, module];
+
+              const [
+                elementTypeAnnotation,
+                isElementTypeAnnotation,
+              ] = unwrapNullable<NativeModuleBaseTypeAnnotation>(elementType);
+              expect(isElementTypeAnnotation).toBe(false);
+
+              return [elementTypeAnnotation, module];
             }
 
             // TODO: Do we support nullable element types?
@@ -824,10 +920,14 @@ describe('Flow Module Parser', () => {
               expect(properties[0]).not.toBe(null);
               expect(properties[0].name).toBe('foo');
               expect(properties[0].typeAnnotation).not.toBe(null);
-              expect(properties[0].typeAnnotation?.type).toBe(
-                'StringTypeAnnotation',
-              );
-              expect(properties[0].typeAnnotation?.nullable).toBe(true);
+
+              const [
+                propertyTypeAnnotation,
+                isPropertyTypeAnnotationNullable,
+              ] = unwrapNullable(properties[0].typeAnnotation);
+
+              expect(propertyTypeAnnotation.type).toBe('StringTypeAnnotation');
+              expect(isPropertyTypeAnnotationNullable).toBe(true);
               expect(properties[0].optional).toBe(false);
             });
           });
@@ -903,7 +1003,14 @@ describe('Flow Module Parser', () => {
               function parseObjectLiteralReturnTypeProp(
                 propName: string,
                 propType: string,
-              ) {
+              ): [
+                $ReadOnly<{
+                  name: string,
+                  optional: boolean,
+                  typeAnnotation: NativeModuleBaseTypeAnnotation,
+                }>,
+                NativeModuleSchema,
+              ] {
                 const [returnTypeAnnotation, module] = parseReturnType(
                   `{|${annotateProp(propName, propType)}|}`,
                 );
@@ -923,13 +1030,18 @@ describe('Flow Module Parser', () => {
                 const property = properties[0];
                 expect(property.name).toBe(propName);
                 expect(property.optional).toBe(optional);
-                expect(property.typeAnnotation).not.toBe(null);
-                expect(property.typeAnnotation?.nullable).toBe(nullable);
-                invariant(property.typeAnnotation != null, '');
+
+                const [
+                  propertyTypeAnnotation,
+                  isPropertyTypeAnnotationNullable,
+                ] = unwrapNullable(property.typeAnnotation);
+
+                expect(propertyTypeAnnotation).not.toBe(null);
+                expect(isPropertyTypeAnnotationNullable).toBe(nullable);
                 return [
                   {
                     ...property,
-                    typeAnnotation: property.typeAnnotation,
+                    typeAnnotation: propertyTypeAnnotation,
                   },
                   module,
                 ];
@@ -1010,7 +1122,7 @@ describe('Flow Module Parser', () => {
                     function parseArrayElementType(
                       propName: string,
                       arrayElementType: string,
-                    ) {
+                    ): [NativeModuleBaseTypeAnnotation, NativeModuleSchema] {
                       const [
                         property,
                         module,
@@ -1027,9 +1139,20 @@ describe('Flow Module Parser', () => {
                         '',
                       );
 
-                      const {elementType} = property.typeAnnotation;
-                      expect(elementType).not.toBe(null);
-                      invariant(elementType != null, '');
+                      const {
+                        elementType: nullableElementType,
+                      } = property.typeAnnotation;
+                      expect(nullableElementType).not.toBe(null);
+                      invariant(nullableElementType != null, '');
+
+                      const [
+                        elementType,
+                        isElementTypeNullable,
+                      ] = unwrapNullable<NativeModuleBaseTypeAnnotation>(
+                        nullableElementType,
+                      );
+                      expect(isElementTypeNullable).toBe(false);
+
                       return [elementType, module];
                     }
 
@@ -1105,13 +1228,15 @@ describe('Flow Module Parser', () => {
                       expect(properties[0].name).toBe('foo');
                       expect(properties[0].optional).toBe(false);
 
-                      expect(properties[0].typeAnnotation).not.toBe(null);
-                      invariant(properties[0].typeAnnotation != null, '');
+                      const [
+                        propertyTypeAnnotation,
+                        isPropertyTypeAnnotationNullable,
+                      ] = unwrapNullable(properties[0].typeAnnotation);
 
-                      expect(properties[0].typeAnnotation.type).toBe(
+                      expect(propertyTypeAnnotation.type).toBe(
                         'StringTypeAnnotation',
                       );
-                      expect(properties[0].typeAnnotation.nullable).toBe(true);
+                      expect(isPropertyTypeAnnotationNullable).toBe(true);
                     });
                   });
 
@@ -1138,13 +1263,15 @@ describe('Flow Module Parser', () => {
                     expect(properties[0].name).toBe('foo');
                     expect(properties[0].optional).toBe(false);
 
-                    expect(properties[0].typeAnnotation).not.toBe(null);
-                    invariant(properties[0].typeAnnotation != null, '');
+                    const [
+                      propertyTypeAnnotation,
+                      isPropertyTypeAnnotationNullable,
+                    ] = unwrapNullable(properties[0].typeAnnotation);
 
-                    expect(properties[0].typeAnnotation.type).toBe(
+                    expect(propertyTypeAnnotation.type).toBe(
                       'StringTypeAnnotation',
                     );
-                    expect(properties[0].typeAnnotation.nullable).toBe(true);
+                    expect(isPropertyTypeAnnotationNullable).toBe(true);
                   });
 
                   it(`should parse methods that have ${RETURN_TYPE_DESCRIPTION} return type of an object literal with ${PROP_TYPE_DESCRIPTION} prop of some type alias`, () => {
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/index.js b/packages/react-native-codegen/src/parsers/flow/modules/index.js
index a1da76184fba9c..8f936530a79a56 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/index.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/index.js
@@ -16,10 +16,14 @@ import type {
   NativeModuleAliasMap,
   NativeModuleSchema,
   NativeModuleFunctionTypeAnnotation,
+  NativeModuleArrayTypeAnnotation,
+  NativeModuleBaseTypeAnnotation,
+  Nullable,
 } from '../../../CodegenSchema.js';
 
 import type {TypeDeclarationMap} from '../utils.js';
 const {resolveTypeAnnotation} = require('../utils.js');
+const {unwrapNullable, wrapNullable} = require('./utils');
 const {
   FlowGenericNotTypeParameterizedParserError,
   FlowGenericTypeParameterCountMismatchParserError,
@@ -39,7 +43,7 @@ function translateTypeAnnotation(
   flowTypeAnnotation: $FlowFixMe,
   types: TypeDeclarationMap,
   aliasMap: {...NativeModuleAliasMap},
-): NativeModuleTypeAnnotation {
+): Nullable<NativeModuleTypeAnnotation> {
   const {
     nullable,
     typeAnnotation,
@@ -49,21 +53,21 @@ function translateTypeAnnotation(
   switch (typeAnnotation.type) {
     case 'GenericTypeAnnotation': {
       switch (typeAnnotation.id.name) {
-        case 'RootTag':
-          return {
-            nullable,
+        case 'RootTag': {
+          return wrapNullable(nullable, {
             type: 'ReservedFunctionValueTypeAnnotation',
             name: 'RootTag',
-          };
+          });
+        }
         case 'Promise': {
           assertGenericTypeAnnotationHasExactlyOneTypeParameter(
             moduleName,
             typeAnnotation,
           );
-          return {
-            nullable,
+
+          return wrapNullable(nullable, {
             type: 'PromiseTypeAnnotation',
-          };
+          });
         }
         case 'Array':
         case '$ReadOnlyArray': {
@@ -78,11 +82,14 @@ function translateTypeAnnotation(
              * invalid Array ElementTypes. Then, make the elementType a required
              * parameter.
              */
-            const elementType = translateTypeAnnotation(
-              moduleName,
-              typeAnnotation.typeParameters.params[0],
-              types,
-              aliasMap,
+
+            const [elementType, isElementTypeNullable] = unwrapNullable(
+              translateTypeAnnotation(
+                moduleName,
+                typeAnnotation.typeParameters.params[0],
+                types,
+                aliasMap,
+              ),
             );
 
             invariant(
@@ -99,16 +106,18 @@ function translateTypeAnnotation(
               `${typeAnnotation.id.name} element type cannot be a function.`,
             );
 
-            return {
-              nullable,
+            const finalTypeAnnotation: NativeModuleArrayTypeAnnotation<
+              Nullable<NativeModuleBaseTypeAnnotation>,
+            > = {
               type: 'ArrayTypeAnnotation',
-              elementType: elementType,
+              elementType: wrapNullable(isElementTypeNullable, elementType),
             };
+
+            return wrapNullable(nullable, finalTypeAnnotation);
           } catch (ex) {
-            return {
-              nullable,
+            return wrapNullable(nullable, {
               type: 'ArrayTypeAnnotation',
-            };
+            });
           }
         }
         case '$ReadOnly': {
@@ -124,34 +133,29 @@ function translateTypeAnnotation(
           );
         }
         case 'Stringish': {
-          return {
-            nullable,
+          return wrapNullable(nullable, {
             type: 'StringTypeAnnotation',
-          };
+          });
         }
         case 'Int32': {
-          return {
-            nullable,
+          return wrapNullable(nullable, {
             type: 'Int32TypeAnnotation',
-          };
+          });
         }
         case 'Double': {
-          return {
-            nullable,
+          return wrapNullable(nullable, {
             type: 'DoubleTypeAnnotation',
-          };
+          });
         }
         case 'Float': {
-          return {
-            nullable,
+          return wrapNullable(nullable, {
             type: 'FloatTypeAnnotation',
-          };
+          });
         }
         case 'Object': {
-          return {
-            nullable,
+          return wrapNullable(nullable, {
             type: 'GenericObjectTypeAnnotation',
-          };
+          });
         }
         default: {
           throw new UnrecognizedFlowGenericParserError(
@@ -162,7 +166,7 @@ function translateTypeAnnotation(
       }
     }
     case 'ObjectTypeAnnotation': {
-      const objectTypeAnnotationPartial = {
+      const objectTypeAnnotation = {
         type: 'ObjectTypeAnnotation',
         properties: typeAnnotation.properties.map(property => {
           const {optional} = property;
@@ -180,19 +184,13 @@ function translateTypeAnnotation(
       };
 
       if (!typeAliasResolutionStatus.successful) {
-        return {
-          nullable,
-          ...objectTypeAnnotationPartial,
-        };
+        return wrapNullable(nullable, objectTypeAnnotation);
       }
 
       /**
        * All aliases RHS are required.
        */
-      aliasMap[typeAliasResolutionStatus.aliasName] = {
-        nullable: false,
-        ...objectTypeAnnotationPartial,
-      };
+      aliasMap[typeAliasResolutionStatus.aliasName] = objectTypeAnnotation;
 
       /**
        * Nullability of type aliases is transitive.
@@ -223,43 +221,40 @@ function translateTypeAnnotation(
        *     Hence, it's better to manage nullability within the actual TypeAliasTypeAnnotation nodes, and not the
        *     associated ObjectTypeAnnotations.
        */
-      return {
-        nullable: nullable,
+      return wrapNullable(nullable, {
         type: 'TypeAliasTypeAnnotation',
         name: typeAliasResolutionStatus.aliasName,
-      };
+      });
     }
     case 'BooleanTypeAnnotation': {
-      return {
-        nullable,
+      return wrapNullable(nullable, {
         type: 'BooleanTypeAnnotation',
-      };
+      });
     }
     case 'NumberTypeAnnotation': {
-      return {
-        nullable,
+      return wrapNullable(nullable, {
         type: 'NumberTypeAnnotation',
-      };
+      });
     }
     case 'VoidTypeAnnotation': {
-      return {
-        nullable,
+      return wrapNullable(nullable, {
         type: 'VoidTypeAnnotation',
-      };
+      });
     }
     case 'StringTypeAnnotation': {
-      return {
-        nullable,
+      return wrapNullable(nullable, {
         type: 'StringTypeAnnotation',
-      };
+      });
     }
     case 'FunctionTypeAnnotation': {
-      return translateFunctionTypeAnnotation(
-        moduleName,
-        typeAnnotation,
-        types,
+      return wrapNullable(
         nullable,
-        aliasMap,
+        translateFunctionTypeAnnotation(
+          moduleName,
+          typeAnnotation,
+          types,
+          aliasMap,
+        ),
       );
     }
     default: {
@@ -305,7 +300,6 @@ function translateFunctionTypeAnnotation(
   // TODO(T71778680): This is a FunctionTypeAnnotation. Type this.
   flowFunctionTypeAnnotation: $FlowFixMe,
   types: TypeDeclarationMap,
-  nullable: boolean,
   aliasMap: {...NativeModuleAliasMap},
 ): NativeModuleFunctionTypeAnnotation {
   const params: Array<NativeModuleMethodParamSchema> = [];
@@ -315,11 +309,13 @@ function translateFunctionTypeAnnotation(
     }
 
     const paramName = flowParam.name.name;
-    const paramTypeAnnotation = translateTypeAnnotation(
-      moduleName,
-      flowParam.typeAnnotation,
-      types,
-      aliasMap,
+    const [paramTypeAnnotation, isParamTypeAnnotationNullable] = unwrapNullable(
+      translateTypeAnnotation(
+        moduleName,
+        flowParam.typeAnnotation,
+        types,
+        aliasMap,
+      ),
     );
 
     invariant(
@@ -335,15 +331,20 @@ function translateFunctionTypeAnnotation(
     params.push({
       name: flowParam.name.name,
       optional: flowParam.optional,
-      typeAnnotation: paramTypeAnnotation,
+      typeAnnotation: wrapNullable(
+        isParamTypeAnnotationNullable,
+        paramTypeAnnotation,
+      ),
     });
   }
 
-  const returnTypeAnnotation = translateTypeAnnotation(
-    moduleName,
-    flowFunctionTypeAnnotation.returnType,
-    types,
-    aliasMap,
+  const [returnTypeAnnotation, isReturnTypeAnnotationNullable] = unwrapNullable(
+    translateTypeAnnotation(
+      moduleName,
+      flowFunctionTypeAnnotation.returnType,
+      types,
+      aliasMap,
+    ),
   );
 
   invariant(
@@ -353,9 +354,11 @@ function translateFunctionTypeAnnotation(
 
   return {
     type: 'FunctionTypeAnnotation',
-    returnTypeAnnotation,
+    returnTypeAnnotation: wrapNullable(
+      isReturnTypeAnnotationNullable,
+      returnTypeAnnotation,
+    ),
     params,
-    nullable,
   };
 }
 
@@ -385,12 +388,9 @@ function buildPropertySchema(
   return {
     name: methodName,
     optional: property.optional,
-    typeAnnotation: translateFunctionTypeAnnotation(
-      moduleName,
-      value,
-      types,
+    typeAnnotation: wrapNullable(
       nullable,
-      aliasMap,
+      translateFunctionTypeAnnotation(moduleName, value, types, aliasMap),
     ),
   };
 }
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/utils.js b/packages/react-native-codegen/src/parsers/flow/modules/utils.js
new file mode 100644
index 00000000000000..8b8aa0b0648d3e
--- /dev/null
+++ b/packages/react-native-codegen/src/parsers/flow/modules/utils.js
@@ -0,0 +1,45 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict
+ * @format
+ */
+
+'use strict';
+
+import type {
+  NativeModuleTypeAnnotation,
+  Nullable,
+} from '../../../CodegenSchema.js';
+
+function unwrapNullable<+T: NativeModuleTypeAnnotation>(
+  x: Nullable<T>,
+): [T, boolean] {
+  if (x.type === 'NullableTypeAnnotation') {
+    return [x.typeAnnotation, true];
+  }
+
+  return [x, false];
+}
+
+function wrapNullable<+T: NativeModuleTypeAnnotation>(
+  nullable: boolean,
+  typeAnnotation: T,
+): Nullable<T> {
+  if (!nullable) {
+    return typeAnnotation;
+  }
+
+  return {
+    type: 'NullableTypeAnnotation',
+    typeAnnotation,
+  };
+}
+
+module.exports = {
+  unwrapNullable,
+  wrapNullable,
+};

From 6fe06ca160527a5c8db153ec110d7f5237583f23 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 163/241] Update generator fixtures to use
 NullableTypeAnnotation

Summary:
This will make sure that the snapshot tests for the generators work with NullableTypeAnnotation.
Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24027246

fbshipit-source-id: cee93e40be7585ec527087d114f8326c2ecb9ddd
---
 .../modules/__test_fixtures__/fixtures.js     | 372 +++++-------------
 1 file changed, 103 insertions(+), 269 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
index 92a7dc3489823e..a036b47e235a46 100644
--- a/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
+++ b/packages/react-native-codegen/src/generators/modules/__test_fixtures__/fixtures.js
@@ -38,7 +38,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
@@ -46,7 +45,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                       name: 'const1',
                       typeAnnotation: {
                         type: 'BooleanTypeAnnotation',
-                        nullable: false,
                       },
                     },
                     {
@@ -54,7 +52,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                       name: 'const2',
                       typeAnnotation: {
                         type: 'NumberTypeAnnotation',
-                        nullable: false,
                       },
                     },
                     {
@@ -62,13 +59,11 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                       name: 'const3',
                       typeAnnotation: {
                         type: 'StringTypeAnnotation',
-                        nullable: false,
                       },
                     },
                   ],
                 },
                 params: [],
-                nullable: false,
               },
             },
             {
@@ -77,11 +72,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                nullable: false,
               },
             },
             {
@@ -90,7 +83,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'BooleanTypeAnnotation',
                 },
                 params: [
@@ -99,11 +91,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'arg',
                     typeAnnotation: {
                       type: 'BooleanTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -112,7 +102,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'NumberTypeAnnotation',
                 },
                 params: [
@@ -121,11 +110,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'arg',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -134,7 +121,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'StringTypeAnnotation',
                 },
                 params: [
@@ -143,11 +129,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'arg',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -156,11 +140,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ArrayTypeAnnotation',
                   elementType: {
                     type: 'GenericObjectTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 params: [
@@ -169,15 +151,13 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
-                      nullable: false,
+
                       elementType: {
                         type: 'GenericObjectTypeAnnotation',
-                        nullable: false,
                       },
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -186,7 +166,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'GenericObjectTypeAnnotation',
                 },
                 params: [
@@ -195,11 +174,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'arg',
                     typeAnnotation: {
                       type: 'GenericObjectTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -208,7 +185,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ReservedFunctionValueTypeAnnotation',
                   name: 'RootTag',
                 },
@@ -219,11 +195,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     typeAnnotation: {
                       type: 'ReservedFunctionValueTypeAnnotation',
                       name: 'RootTag',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -232,7 +206,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'GenericObjectTypeAnnotation',
                 },
                 params: [
@@ -241,7 +214,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'x',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
-                      nullable: false,
                     },
                   },
                   {
@@ -249,7 +221,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'y',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                   {
@@ -257,11 +228,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'z',
                     typeAnnotation: {
                       type: 'GenericObjectTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -270,7 +239,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -282,13 +250,10 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                       params: [],
                       returnTypeAnnotation: {
                         type: 'VoidTypeAnnotation',
-                        nullable: false,
                       },
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -297,7 +262,6 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'PromiseTypeAnnotation',
                 },
                 params: [
@@ -306,11 +270,9 @@ const SIMPLE_NATIVE_MODULES: SchemaType = {
                     name: 'error',
                     typeAnnotation: {
                       type: 'BooleanTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
           ],
@@ -333,11 +295,9 @@ const TWO_MODULES_SAME_FILE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                nullable: false,
               },
             },
           ],
@@ -351,11 +311,9 @@ const TWO_MODULES_SAME_FILE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                nullable: false,
               },
             },
           ],
@@ -378,11 +336,9 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                nullable: false,
               },
             },
           ],
@@ -400,12 +356,10 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [],
                 },
                 params: [],
-                nullable: false,
               },
             },
             {
@@ -414,11 +368,9 @@ const TWO_MODULES_DIFFERENT_FILES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [],
-                nullable: false,
               },
             },
           ],
@@ -441,7 +393,6 @@ const COMPLEX_OBJECTS: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [
                     {
@@ -449,7 +400,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                       name: 'D',
                       typeAnnotation: {
                         type: 'BooleanTypeAnnotation',
-                        nullable: false,
                       },
                     },
                     {
@@ -457,7 +407,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                       name: 'E',
                       typeAnnotation: {
                         type: 'NumberTypeAnnotation',
-                        nullable: false,
                       },
                     },
                     {
@@ -465,7 +414,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                       name: 'F',
                       typeAnnotation: {
                         type: 'StringTypeAnnotation',
-                        nullable: false,
                       },
                     },
                   ],
@@ -476,14 +424,13 @@ const COMPLEX_OBJECTS: SchemaType = {
                     name: 'A',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
-                      nullable: false,
+
                       properties: [
                         {
                           optional: false,
                           name: 'D',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
-                            nullable: false,
                           },
                         },
                         {
@@ -491,14 +438,13 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'E',
                           typeAnnotation: {
                             type: 'ObjectTypeAnnotation',
-                            nullable: false,
+
                             properties: [
                               {
                                 optional: false,
                                 name: 'D',
                                 typeAnnotation: {
                                   type: 'BooleanTypeAnnotation',
-                                  nullable: false,
                                 },
                               },
                               {
@@ -506,7 +452,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'E',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
-                                  nullable: false,
                                 },
                               },
                               {
@@ -514,7 +459,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'F',
                                 typeAnnotation: {
                                   type: 'StringTypeAnnotation',
-                                  nullable: false,
                                 },
                               },
                               {
@@ -522,7 +466,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'id',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
-                                  nullable: false,
                                 },
                               },
                             ],
@@ -533,14 +476,12 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'F',
                           typeAnnotation: {
                             type: 'StringTypeAnnotation',
-                            nullable: false,
                           },
                         },
                       ],
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -549,7 +490,6 @@ const COMPLEX_OBJECTS: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -558,14 +498,13 @@ const COMPLEX_OBJECTS: SchemaType = {
                     name: 'A',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
-                      nullable: false,
+
                       properties: [
                         {
                           optional: true,
                           name: 'optionalNumberProperty',
                           typeAnnotation: {
                             type: 'NumberTypeAnnotation',
-                            nullable: false,
                           },
                         },
                         {
@@ -573,10 +512,9 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalArrayProperty',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
-                            nullable: false,
+
                             elementType: {
                               type: 'NumberTypeAnnotation',
-                              nullable: false,
                             },
                           },
                         },
@@ -585,14 +523,13 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalObjectProperty',
                           typeAnnotation: {
                             type: 'ObjectTypeAnnotation',
-                            nullable: false,
+
                             properties: [
                               {
                                 optional: false,
                                 name: 'x',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
-                                  nullable: false,
                                 },
                               },
                               {
@@ -600,7 +537,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                                 name: 'y',
                                 typeAnnotation: {
                                   type: 'NumberTypeAnnotation',
-                                  nullable: false,
                                 },
                               },
                             ],
@@ -611,7 +547,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalGenericObjectProperty',
                           typeAnnotation: {
                             type: 'GenericObjectTypeAnnotation',
-                            nullable: false,
                           },
                         },
                         {
@@ -619,79 +554,73 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalBooleanTypeProperty',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
-                            nullable: false,
                           },
                         },
                       ],
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
               name: 'optionalMethod',
               optional: true,
               typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  nullable: false,
-                  type: 'VoidTypeAnnotation',
-                },
-                params: [
-                  {
-                    optional: false,
-                    name: 'options',
-                    typeAnnotation: {
-                      type: 'GenericObjectTypeAnnotation',
-                      nullable: false,
-                    },
+                type: 'NullableTypeAnnotation',
+                typeAnnotation: {
+                  type: 'FunctionTypeAnnotation',
+                  returnTypeAnnotation: {
+                    type: 'VoidTypeAnnotation',
                   },
-                  {
-                    name: 'callback',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'FunctionTypeAnnotation',
-                      params: [],
-                      returnTypeAnnotation: {
-                        type: 'VoidTypeAnnotation',
-                        nullable: false,
+                  params: [
+                    {
+                      optional: false,
+                      name: 'options',
+                      typeAnnotation: {
+                        type: 'GenericObjectTypeAnnotation',
                       },
-                      nullable: false,
                     },
-                  },
-                  {
-                    name: 'extras',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ArrayTypeAnnotation',
-                      nullable: false,
-                      elementType: {
-                        type: 'ObjectTypeAnnotation',
-                        nullable: false,
-                        properties: [
-                          {
-                            optional: false,
-                            name: 'key',
-                            typeAnnotation: {
-                              type: 'StringTypeAnnotation',
-                              nullable: false,
+                    {
+                      name: 'callback',
+                      optional: false,
+                      typeAnnotation: {
+                        type: 'FunctionTypeAnnotation',
+                        params: [],
+                        returnTypeAnnotation: {
+                          type: 'VoidTypeAnnotation',
+                        },
+                      },
+                    },
+                    {
+                      name: 'extras',
+                      optional: true,
+                      typeAnnotation: {
+                        type: 'ArrayTypeAnnotation',
+
+                        elementType: {
+                          type: 'ObjectTypeAnnotation',
+
+                          properties: [
+                            {
+                              optional: false,
+                              name: 'key',
+                              typeAnnotation: {
+                                type: 'StringTypeAnnotation',
+                              },
                             },
-                          },
-                          {
-                            optional: false,
-                            name: 'value',
-                            typeAnnotation: {
-                              type: 'GenericObjectTypeAnnotation',
-                              nullable: false,
+                            {
+                              optional: false,
+                              name: 'value',
+                              typeAnnotation: {
+                                type: 'GenericObjectTypeAnnotation',
+                              },
                             },
-                          },
-                        ],
+                          ],
+                        },
                       },
                     },
-                  },
-                ],
-                nullable: true,
+                  ],
+                },
               },
             },
             {
@@ -700,7 +629,6 @@ const COMPLEX_OBJECTS: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -709,17 +637,16 @@ const COMPLEX_OBJECTS: SchemaType = {
                     name: 'options',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
-                      nullable: false,
+
                       properties: [
                         {
                           optional: false,
                           name: 'arrayOfNumbers',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
-                            nullable: false,
+
                             elementType: {
                               type: 'NumberTypeAnnotation',
-                              nullable: false,
                             },
                           },
                         },
@@ -728,10 +655,9 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalArrayOfNumbers',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
-                            nullable: false,
+
                             elementType: {
                               type: 'NumberTypeAnnotation',
-                              nullable: false,
                             },
                           },
                         },
@@ -740,10 +666,9 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'arrayOfStrings',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
-                            nullable: false,
+
                             elementType: {
                               type: 'StringTypeAnnotation',
-                              nullable: false,
                             },
                           },
                         },
@@ -752,10 +677,9 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'optionalArrayOfStrings',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
-                            nullable: false,
+
                             elementType: {
                               type: 'StringTypeAnnotation',
-                              nullable: false,
                             },
                           },
                         },
@@ -764,17 +688,16 @@ const COMPLEX_OBJECTS: SchemaType = {
                           name: 'arrayOfObjects',
                           typeAnnotation: {
                             type: 'ArrayTypeAnnotation',
-                            nullable: false,
+
                             elementType: {
                               type: 'ObjectTypeAnnotation',
-                              nullable: false,
+
                               properties: [
                                 {
                                   optional: false,
                                   name: 'numberProperty',
                                   typeAnnotation: {
                                     type: 'NumberTypeAnnotation',
-                                    nullable: false,
                                   },
                                 },
                               ],
@@ -785,7 +708,6 @@ const COMPLEX_OBJECTS: SchemaType = {
                     },
                   },
                 ],
-                nullable: false,
               },
             },
           ],
@@ -803,21 +725,20 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
           aliases: {
             Options: {
               type: 'ObjectTypeAnnotation',
-              nullable: false,
+
               properties: [
                 {
                   optional: false,
                   name: 'offset',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
-                    nullable: false,
+
                     properties: [
                       {
                         optional: false,
                         name: 'x',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -825,7 +746,6 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                         name: 'y',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
-                          nullable: false,
                         },
                       },
                     ],
@@ -836,14 +756,13 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'size',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
-                    nullable: false,
+
                     properties: [
                       {
                         optional: false,
                         name: 'width',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -851,7 +770,6 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                         name: 'height',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
-                          nullable: false,
                         },
                       },
                     ],
@@ -862,14 +780,13 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'displaySize',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
-                    nullable: false,
+
                     properties: [
                       {
                         optional: false,
                         name: 'width',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -877,7 +794,6 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                         name: 'height',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
-                          nullable: false,
                         },
                       },
                     ],
@@ -888,7 +804,6 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'resizeMode',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -896,7 +811,6 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                   name: 'allowExternalStorage',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
-                    nullable: false,
                   },
                 },
               ],
@@ -909,12 +823,10 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [],
                 },
                 params: [],
-                nullable: false,
               },
             },
             {
@@ -923,7 +835,6 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -933,11 +844,9 @@ const NATIVE_MODULES_WITH_TYPE_ALIASES: SchemaType = {
                     typeAnnotation: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'Options',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
           ],
@@ -955,14 +864,13 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
           aliases: {
             PhotoIdentifierImage: {
               type: 'ObjectTypeAnnotation',
-              nullable: false,
+
               properties: [
                 {
                   optional: false,
                   name: 'uri',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -970,7 +878,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'playableDuration',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -978,7 +885,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'width',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -986,7 +892,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'height',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -994,7 +899,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'isStored',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1002,21 +906,20 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'filename',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
               ],
             },
             PhotoIdentifier: {
               type: 'ObjectTypeAnnotation',
-              nullable: false,
+
               properties: [
                 {
                   optional: false,
                   name: 'node',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
-                    nullable: false,
+
                     properties: [
                       {
                         optional: false,
@@ -1024,7 +927,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         typeAnnotation: {
                           type: 'TypeAliasTypeAnnotation',
                           name: 'PhotoIdentifierImage',
-                          nullable: false,
                         },
                       },
                       {
@@ -1032,7 +934,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'type',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -1040,7 +941,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'group_name',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -1048,7 +948,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'timestamp',
                         typeAnnotation: {
                           type: 'NumberTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -1056,14 +955,13 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'location',
                         typeAnnotation: {
                           type: 'ObjectTypeAnnotation',
-                          nullable: false,
+
                           properties: [
                             {
                               optional: false,
                               name: 'longitude',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
-                                nullable: false,
                               },
                             },
                             {
@@ -1071,7 +969,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'latitude',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
-                                nullable: false,
                               },
                             },
                             {
@@ -1079,7 +976,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'altitude',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
-                                nullable: false,
                               },
                             },
                             {
@@ -1087,7 +983,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'heading',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
-                                nullable: false,
                               },
                             },
                             {
@@ -1095,7 +990,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                               name: 'speed',
                               typeAnnotation: {
                                 type: 'NumberTypeAnnotation',
-                                nullable: false,
                               },
                             },
                           ],
@@ -1108,18 +1002,17 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
             },
             PhotoIdentifiersPage: {
               type: 'ObjectTypeAnnotation',
-              nullable: false,
+
               properties: [
                 {
                   optional: false,
                   name: 'edges',
                   typeAnnotation: {
                     type: 'ArrayTypeAnnotation',
-                    nullable: false,
+
                     elementType: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'PhotoIdentifier',
-                      nullable: false,
                     },
                   },
                 },
@@ -1128,14 +1021,13 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'page_info',
                   typeAnnotation: {
                     type: 'ObjectTypeAnnotation',
-                    nullable: false,
+
                     properties: [
                       {
                         optional: false,
                         name: 'has_next_page',
                         typeAnnotation: {
                           type: 'BooleanTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -1143,7 +1035,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'start_cursor',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
-                          nullable: false,
                         },
                       },
                       {
@@ -1151,7 +1042,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                         name: 'end_cursor',
                         typeAnnotation: {
                           type: 'StringTypeAnnotation',
-                          nullable: false,
                         },
                       },
                     ],
@@ -1161,14 +1051,13 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
             },
             GetPhotosParams: {
               type: 'ObjectTypeAnnotation',
-              nullable: false,
+
               properties: [
                 {
                   optional: false,
                   name: 'first',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1176,7 +1065,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'after',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1184,7 +1072,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'groupName',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1192,7 +1079,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'groupTypes',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1200,7 +1086,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'assetType',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1208,7 +1093,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'maxSize',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1216,10 +1100,9 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'mimeTypes',
                   typeAnnotation: {
                     type: 'ArrayTypeAnnotation',
-                    nullable: false,
+
                     elementType: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 },
@@ -1233,12 +1116,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'ObjectTypeAnnotation',
                   properties: [],
                 },
                 params: [],
-                nullable: false,
               },
             },
             {
@@ -1248,7 +1129,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
                   type: 'PromiseTypeAnnotation',
-                  nullable: false,
                 },
                 params: [
                   {
@@ -1257,11 +1137,9 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     typeAnnotation: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'GetPhotosParams',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -1271,7 +1149,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
                   type: 'PromiseTypeAnnotation',
-                  nullable: false,
                 },
                 params: [
                   {
@@ -1279,7 +1156,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'uri',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                   {
@@ -1287,11 +1163,9 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'type',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -1301,7 +1175,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
                   type: 'PromiseTypeAnnotation',
-                  nullable: false,
                 },
                 params: [
                   {
@@ -1309,15 +1182,13 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
-                      nullable: false,
+
                       elementType: {
                         type: 'StringTypeAnnotation',
-                        nullable: false,
                       },
                     },
                   },
                 ],
-                nullable: false,
               },
             },
           ],
@@ -1335,7 +1206,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -1344,14 +1214,13 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'config',
                     typeAnnotation: {
                       type: 'ObjectTypeAnnotation',
-                      nullable: false,
+
                       properties: [
                         {
                           optional: false,
                           name: 'unmirrorFrontFacingCamera',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
-                            nullable: false,
                           },
                         },
                         {
@@ -1359,7 +1228,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                           name: 'videoMode',
                           typeAnnotation: {
                             type: 'BooleanTypeAnnotation',
-                            nullable: false,
                           },
                         },
                       ],
@@ -1372,10 +1240,8 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                       type: 'FunctionTypeAnnotation',
                       params: [],
                       returnTypeAnnotation: {
-                        nullable: false,
                         type: 'VoidTypeAnnotation',
                       },
-                      nullable: false,
                     },
                   },
                   {
@@ -1385,14 +1251,11 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                       type: 'FunctionTypeAnnotation',
                       params: [],
                       returnTypeAnnotation: {
-                        nullable: false,
                         type: 'VoidTypeAnnotation',
                       },
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
           ],
@@ -1410,7 +1273,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'column',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1418,7 +1280,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'file',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1426,7 +1287,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'lineNumber',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1434,7 +1294,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'methodName',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1442,12 +1301,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'collapse',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
-                    nullable: false,
                   },
                 },
               ],
               type: 'ObjectTypeAnnotation',
-              nullable: false,
             },
             ExceptionData: {
               properties: [
@@ -1456,7 +1313,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'message',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1464,7 +1320,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'originalMessage',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1472,7 +1327,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'name',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1480,7 +1334,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'componentStack',
                   typeAnnotation: {
                     type: 'StringTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1488,11 +1341,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'stack',
                   typeAnnotation: {
                     type: 'ArrayTypeAnnotation',
-                    nullable: false,
+
                     elementType: {
                       type: 'TypeAliasTypeAnnotation',
                       name: 'StackFrame',
-                      nullable: false,
                     },
                   },
                 },
@@ -1501,7 +1353,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'id',
                   typeAnnotation: {
                     type: 'NumberTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1509,7 +1360,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'isFatal',
                   typeAnnotation: {
                     type: 'BooleanTypeAnnotation',
-                    nullable: false,
                   },
                 },
                 {
@@ -1517,12 +1367,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                   name: 'extraData',
                   typeAnnotation: {
                     type: 'GenericObjectTypeAnnotation',
-                    nullable: false,
                   },
                 },
               ],
               type: 'ObjectTypeAnnotation',
-              nullable: false,
             },
           },
           properties: [
@@ -1532,7 +1380,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -1541,7 +1388,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'message',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                   {
@@ -1549,11 +1395,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
-                      nullable: false,
+
                       elementType: {
                         type: 'TypeAliasTypeAnnotation',
                         name: 'StackFrame',
-                        nullable: false,
                       },
                     },
                   },
@@ -1562,11 +1407,9 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'exceptionId',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
@@ -1575,7 +1418,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -1584,7 +1426,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'message',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                   {
@@ -1592,11 +1433,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
-                      nullable: false,
+
                       elementType: {
                         type: 'TypeAliasTypeAnnotation',
                         name: 'StackFrame',
-                        nullable: false,
                       },
                     },
                   },
@@ -1605,34 +1445,32 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'exceptionId',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
               name: 'reportException',
               optional: true,
               typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  nullable: false,
-                  type: 'VoidTypeAnnotation',
-                },
-                params: [
-                  {
-                    optional: false,
-                    name: 'data',
-                    typeAnnotation: {
-                      type: 'TypeAliasTypeAnnotation',
-                      name: 'ExceptionData',
-                      nullable: false,
-                    },
+                type: 'NullableTypeAnnotation',
+                typeAnnotation: {
+                  type: 'FunctionTypeAnnotation',
+                  returnTypeAnnotation: {
+                    type: 'VoidTypeAnnotation',
                   },
-                ],
-                nullable: true,
+                  params: [
+                    {
+                      optional: false,
+                      name: 'data',
+                      typeAnnotation: {
+                        type: 'TypeAliasTypeAnnotation',
+                        name: 'ExceptionData',
+                      },
+                    },
+                  ],
+                },
               },
             },
             {
@@ -1641,7 +1479,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
               typeAnnotation: {
                 type: 'FunctionTypeAnnotation',
                 returnTypeAnnotation: {
-                  nullable: false,
                   type: 'VoidTypeAnnotation',
                 },
                 params: [
@@ -1650,7 +1487,6 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'message',
                     typeAnnotation: {
                       type: 'StringTypeAnnotation',
-                      nullable: false,
                     },
                   },
                   {
@@ -1658,11 +1494,10 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     optional: false,
                     typeAnnotation: {
                       type: 'ArrayTypeAnnotation',
-                      nullable: false,
+
                       elementType: {
                         type: 'TypeAliasTypeAnnotation',
                         name: 'StackFrame',
-                        nullable: false,
                       },
                     },
                   },
@@ -1671,24 +1506,23 @@ const REAL_MODULE_EXAMPLE: SchemaType = {
                     name: 'exceptionId',
                     typeAnnotation: {
                       type: 'NumberTypeAnnotation',
-                      nullable: false,
                     },
                   },
                 ],
-                nullable: false,
               },
             },
             {
               name: 'dismissRedbox',
               optional: true,
               typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  nullable: false,
-                  type: 'VoidTypeAnnotation',
+                type: 'NullableTypeAnnotation',
+                typeAnnotation: {
+                  type: 'FunctionTypeAnnotation',
+                  returnTypeAnnotation: {
+                    type: 'VoidTypeAnnotation',
+                  },
+                  params: [],
                 },
-                params: [],
-                nullable: true,
               },
             },
           ],

From 1a90e1b47192887a6940a4a5eafc22a9ef067657 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 164/241] Make Cpp Generator handle NullableTypeAnnotation

Summary:
See title.
Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24027244

fbshipit-source-id: 4f967a7a72afd6aa7a886c16eeb683c52da2dc9c
---
 .../generators/modules/GenerateModuleCpp.js   | 23 +++++++++++++------
 .../src/generators/modules/Utils.js           |  3 +--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
index deb38646197c44..55abfbf6ded5a8 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
@@ -18,6 +18,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
+const {unwrapNullable} = require('../../parsers/flow/modules/utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -79,7 +80,8 @@ function traverseArg(
   function wrap(suffix) {
     return `args[${index}]${suffix}`;
   }
-  const {typeAnnotation} = arg;
+  const {typeAnnotation: nullableTypeAnnotation} = arg;
+  const [typeAnnotation] = unwrapNullable(nullableTypeAnnotation);
 
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -129,11 +131,12 @@ function traverseProperty(
   property: NativeModulePropertySchema,
   resolveAlias: AliasResolver,
 ): string {
+  const [propertyTypeAnnotation] = unwrapNullable(property.typeAnnotation);
   const propertyTemplate =
-    property.typeAnnotation.returnTypeAnnotation.type === 'VoidTypeAnnotation'
+    propertyTypeAnnotation.returnTypeAnnotation.type === 'VoidTypeAnnotation'
       ? voidPropertyTemplate
       : nonvoidPropertyTemplate;
-  const traversedArgs = property.typeAnnotation.params
+  const traversedArgs = propertyTypeAnnotation.params
     .map((p, i) => traverseArg(p, i, resolveAlias))
     .join(', ');
   return propertyTemplate
@@ -161,10 +164,16 @@ module.exports = {
           .replace(
             '::_PROPERTIES_MAP_::',
             properties
-              .map(({name: propertyName, typeAnnotation: {params}}) =>
-                proprertyDefTemplate
-                  .replace(/::_PROPERTY_NAME_::/g, propertyName)
-                  .replace(/::_ARGS_COUNT_::/g, params.length.toString()),
+              .map(
+                ({
+                  name: propertyName,
+                  typeAnnotation: nullableTypeAnnotation,
+                }) => {
+                  const [{params}] = unwrapNullable(nullableTypeAnnotation);
+                  return proprertyDefTemplate
+                    .replace(/::_PROPERTY_NAME_::/g, propertyName)
+                    .replace(/::_ARGS_COUNT_::/g, params.length.toString());
+                },
               )
               .join('\n'),
           )
diff --git a/packages/react-native-codegen/src/generators/modules/Utils.js b/packages/react-native-codegen/src/generators/modules/Utils.js
index 6985b861c7989e..4449e414cf1a73 100644
--- a/packages/react-native-codegen/src/generators/modules/Utils.js
+++ b/packages/react-native-codegen/src/generators/modules/Utils.js
@@ -13,7 +13,6 @@
 import type {
   SchemaType,
   NativeModuleAliasMap,
-  Required,
   NativeModuleObjectTypeAnnotation,
   NativeModuleSchema,
 } from '../../CodegenSchema';
@@ -22,7 +21,7 @@ const invariant = require('invariant');
 
 export type AliasResolver = (
   aliasName: string,
-) => Required<NativeModuleObjectTypeAnnotation>;
+) => NativeModuleObjectTypeAnnotation;
 
 function createAliasResolver(aliasMap: NativeModuleAliasMap): AliasResolver {
   return (aliasName: string) => {

From d9dc9d5d0a3b5f2a486ec251126aa2f9d1a5a1ab Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 165/241] Make H Generator handle NullableTypeAnnotation

Summary: Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24027247

fbshipit-source-id: cc326f5db919de1f6c6b56603f420c87272da918
---
 .../src/generators/modules/GenerateModuleH.js     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
index 420b6f6a33fa18..b49426b2e8e27e 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -10,10 +10,15 @@
 
 'use strict';
 
-import type {SchemaType, NativeModuleTypeAnnotation} from '../../CodegenSchema';
+import type {
+  Nullable,
+  SchemaType,
+  NativeModuleTypeAnnotation,
+} from '../../CodegenSchema';
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
+const {unwrapNullable} = require('../../parsers/flow/modules/utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -50,10 +55,11 @@ namespace react {
 `;
 
 function translatePrimitiveJSTypeToCpp(
-  typeAnnotation: NativeModuleTypeAnnotation,
+  nullableTypeAnnotation: Nullable<NativeModuleTypeAnnotation>,
   createErrorMessage: (typeName: string) => string,
   resolveAlias: AliasResolver,
 ) {
+  const [typeAnnotation] = unwrapNullable(nullableTypeAnnotation);
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
     realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
@@ -116,7 +122,8 @@ module.exports = {
 
         const traversedProperties = properties
           .map(prop => {
-            const traversedArgs = prop.typeAnnotation.params
+            const [propTypeAnnotation] = unwrapNullable(prop.typeAnnotation);
+            const traversedArgs = propTypeAnnotation.params
               .map(param => {
                 const translatedParam = translatePrimitiveJSTypeToCpp(
                   param.typeAnnotation,
@@ -137,7 +144,7 @@ module.exports = {
               .replace(
                 '::_RETURN_VALUE_::',
                 translatePrimitiveJSTypeToCpp(
-                  prop.typeAnnotation.returnTypeAnnotation,
+                  propTypeAnnotation.returnTypeAnnotation,
                   typeName =>
                     `Unsupported return type for ${prop.name}. Found: ${typeName}`,
                   resolveAlias,

From 0a2228ae3f751e32649173f649b020fa71f935ed Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 166/241] Make JavaSpec Generator handle NullableTypeAnnotation

Summary: Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24027248

fbshipit-source-id: 7ca0e04e8e2f19cffc9aea3d6db51f86703c06f7
---
 .../modules/GenerateModuleJavaSpec.js         | 29 ++++++++++++-------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
index 69958ca41d6950..8c10a90182b6f4 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
@@ -11,6 +11,7 @@
 'use strict';
 
 import type {
+  Nullable,
   SchemaType,
   NativeModulePropertySchema,
   NativeModuleMethodParamSchema,
@@ -19,6 +20,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
+const {unwrapNullable} = require('../../parsers/flow/modules/utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -53,8 +55,9 @@ function translateFunctionParamToJavaType(
   resolveAlias: AliasResolver,
   imports: Set<string>,
 ): string {
-  const {optional, typeAnnotation} = param;
-  const isRequired = !optional && !typeAnnotation.nullable;
+  const {optional, typeAnnotation: nullableTypeAnnotation} = param;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  const isRequired = !optional && !nullable;
 
   function wrapIntoNullableIfNeeded(generatedType: string) {
     if (!isRequired) {
@@ -114,12 +117,14 @@ function translateFunctionParamToJavaType(
 }
 
 function translateFunctionReturnTypeToJavaType(
-  returnTypeAnnotation: NativeModuleReturnTypeAnnotation,
+  nullableReturnTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
   createErrorMessage: (typeName: string) => string,
   resolveAlias: AliasResolver,
   imports: Set<string>,
 ): string {
-  const {nullable} = returnTypeAnnotation;
+  const [returnTypeAnnotation, nullable] = unwrapNullable(
+    nullableReturnTypeAnnotation,
+  );
 
   function wrapIntoNullableIfNeeded(generatedType: string) {
     if (nullable) {
@@ -179,14 +184,16 @@ function buildGetConstantsMethod(
   method: NativeModulePropertySchema,
   imports: Set<string>,
 ): string {
+  const [methodTypeAnnotation] = unwrapNullable(method.typeAnnotation);
   if (
-    method.typeAnnotation.returnTypeAnnotation.type === 'ObjectTypeAnnotation'
+    methodTypeAnnotation.returnTypeAnnotation.type === 'ObjectTypeAnnotation'
   ) {
     const requiredProps = [];
     const optionalProps = [];
     const rawProperties =
-      method.typeAnnotation.returnTypeAnnotation.properties || [];
+      methodTypeAnnotation.returnTypeAnnotation.properties || [];
     rawProperties.forEach(p => {
+      // TODO(T76712813): Should we push to optionalProps if the constant is nullable?
       if (p.optional) {
         optionalProps.push(p.name);
       } else {
@@ -281,23 +288,25 @@ module.exports = {
           return buildGetConstantsMethod(method, imports);
         }
 
+        const [methodTypeAnnotation] = unwrapNullable(method.typeAnnotation);
+
         // Handle return type
         const translatedReturnType = translateFunctionReturnTypeToJavaType(
-          method.typeAnnotation.returnTypeAnnotation,
+          methodTypeAnnotation.returnTypeAnnotation,
           typeName =>
             `Unsupported return type for method ${method.name}. Found: ${typeName}`,
           resolveAlias,
           imports,
         );
         const returningPromise =
-          method.typeAnnotation.returnTypeAnnotation.type ===
+          methodTypeAnnotation.returnTypeAnnotation.type ===
           'PromiseTypeAnnotation';
         const isSyncMethod =
-          method.typeAnnotation.returnTypeAnnotation.type !==
+          methodTypeAnnotation.returnTypeAnnotation.type !==
             'VoidTypeAnnotation' && !returningPromise;
 
         // Handle method args
-        const traversedArgs = method.typeAnnotation.params.map(param => {
+        const traversedArgs = methodTypeAnnotation.params.map(param => {
           const translatedParam = translateFunctionParamToJavaType(
             param,
             typeName =>

From 6d7e763e8512c33c0fa59e2e90ab5791c445550f Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 167/241] Make JniCpp Generator handle NullableTypeAnnotation

Summary: Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24027245

fbshipit-source-id: 73f9e7ec7ccb7627d2df63798a4269c860388dde
---
 .../modules/GenerateModuleJniCpp.js           | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
index 72b48a7fcdab72..ecaf21c571ce65 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js
@@ -11,6 +11,7 @@
 'use strict';
 
 import type {
+  Nullable,
   SchemaType,
   NativeModulePropertySchema,
   NativeModuleMethodParamSchema,
@@ -19,6 +20,7 @@ import type {
 
 import type {AliasResolver} from './Utils';
 const {createAliasResolver, getModules} = require('./Utils');
+const {unwrapNullable} = require('../../parsers/flow/modules/utils');
 
 type FilesOutput = Map<string, string>;
 
@@ -75,9 +77,10 @@ std::shared_ptr<TurboModule> ::_LIBRARY_NAME_::_ModuleProvider(const std::string
 `;
 
 function translateReturnTypeToKind(
-  typeAnnotation: NativeModuleReturnTypeAnnotation,
+  nullableTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
   resolveAlias: AliasResolver,
 ): string {
+  const [typeAnnotation] = unwrapNullable(nullableTypeAnnotation);
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
     realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
@@ -128,8 +131,9 @@ function translateParamTypeToJniType(
   param: NativeModuleMethodParamSchema,
   resolveAlias: AliasResolver,
 ): string {
-  const {optional, typeAnnotation} = param;
-  const isRequired = !optional && !typeAnnotation.nullable;
+  const {optional, typeAnnotation: nullableTypeAnnotation} = param;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  const isRequired = !optional && !nullable;
 
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -176,10 +180,10 @@ function translateParamTypeToJniType(
 }
 
 function translateReturnTypeToJniType(
-  typeAnnotation: NativeModuleReturnTypeAnnotation,
+  nullableTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
   resolveAlias: AliasResolver,
 ): string {
-  const {nullable} = typeAnnotation;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
 
   let realTypeAnnotation = typeAnnotation;
   if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
@@ -232,14 +236,13 @@ function translateMethodTypeToJniSignature(
   resolveAlias: AliasResolver,
 ): string {
   const {name, typeAnnotation} = property;
-  const {returnTypeAnnotation} = typeAnnotation;
+  let [{returnTypeAnnotation, params}] = unwrapNullable(typeAnnotation);
 
-  const params = [...typeAnnotation.params];
+  params = [...params];
   let processedReturnTypeAnnotation = returnTypeAnnotation;
   const isPromiseReturn = returnTypeAnnotation.type === 'PromiseTypeAnnotation';
   if (isPromiseReturn) {
     processedReturnTypeAnnotation = {
-      nullable: false,
       type: 'VoidTypeAnnotation',
     };
   }
@@ -269,12 +272,13 @@ function translateMethodForImplementation(
   property: NativeModulePropertySchema,
   resolveAlias: AliasResolver,
 ): string {
-  const {returnTypeAnnotation} = property.typeAnnotation;
+  const [propertyTypeAnnotation] = unwrapNullable(property.typeAnnotation);
+  const {returnTypeAnnotation} = propertyTypeAnnotation;
 
   const numberOfParams =
-    property.typeAnnotation.params.length +
+    propertyTypeAnnotation.params.length +
     (returnTypeAnnotation.type === 'PromiseTypeAnnotation' ? 1 : 0);
-  const translatedArguments = property.typeAnnotation.params
+  const translatedArguments = propertyTypeAnnotation.params
     .map(param => param.name)
     .concat(
       returnTypeAnnotation.type === 'PromiseTypeAnnotation' ? ['promise'] : [],
@@ -331,20 +335,20 @@ module.exports = {
           .replace(
             '::_PROPERTIES_MAP_::',
             properties
-              .map(
-                ({
-                  name: propertyName,
-                  typeAnnotation: {params, returnTypeAnnotation},
-                }) =>
-                  propertyName === 'getConstants' &&
+              .map(({name: propertyName, typeAnnotation}) => {
+                const [{returnTypeAnnotation, params}] = unwrapNullable(
+                  typeAnnotation,
+                );
+
+                return propertyName === 'getConstants' &&
                   returnTypeAnnotation.type === 'ObjectTypeAnnotation' &&
                   returnTypeAnnotation.properties &&
                   returnTypeAnnotation.properties.length === 0
-                    ? ''
-                    : propertyDefTemplate
-                        .replace(/::_PROPERTY_NAME_::/g, propertyName)
-                        .replace(/::_ARGS_COUNT_::/g, params.length.toString()),
-              )
+                  ? ''
+                  : propertyDefTemplate
+                      .replace(/::_PROPERTY_NAME_::/g, propertyName)
+                      .replace(/::_ARGS_COUNT_::/g, params.length.toString());
+              })
               .join('\n'),
           )
           .replace(/::_MODULE_NAME_::/g, name);

From 5122e33f4eb8507e1a4cd3325d8ba8197f0b93c8 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 168/241] Make ObjCPP Generator handle NullableTypeAnnotation

Summary:
See title.
Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24027243

fbshipit-source-id: 4e03a14fd23c1f5f3d282fc14a760d7549cdd6b9
---
 .../GenerateModuleObjCpp/StructCollector.js   | 58 ++++++++++-------
 .../header/serializeConstantsStruct.js        | 13 ++--
 .../header/serializeRegularStruct.js          | 13 ++--
 .../GenerateModuleObjCpp/serializeMethod.js   | 65 ++++++++++++-------
 4 files changed, 92 insertions(+), 57 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
index 71855f15f4f864..13c3c1031abff4 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/StructCollector.js
@@ -11,7 +11,7 @@
 'use strict';
 
 import type {
-  Required,
+  Nullable,
   NativeModuleObjectTypeAnnotation,
   NativeModuleStringTypeAnnotation,
   NativeModuleNumberTypeAnnotation,
@@ -29,6 +29,10 @@ import type {
 import type {AliasResolver} from '../Utils';
 
 const {capitalize} = require('./Utils');
+const {
+  unwrapNullable,
+  wrapNullable,
+} = require('../../../parsers/flow/modules/utils');
 
 type StructContext = 'CONSTANTS' | 'REGULAR';
 
@@ -49,7 +53,7 @@ export type Struct = RegularStruct | ConstantsStruct;
 export type StructProperty = $ReadOnly<{|
   name: string,
   optional: boolean,
-  typeAnnotation: StructTypeAnnotation,
+  typeAnnotation: Nullable<StructTypeAnnotation>,
 |}>;
 
 export type StructTypeAnnotation =
@@ -62,7 +66,7 @@ export type StructTypeAnnotation =
   | NativeModuleGenericObjectTypeAnnotation
   | NativeModuleReservedFunctionValueTypeAnnotation
   | NativeModuleTypeAliasTypeAnnotation
-  | NativeModuleArrayTypeAnnotation<StructTypeAnnotation>;
+  | NativeModuleArrayTypeAnnotation<Nullable<StructTypeAnnotation>>;
 
 class StructCollector {
   _structs: Map<string, Struct> = new Map();
@@ -71,46 +75,45 @@ class StructCollector {
     structName: string,
     structContext: StructContext,
     resolveAlias: AliasResolver,
-    typeAnnotation: NativeModuleBaseTypeAnnotation,
-  ): StructTypeAnnotation {
+    nullableTypeAnnotation: Nullable<NativeModuleBaseTypeAnnotation>,
+  ): Nullable<StructTypeAnnotation> {
+    const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
     switch (typeAnnotation.type) {
       case 'ObjectTypeAnnotation': {
-        this._insertStruct(structName, structContext, resolveAlias, {
-          ...typeAnnotation,
-          // The nullability status of this struct is recorded in the type-alias we create for it below.
-          nullable: false,
-        });
-        return {
+        this._insertStruct(
+          structName,
+          structContext,
+          resolveAlias,
+          typeAnnotation,
+        );
+        return wrapNullable(nullable, {
           type: 'TypeAliasTypeAnnotation',
           name: structName,
-          nullable: typeAnnotation.nullable,
-        };
+        });
       }
       case 'ArrayTypeAnnotation': {
         if (typeAnnotation.elementType == null) {
-          return {
+          return wrapNullable(nullable, {
             type: 'ArrayTypeAnnotation',
-            nullable: typeAnnotation.nullable,
-          };
+          });
         }
 
-        return {
+        return wrapNullable(nullable, {
           type: 'ArrayTypeAnnotation',
-          nullable: typeAnnotation.nullable,
           elementType: this.process(
             structName + 'Element',
             structContext,
             resolveAlias,
             typeAnnotation.elementType,
           ),
-        };
+        });
       }
       case 'TypeAliasTypeAnnotation': {
         this._insertAlias(typeAnnotation.name, structContext, resolveAlias);
-        return typeAnnotation;
+        return wrapNullable(nullable, typeAnnotation);
       }
       default: {
-        return typeAnnotation;
+        return wrapNullable(nullable, typeAnnotation);
       }
     }
   }
@@ -139,10 +142,15 @@ class StructCollector {
     structName: string,
     structContext: StructContext,
     resolveAlias: AliasResolver,
-    objectTypeAnnotation: Required<NativeModuleObjectTypeAnnotation>,
+    objectTypeAnnotation: NativeModuleObjectTypeAnnotation,
   ): void {
-    const properties = objectTypeAnnotation.properties.map(property => {
-      const {typeAnnotation: propertyTypeAnnotation} = property;
+    const properties = objectTypeAnnotation.properties.map<
+      $ReadOnly<{
+        name: string,
+        optional: boolean,
+        typeAnnotation: Nullable<StructTypeAnnotation>,
+      }>,
+    >(property => {
       const propertyStructName = structName + capitalize(property.name);
 
       return {
@@ -151,7 +159,7 @@ class StructCollector {
           propertyStructName,
           structContext,
           resolveAlias,
-          propertyTypeAnnotation,
+          property.typeAnnotation,
         ),
       };
     });
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
index 27a71f43a32cf1..1d3ddb9755f436 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
@@ -16,9 +16,12 @@ const {
   getNamespacedStructName,
 } = require('../Utils');
 
+import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, ConstantsStruct} from '../StructCollector';
 import type {StructSerilizationOutput} from './serializeStruct';
 
+const {unwrapNullable} = require('../../../../parsers/flow/modules/utils');
+
 const StructTemplate = ({
   moduleName,
   structName,
@@ -76,10 +79,11 @@ inline JS::Native${moduleName}::${structName}::Builder::Builder(${structName} i)
 
 function toObjCType(
   moduleName: string,
-  typeAnnotation: StructTypeAnnotation,
+  nullableTypeAnnotation: Nullable<StructTypeAnnotation>,
   isOptional: boolean = false,
 ): string {
-  const isRequired = !typeAnnotation.nullable && !isOptional;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  const isRequired = !nullable && !isOptional;
   const wrapFollyOptional = (type: string) => {
     return isRequired ? type : `folly::Optional<${type}>`;
   };
@@ -132,12 +136,13 @@ function toObjCType(
 
 function toObjCValue(
   moduleName: string,
-  typeAnnotation: StructTypeAnnotation,
+  nullableTypeAnnotation: Nullable<StructTypeAnnotation>,
   value: string,
   depth: number,
   isOptional: boolean = false,
 ): string {
-  const isRequired = !isOptional && !typeAnnotation.nullable;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  const isRequired = !nullable && !isOptional;
 
   function wrapPrimitive(type: string) {
     return !isRequired
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
index ce7b5f12d4f5bb..6815dd05c54204 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
@@ -16,9 +16,12 @@ const {
   getNamespacedStructName,
 } = require('../Utils');
 
+import type {Nullable} from '../../../../CodegenSchema';
 import type {StructTypeAnnotation, RegularStruct} from '../StructCollector';
 import type {StructSerilizationOutput} from './serializeStruct';
 
+const {unwrapNullable} = require('../../../../parsers/flow/modules/utils');
+
 const StructTemplate = ({
   moduleName,
   structName,
@@ -67,10 +70,11 @@ inline ${returnType}JS::Native${moduleName}::${structName}::${propertyName}() co
 
 function toObjCType(
   moduleName: string,
-  typeAnnotation: StructTypeAnnotation,
+  nullableTypeAnnotation: Nullable<StructTypeAnnotation>,
   isOptional: boolean = false,
 ): string {
-  const isRequired = !typeAnnotation.nullable && !isOptional;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  const isRequired = !nullable && !isOptional;
   const wrapFollyOptional = (type: string) => {
     return isRequired ? type : `folly::Optional<${type}>`;
   };
@@ -125,12 +129,13 @@ function toObjCType(
 
 function toObjCValue(
   moduleName: string,
-  typeAnnotation: StructTypeAnnotation,
+  nullableTypeAnnotation: Nullable<StructTypeAnnotation>,
   value: string,
   depth: number,
   isOptional: boolean = false,
 ): string {
-  const isRequired = !typeAnnotation.nullable && !isOptional;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  const isRequired = !nullable && !isOptional;
   const RCTBridgingTo = (type: string, arg?: string) => {
     const args = [value, arg].filter(Boolean).join(', ');
     return isRequired
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
index bec84f59d6de76..2825696ca44145 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/serializeMethod.js
@@ -14,6 +14,7 @@ import type {
   NativeModuleMethodParamSchema,
   NativeModuleReturnTypeAnnotation,
   NativeModulePropertySchema,
+  Nullable,
 } from '../../../CodegenSchema';
 
 import type {AliasResolver} from '../Utils';
@@ -21,6 +22,10 @@ import type {AliasResolver} from '../Utils';
 const invariant = require('invariant');
 const {StructCollector} = require('./StructCollector');
 const {capitalize, getNamespacedStructName} = require('./Utils');
+const {
+  wrapNullable,
+  unwrapNullable,
+} = require('../../../parsers/flow/modules/utils');
 
 const ProtocolMethodTemplate = ({
   returnObjCType,
@@ -60,10 +65,9 @@ function serializeMethod(
   structCollector: StructCollector,
   resolveAlias: AliasResolver,
 ): $ReadOnlyArray<MethodSerializationOutput> {
-  const {
-    name: methodName,
-    typeAnnotation: {params, returnTypeAnnotation},
-  } = property;
+  const {name: methodName, typeAnnotation: nullableTypeAnnotation} = property;
+  const [propertyTypeAnnotation] = unwrapNullable(nullableTypeAnnotation);
+  const {params} = propertyTypeAnnotation;
 
   if (methodName === 'getConstants') {
     return serializeConstantsProtocolMethods(
@@ -95,6 +99,12 @@ function serializeMethod(
     }
   });
 
+  // Unwrap returnTypeAnnotation, so we check if the return type is Promise
+  // TODO(T76719514): Disallow nullable PromiseTypeAnnotations
+  const [returnTypeAnnotation] = unwrapNullable(
+    propertyTypeAnnotation.returnTypeAnnotation,
+  );
+
   if (returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
     methodParams.push(
       {paramName: 'resolve', objCType: 'RCTPromiseResolveBlock'},
@@ -105,7 +115,10 @@ function serializeMethod(
   /**
    * Build Protocol Method
    **/
-  const returnObjCType = getReturnObjCType(methodName, returnTypeAnnotation);
+  const returnObjCType = getReturnObjCType(
+    methodName,
+    propertyTypeAnnotation.returnTypeAnnotation,
+  );
   const paddingMax = `- (${returnObjCType})${methodName}`.length;
 
   const objCParams = methodParams.reduce(
@@ -155,8 +168,9 @@ function getParamStructName(
   methodName: string,
   param: NativeModuleMethodParamSchema,
 ): string {
-  if (param.typeAnnotation.type === 'TypeAliasTypeAnnotation') {
-    return param.typeAnnotation.name;
+  const [typeAnnotation] = unwrapNullable(param.typeAnnotation);
+  if (typeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    return typeAnnotation.name;
   }
 
   return `Spec${capitalize(methodName)}${capitalize(param.name)}`;
@@ -170,13 +184,12 @@ function getParamObjCType(
   structCollector: StructCollector,
   resolveAlias: AliasResolver,
 ): $ReadOnly<{|objCType: string, isStruct: boolean|}> {
-  const {name: paramName, typeAnnotation} = param;
-  const notRequired = param.optional || typeAnnotation.nullable;
+  const {name: paramName, typeAnnotation: nullableTypeAnnotation} = param;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  const notRequired = param.optional || nullable;
 
   function wrapIntoNullableIfNeeded(generatedType: string) {
-    return typeAnnotation.nullable
-      ? `${generatedType} _Nullable`
-      : generatedType;
+    return nullable ? `${generatedType} _Nullable` : generatedType;
   }
 
   const isStruct = (objCType: string) => ({
@@ -209,11 +222,13 @@ function getParamObjCType(
     }
   }
 
-  const structTypeAnnotation = structCollector.process(
-    structName,
-    'REGULAR',
-    resolveAlias,
-    typeAnnotation,
+  const [structTypeAnnotation] = unwrapNullable(
+    structCollector.process(
+      structName,
+      'REGULAR',
+      resolveAlias,
+      wrapNullable(nullable, typeAnnotation),
+    ),
   );
 
   invariant(
@@ -264,12 +279,12 @@ function getParamObjCType(
 
 function getReturnObjCType(
   methodName: string,
-  typeAnnotation: NativeModuleReturnTypeAnnotation,
+  nullableTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
 ) {
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+
   function wrapIntoNullableIfNeeded(generatedType: string) {
-    return typeAnnotation.nullable
-      ? `${generatedType} _Nullable`
-      : generatedType;
+    return nullable ? `${generatedType} _Nullable` : generatedType;
   }
 
   switch (typeAnnotation.type) {
@@ -328,8 +343,9 @@ function getReturnObjCType(
 
 function getReturnJSType(
   methodName: string,
-  typeAnnotation: NativeModuleReturnTypeAnnotation,
+  nullableTypeAnnotation: Nullable<NativeModuleReturnTypeAnnotation>,
 ): ReturnJSType {
+  const [typeAnnotation] = unwrapNullable(nullableTypeAnnotation);
   switch (typeAnnotation.type) {
     case 'VoidTypeAnnotation':
       return 'VoidKind';
@@ -371,13 +387,14 @@ function serializeConstantsProtocolMethods(
   structCollector: StructCollector,
   resolveAlias: AliasResolver,
 ): $ReadOnlyArray<MethodSerializationOutput> {
-  if (property.typeAnnotation.params.length !== 0) {
+  const [propertyTypeAnnotation] = unwrapNullable(property.typeAnnotation);
+  if (propertyTypeAnnotation.params.length !== 0) {
     throw new Error(
       `${moduleName}.getConstants() may only accept 0 arguments.`,
     );
   }
 
-  const {returnTypeAnnotation} = property.typeAnnotation;
+  const {returnTypeAnnotation} = propertyTypeAnnotation;
   if (returnTypeAnnotation.type !== 'ObjectTypeAnnotation') {
     throw new Error(
       `${moduleName}.getConstants() may only return an object literal: {|...|}.`,

From 3b6b039e8540922a82aa09be9b4c04e244dd4486 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Thu, 1 Oct 2020 19:26:14 -0700
Subject: [PATCH 169/241] Make JavaPoet JavaSpec Generator handle
 NullableTypeAnnotation

Summary: Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24030728

fbshipit-source-id: b79f7dfa7304bfddc6333c641eadcaa55c0cb7a0
---
 .../codegen/generator/SchemaJsonParser.java   | 60 ++++++++-----------
 1 file changed, 25 insertions(+), 35 deletions(-)

diff --git a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
index 0b44b62826df84..68c7d839f0a49a 100644
--- a/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
+++ b/packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/src/main/java/com/facebook/react/codegen/generator/SchemaJsonParser.java
@@ -93,14 +93,18 @@ private TypeData buildTypeData(final File schemaFile)
   }
 
   // Parse type information from a JSON "typeAnnotation" node.
-  private Type parseTypeAnnotation(final TypeId typeId, final JsonObject typeAnnotation) {
-    final String type = typeAnnotation.get("type").getAsString();
-    // TODO (T71824250): Support NullableTypeAnnotation in the schema instead of a field here.
-    final boolean nullable =
-        typeAnnotation.has("nullable") ? typeAnnotation.get("nullable").getAsBoolean() : false;
-
+  private Type parseTypeAnnotation(final TypeId typeId, final JsonObject originalTypeAnnotation) {
+    JsonObject typeAnnotation = originalTypeAnnotation;
+    String type = typeAnnotation.get("type").getAsString();
+    boolean nullable = false;
     Type parsedType = null;
 
+    if (type.equals(NullableType.TYPE_NAME)) {
+      nullable = true;
+      typeAnnotation = typeAnnotation.get("typeAnnotation").getAsJsonObject();
+      type = typeAnnotation.get("type").getAsString();
+    }
+
     switch (type) {
       case AliasType.TYPE_NAME:
         parsedType = parseAliasTypeAnnotation(typeId, typeAnnotation);
@@ -178,10 +182,9 @@ private NativeModuleType parseNativeModule(final TypeId typeId, final JsonObject
     properties.forEach(
         p -> {
           final JsonObject node = p.getAsJsonObject();
-          final String name = node.has("name") ? node.get("name").getAsString() : null;
+          final String name = node.get("name").getAsString();
           final JsonObject typeAnnotation = node.getAsJsonObject("typeAnnotation");
-          // TODO (T71845349): "optional" field shouldn't be part of the Function's typeAnnotation.
-          final boolean optional = typeAnnotation.get("optional").getAsBoolean();
+          final boolean optional = node.get("optional").getAsBoolean();
           final TypeId propertyTypeId =
               TypeId.expandOf(typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name));
           collectedPropertiesBuilder.add(
@@ -214,28 +217,21 @@ private Type parseFunctionTypeAnnotation(final TypeId typeId, final JsonObject t
 
     ImmutableList.Builder<FunctionType.ArgumentType> paramsList = new ImmutableList.Builder<>();
 
-    // TODO (T71846321): Some functions are missing params specification.
-    if (params != null) {
-      for (int i = 0; i < params.size(); i++) {
-        final JsonElement p = params.get(i);
-        final JsonObject node = p.getAsJsonObject();
-        final String name = node.has("name") ? node.get("name").getAsString() : ("Arg" + i);
-        paramsList.add(
-            FunctionType.createArgument(
-                name,
-                parseTypeAnnotation(
-                    TypeId.expandOf(
-                        typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name)),
-                    node.getAsJsonObject("typeAnnotation"))));
-      }
+    for (int i = 0; i < params.size(); i++) {
+      final JsonElement p = params.get(i);
+      final JsonObject node = p.getAsJsonObject();
+      final String name = node.get("name").getAsString();
+      paramsList.add(
+          FunctionType.createArgument(
+              name,
+              parseTypeAnnotation(
+                  TypeId.expandOf(typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name)),
+                  node.getAsJsonObject("typeAnnotation"))));
     }
 
-    // TODO (T71846321): Some functions are missing a return type.
     final JsonObject returnTypeAnnotation = typeAnnotation.getAsJsonObject("returnTypeAnnotation");
     final Type returnType =
-        returnTypeAnnotation != null
-            ? parseTypeAnnotation(TypeId.expandOf(typeId, "ReturnType"), returnTypeAnnotation)
-            : VoidType.VOID;
+        parseTypeAnnotation(TypeId.expandOf(typeId, "ReturnType"), returnTypeAnnotation);
 
     return new FunctionType(typeId, paramsList.build(), returnType);
   }
@@ -247,18 +243,12 @@ private Type parseObjectTypeAnnotation(final TypeId typeId, final JsonObject typ
     properties.forEach(
         p -> {
           final JsonObject node = p.getAsJsonObject();
-          final String name = node.has("name") ? node.get("name").getAsString() : null;
+          final String name = node.get("name").getAsString();
           final boolean optional = node.get("optional").getAsBoolean();
           final JsonObject propertyTypeAnnotation = node.getAsJsonObject("typeAnnotation");
           final TypeId propertyTypeId =
               TypeId.expandOf(typeId, CaseFormat.LOWER_CAMEL.to(CaseFormat.UPPER_CAMEL, name));
-
-          // TODO (T67898313): Some object properties are missing typeAnnotation.
-          final Type propertyType =
-              propertyTypeAnnotation != null
-                  ? parseTypeAnnotation(propertyTypeId, propertyTypeAnnotation)
-                  : new AnyType(propertyTypeId);
-
+          final Type propertyType = parseTypeAnnotation(propertyTypeId, propertyTypeAnnotation);
           propertiesList.add(new ObjectType.Property(name, propertyType, optional));
         });
 

From a78a7166b818e8d6c06f2b831b7a3fb9017b4b59 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Thu, 1 Oct 2020 20:12:01 -0700
Subject: [PATCH 170/241] Throw soft-error and continue when removing view from
 parent with incorrect index

Summary:
iOS Fabric actually ignores the `index` property and just uses parent and child tags to remove the child from a parent. This brings Android slightly closer to iOS: we try to use the index, but if the index is incorrect, we either (1) throw if the child isn't contained in the parent, or (2) find the correct index, and continue.

In debug, this will still crash, so we'll get more signal about why this happens.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24056375

fbshipit-source-id: 07507cc32ad02505d3271fc95ecb45d080109078
---
 .../fabric/mounting/MountingManager.java      | 45 +++++++++++++------
 1 file changed, 32 insertions(+), 13 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
index 632f57af48fa38..475b92bce273d2 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/fabric/mounting/MountingManager.java
@@ -351,7 +351,7 @@ public void sendAccessibilityEvent(int reactTag, int eventType) {
   }
 
   @UiThread
-  public void removeViewAt(final int tag, final int parentTag, final int index) {
+  public void removeViewAt(final int tag, final int parentTag, int index) {
     UiThreadUtil.assertOnUiThread();
     ViewState viewState = getNullableViewState(parentTag);
 
@@ -411,18 +411,30 @@ public void removeViewAt(final int tag, final int parentTag, final int index) {
         return;
       }
 
+      // Here we are guaranteed that the view is still in the View hierarchy, just
+      // at a different index. In debug mode we'll crash here; in production, we'll remove
+      // the child from the parent and move on.
+      // This is an issue that is safely recoverable 95% of the time. If this allows corruption
+      // of the view hierarchy and causes bugs or a crash after this point, there will be logs
+      // indicating that this happened.
+      // This is likely *only* necessary because of Fabric's LayoutAnimations implementation.
+      // If we can fix the bug there, or remove the need for LayoutAnimation index adjustment
+      // entirely, we can just throw this exception without regression user experience.
       logViewHierarchy(parentView, true);
-      throw new IllegalStateException(
-          "Tried to remove view ["
-              + tag
-              + "] of parent ["
-              + parentTag
-              + "] at index "
-              + index
-              + ", but got view tag "
-              + actualTag
-              + " - actual index of view: "
-              + tagActualIndex);
+      ReactSoftException.logSoftException(
+          TAG,
+          new IllegalStateException(
+              "Tried to remove view ["
+                  + tag
+                  + "] of parent ["
+                  + parentTag
+                  + "] at index "
+                  + index
+                  + ", but got view tag "
+                  + actualTag
+                  + " - actual index of view: "
+                  + tagActualIndex));
+      index = tagActualIndex;
     }
 
     try {
@@ -460,13 +472,20 @@ public void removeViewAt(final int tag, final int parentTag, final int index) {
 
     // Display children after deleting any
     if (SHOW_CHANGED_VIEW_HIERARCHIES) {
+      final int finalIndex = index;
       UiThreadUtil.runOnUiThread(
           new Runnable() {
             @Override
             public void run() {
               FLog.e(
                   TAG,
-                  "removeViewAt: [" + tag + "] -> [" + parentTag + "] idx: " + index + " AFTER");
+                  "removeViewAt: ["
+                      + tag
+                      + "] -> ["
+                      + parentTag
+                      + "] idx: "
+                      + finalIndex
+                      + " AFTER");
               logViewHierarchy(parentView, false);
             }
           });

From ebf2fb7868d92661772ec59d6592f14786e9673b Mon Sep 17 00:00:00 2001
From: Lorenzo Sciandra <notkelset@kelset.dev>
Date: Thu, 1 Oct 2020 21:32:52 -0700
Subject: [PATCH 171/241] Chore: Upgrade RN CLI to 4.13 (#30085)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Small PR to bump the CLI version to latest available pre-cut of branch 0.64, as per usual cc thymikee

*(ignore name of the branch, i typoed the version �‍{emoji:2642})*

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Changed] - Bump CLI in the repo to 4.13, latest available

Pull Request resolved: https://github.com/facebook/react-native/pull/30085

Test Plan: Nothing in particular to test, it's just a chore.

Reviewed By: JoshuaGross, kacieb

Differential Revision: D24068562

Pulled By: cpojer

fbshipit-source-id: 0df662775248aa0e95c77fdd246fadabce10f670
---
 package.json |  6 ++--
 yarn.lock    | 94 +++++++++++++++++++++++++++++++++-------------------
 2 files changed, 62 insertions(+), 38 deletions(-)

diff --git a/package.json b/package.json
index 9dad79fee24983..4bdaad594b992b 100644
--- a/package.json
+++ b/package.json
@@ -83,9 +83,9 @@
     "react": "16.13.1"
   },
   "dependencies": {
-    "@react-native-community/cli": "^4.10.0",
-    "@react-native-community/cli-platform-android": "^4.10.0",
-    "@react-native-community/cli-platform-ios": "^4.10.0",
+    "@react-native-community/cli": "^4.13.0",
+    "@react-native-community/cli-platform-android": "^4.13.0",
+    "@react-native-community/cli-platform-ios": "^4.13.0",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "1.0.0",
     "@react-native/polyfills": "1.0.0",
diff --git a/yarn.lock b/yarn.lock
index 08bfcfa0829276..74a476a1ad8591 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1009,12 +1009,23 @@
   dependencies:
     serve-static "^1.13.1"
 
-"@react-native-community/cli-platform-android@^4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.10.0.tgz#c1e8eb4395fc51335e39fc8c09ca96517446a88d"
-  integrity sha512-/nfCQDbrS0F2u6nwo+4qgx+Fjcv/Rqrn4JbQWdGWEXULfCN+g2Zx9O7sSDNjV7AxOwd+sBOnU945wHkSQdASFA==
+"@react-native-community/cli-hermes@^4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-hermes/-/cli-hermes-4.13.0.tgz#6243ed9c709dad5e523f1ccd7d21066b32f2899d"
+  integrity sha512-oG+w0Uby6rSGsUkJGLvMQctZ5eVRLLfhf84lLyz942OEDxFRa9U19YJxOe9FmgCKtotbYiM3P/XhK+SVCuerPQ==
   dependencies:
-    "@react-native-community/cli-tools" "^4.9.0"
+    "@react-native-community/cli-platform-android" "^4.13.0"
+    "@react-native-community/cli-tools" "^4.13.0"
+    chalk "^3.0.0"
+    hermes-profile-transformer "^0.0.6"
+    ip "^1.1.5"
+
+"@react-native-community/cli-platform-android@^4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-android/-/cli-platform-android-4.13.0.tgz#922681ec82ee1aadd993598b814df1152118be02"
+  integrity sha512-3i8sX8GklEytUZwPnojuoFbCjIRzMugCdzDIdZ9UNmi/OhD4/8mLGO0dgXfT4sMWjZwu3qjy45sFfk2zOAgHbA==
+  dependencies:
+    "@react-native-community/cli-tools" "^4.13.0"
     chalk "^3.0.0"
     execa "^1.0.0"
     fs-extra "^8.1.0"
@@ -1025,12 +1036,12 @@
     slash "^3.0.0"
     xmldoc "^1.1.2"
 
-"@react-native-community/cli-platform-ios@^4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.10.0.tgz#ef9b3adc5946bd43bbc839d0c8f26c1964fad117"
-  integrity sha512-3xiaqnmg0hqyMwCfhoGXkJ9GGIxVSwLpntSUo1YiZIn+PLC385ljSer4YfFvWc6N3jd9ElRa31WKtCD9kMAvkg==
+"@react-native-community/cli-platform-ios@^4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-platform-ios/-/cli-platform-ios-4.13.0.tgz#a738915c68cac86df54e578b59a1311ea62b1aef"
+  integrity sha512-6THlTu8zp62efkzimfGr3VIuQJ2514o+vScZERJCV1xgEi8XtV7mb/ZKt9o6Y9WGxKKkc0E0b/aVAtgy+L27CA==
   dependencies:
-    "@react-native-community/cli-tools" "^4.9.0"
+    "@react-native-community/cli-tools" "^4.13.0"
     chalk "^3.0.0"
     glob "^7.1.3"
     js-yaml "^3.13.1"
@@ -1038,13 +1049,13 @@
     plist "^3.0.1"
     xcode "^2.0.0"
 
-"@react-native-community/cli-server-api@^4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.9.0.tgz#503f50331c6e2cc8c5fcf6b693170e3a3a669d1a"
-  integrity sha512-lKBIXJjFLyu4+6Vhhj/QzD41aQGkVi8xWLqTYCgi26d61kjLuuZs0Xer02DPJK3+YADKExVdWrJzVHfJ7zYlTA==
+"@react-native-community/cli-server-api@^4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-server-api/-/cli-server-api-4.13.0.tgz#ef0e53fe0edc7356d62bca725ca47cb368f748a5"
+  integrity sha512-ER138ChLc1YYX7j9yE6fDm4DdNdsHThr+pla/B6iZoKje1r7TwymDdKaUvOsYalG7sWG9glW3bofcCq+Yh0Dvw==
   dependencies:
     "@react-native-community/cli-debugger-ui" "^4.9.0"
-    "@react-native-community/cli-tools" "^4.9.0"
+    "@react-native-community/cli-tools" "^4.13.0"
     compression "^1.7.1"
     connect "^3.6.5"
     errorhandler "^1.5.0"
@@ -1052,10 +1063,10 @@
     serve-static "^1.13.1"
     ws "^1.1.0"
 
-"@react-native-community/cli-tools@^4.9.0":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.9.0.tgz#d8fd0326cc2fcaeb8c920baf24b68b63c8164fa2"
-  integrity sha512-vCeYkJ3n/EIaW3lAfznzojMffGxYhCUzwZzwBuC3+O+gYxkymdpletqNYLLEa04DzJr174mxgbgBw8g5IP91yA==
+"@react-native-community/cli-tools@^4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-tools/-/cli-tools-4.13.0.tgz#b406463d33af16cedc4305a9a9257ed32845cf1b"
+  integrity sha512-s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg==
   dependencies:
     chalk "^3.0.0"
     lodash "^4.17.15"
@@ -1064,27 +1075,28 @@
     open "^6.2.0"
     shell-quote "1.6.1"
 
-"@react-native-community/cli-types@^4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-4.10.0.tgz#aea4276c035fffaeb7deae029ad8a89054fbabfc"
-  integrity sha512-gU0Opspa/WYLQdmY0BKe0VLwD+SuNatypRvBP6nlyzS8/qmSaZ73047jHWYQavhfqn/WxHzBLQSwZK0a7ROfeg==
+"@react-native-community/cli-types@^4.10.1":
+  version "4.10.1"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli-types/-/cli-types-4.10.1.tgz#d68a2dcd1649d3b3774823c64e5e9ce55bfbe1c9"
+  integrity sha512-ael2f1onoPF3vF7YqHGWy7NnafzGu+yp88BbFbP0ydoCP2xGSUzmZVw0zakPTC040Id+JQ9WeFczujMkDy6jYQ==
 
-"@react-native-community/cli@^4.10.0":
-  version "4.10.0"
-  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.10.0.tgz#13f4fa98b66ea756e6480864c71304b49a9bca44"
-  integrity sha512-rg6pIMmSodqFTJ5GbdTPjIoumCE8Vm6H0DA5LzXprnGozOxJ0hRRDJqX37tR9sH50ABOQpSWs/+etJhgF2Tlxw==
+"@react-native-community/cli@^4.13.0":
+  version "4.13.0"
+  resolved "https://registry.yarnpkg.com/@react-native-community/cli/-/cli-4.13.0.tgz#04d5032f9b2b423c61ceef6be83b1bcc8a37db75"
+  integrity sha512-R+1VehIQ6VTLf+e7YOwzJk0F9tstfeSC4xy7oT6GSgB3FnXbTJGHFUp4siyO68Ae/gzGqt8SiUO145teWkP+ZA==
   dependencies:
     "@hapi/joi" "^15.0.3"
     "@react-native-community/cli-debugger-ui" "^4.9.0"
-    "@react-native-community/cli-server-api" "^4.9.0"
-    "@react-native-community/cli-tools" "^4.9.0"
-    "@react-native-community/cli-types" "^4.10.0"
+    "@react-native-community/cli-hermes" "^4.13.0"
+    "@react-native-community/cli-server-api" "^4.13.0"
+    "@react-native-community/cli-tools" "^4.13.0"
+    "@react-native-community/cli-types" "^4.10.1"
     chalk "^3.0.0"
     command-exists "^1.2.8"
     commander "^2.19.0"
     cosmiconfig "^5.1.0"
     deepmerge "^3.2.0"
-    envinfo "^7.1.0"
+    envinfo "^7.7.2"
     execa "^1.0.0"
     find-up "^4.1.0"
     fs-extra "^8.1.0"
@@ -2509,10 +2521,10 @@ end-of-stream@^1.1.0:
   dependencies:
     once "^1.4.0"
 
-envinfo@^7.1.0:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.3.1.tgz#892e42f7bf858b3446d9414ad240dbaf8da52f09"
-  integrity sha512-GvXiDTqLYrORVSCuJCsWHPXF5BFvoWMQA9xX4YVjPT1jyS3aZEHUBwjzxU/6LTPF9ReHgVEbX7IEN5UvSXHw/A==
+envinfo@^7.7.2:
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.3.tgz#4b2d8622e3e7366afb8091b23ed95569ea0208cc"
+  integrity sha512-46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA==
 
 error-ex@^1.3.1:
   version "1.3.2"
@@ -3410,6 +3422,13 @@ hermes-engine@~0.7.0:
   resolved "https://registry.yarnpkg.com/hermes-engine/-/hermes-engine-0.7.0.tgz#c4a13e09811d7bc975a0662bd2ca7120003d6ef8"
   integrity sha512-lU9OenFWXXOzYldqn15QvbiD0kDc+uw2arhCOkR+9D+PhrLFcbEqnaXFESgchN77JYEf77KkqXncTZA8aoXw2A==
 
+hermes-profile-transformer@^0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/hermes-profile-transformer/-/hermes-profile-transformer-0.0.6.tgz#bd0f5ecceda80dd0ddaae443469ab26fb38fc27b"
+  integrity sha512-cnN7bQUm65UWOy6cbGcCcZ3rpwW8Q/j4OP5aWRhEry4Z2t2aR1cjrbp0BS+KiBN0smvP1caBgAuxutvyvJILzQ==
+  dependencies:
+    source-map "^0.7.3"
+
 hosted-git-info@^2.1.4:
   version "2.8.8"
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.8.tgz#7539bd4bc1e0e0a895815a2e0262420b12858488"
@@ -3588,6 +3607,11 @@ ip-regex@^2.1.0:
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
   integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
+ip@^1.1.5:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
+  integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
+
 is-accessor-descriptor@^0.1.6:
   version "0.1.6"
   resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"

From 54fd41c9f6a75b2c035ac74404a53f558c6ce838 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Fri, 2 Oct 2020 05:34:57 -0700
Subject: [PATCH 172/241] Animate Switch value changes

Summary:
Changelog: [internal]

Changing value of Switch should animate except for first rendering of the switch.

Reviewed By: JoshuaGross

Differential Revision: D24046268

fbshipit-source-id: d0b2a1a4837fc8daebce2f0e6d3d82212b490ba4
---
 .../Switch/RCTSwitchComponentView.mm          | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
index 5c89f7cbc0bab0..e680a25ba2827f 100644
--- a/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Switch/RCTSwitchComponentView.mm
@@ -23,36 +23,31 @@ @interface RCTSwitchComponentView () <RCTSwitchViewProtocol>
 
 @implementation RCTSwitchComponentView {
   UISwitch *_switchView;
+  BOOL _isInitialValueSet;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
+    static const auto defaultProps = std::make_shared<const SwitchProps>();
+    _props = defaultProps;
+
     _switchView = [[UISwitch alloc] initWithFrame:self.bounds];
 
     [_switchView addTarget:self action:@selector(onChange:) forControlEvents:UIControlEventValueChanged];
 
     self.contentView = _switchView;
-
-    [self setPropsToDefault];
   }
 
   return self;
 }
 
-- (void)setPropsToDefault
-{
-  static const auto defaultProps = std::make_shared<const SwitchProps>();
-  _props = defaultProps;
-  _switchView.on = defaultProps->value;
-}
-
 #pragma mark - RCTComponentViewProtocol
 
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
-  [self setPropsToDefault];
+  _isInitialValueSet = NO;
 }
 
 + (ComponentDescriptorProvider)componentDescriptorProvider
@@ -67,7 +62,9 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
   // `value`
   if (oldSwitchProps.value != newSwitchProps.value) {
-    _switchView.on = newSwitchProps.value;
+    BOOL shouldAnimate = _isInitialValueSet == YES;
+    [_switchView setOn:newSwitchProps.value animated:shouldAnimate];
+    _isInitialValueSet = YES;
   }
 
   // `disabled`

From c4629f7cceba348fdd8803a9cdef4fc447f9ff0b Mon Sep 17 00:00:00 2001
From: Dmytro Voronkevych <zloy@fb.com>
Date: Fri, 2 Oct 2020 08:06:17 -0700
Subject: [PATCH 173/241] UserFlow API for ReactNative

Summary: Creating UserFlow API to track reliability of user interactions

Reviewed By: swillard13

Differential Revision: D23937121

fbshipit-source-id: 83701b8216c9b18c9c3d8c332efa84942ac26ba6
---
 Libraries/Reliability/UserFlow.js | 137 ++++++++++++++++++++++++++++++
 1 file changed, 137 insertions(+)
 create mode 100644 Libraries/Reliability/UserFlow.js

diff --git a/Libraries/Reliability/UserFlow.js b/Libraries/Reliability/UserFlow.js
new file mode 100644
index 00000000000000..b795e6ad8be5b9
--- /dev/null
+++ b/Libraries/Reliability/UserFlow.js
@@ -0,0 +1,137 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @format
+ * @flow strict
+ */
+
+'use strict';
+
+const AUTO_INSTANCE_KEY = -1;
+
+type FlowId = {
+  markerId: number,
+  instanceKey: number,
+};
+
+/**
+ * API for tracking reliability of your user interactions
+ *
+ * Example:
+ * var flowId = UserFlow.newFlowId(QuickLogItentifiersExample.EXAMPLE_EVENT);
+ * UserFlow.start(flowId, "user_click");
+ * ...
+ * UserFlow.completeWithSuccess(flowId);
+ */
+const UserFlow = {
+  /**
+   * Creates FlowId from markerId and instanceKey.
+   * You will pass FlowId in every other method of UserFlow API.
+   *
+   * By default, instanceKey will generate unique instance every time you call userFlowGetId with markerId only.
+   */
+  newFlowId(markerId: number, instanceKey: number = AUTO_INSTANCE_KEY): FlowId {
+    var resolvedInstanceKey = instanceKey;
+    if (instanceKey === AUTO_INSTANCE_KEY) {
+      if (global.nativeUserFlowNextInstanceKey) {
+        resolvedInstanceKey = global.nativeUserFlowNextInstanceKey();
+      } else {
+        // There is no JSI methods installed, API won't do anything
+        resolvedInstanceKey = 0;
+      }
+    }
+    return {
+      markerId: markerId,
+      instanceKey: resolvedInstanceKey,
+    };
+  },
+
+  start(flowId: FlowId, triggerSource: string): void {
+    if (global.nativeUserFlowStart) {
+      global.nativeUserFlowStart(
+        flowId.markerId,
+        flowId.instanceKey,
+        triggerSource,
+      );
+    }
+  },
+
+  annotate(
+    flowId: FlowId,
+    annotationName: string,
+    annotationValue: string,
+  ): void {
+    if (global.nativeUserFlowAnnotate) {
+      global.nativeUserFlowAnnotate(
+        flowId.markerId,
+        flowId.instanceKey,
+        annotationName,
+        annotationValue,
+      );
+    }
+  },
+
+  markPoint(flowId: FlowId, pointName: string): void {
+    if (global.nativeUserFlowMarkPoint) {
+      global.nativeUserFlowMarkPoint(
+        flowId.markerId,
+        flowId.instanceKey,
+        pointName,
+      );
+    }
+  },
+
+  completeWithSuccess(flowId: FlowId): void {
+    if (global.nativeUserFlowCompleteWithSuccess) {
+      global.nativeUserFlowCompleteWithSuccess(
+        flowId.markerId,
+        flowId.instanceKey,
+      );
+    }
+  },
+
+  completeWithUnexpectedFail(
+    flowId: FlowId,
+    reason: string,
+    failureLocation: string,
+  ): void {
+    if (global.nativeUserFlowCompleteWithUnexpectedFail) {
+      global.nativeUserFlowCompleteWithUnexpectedFail(
+        flowId.markerId,
+        flowId.instanceKey,
+        reason,
+        failureLocation,
+      );
+    }
+  },
+
+  completeWithExpectedFail(
+    flowId: FlowId,
+    reason: string,
+    failureLocation: string,
+  ): void {
+    if (global.nativeUserFlowCompleteWithExpectedFail) {
+      global.nativeUserFlowCompleteWithExpectedFail(
+        flowId.markerId,
+        flowId.instanceKey,
+        reason,
+        failureLocation,
+      );
+    }
+  },
+
+  cancel(flowId: FlowId, cancelReason: string): void {
+    if (global.nativeUserFlowCancel) {
+      global.nativeUserFlowCancel(
+        flowId.markerId,
+        flowId.instanceKey,
+        cancelReason,
+      );
+    }
+  },
+};
+
+module.exports = UserFlow;

From 2c6d010a5018dccb96b11a5f7f8e80db00d15a1c Mon Sep 17 00:00:00 2001
From: Dmytro Voronkevych <zloy@fb.com>
Date: Fri, 2 Oct 2020 08:06:17 -0700
Subject: [PATCH 174/241] Adding UserFlow.compleWithFail to RN

Summary: Adding method UserFlow.completeWithFail.

Reviewed By: swillard13

Differential Revision: D24052851

fbshipit-source-id: 1baa30a2d7dfb9ef4e457a74b66fd24e4ffbf21f
---
 Libraries/Reliability/UserFlow.js | 29 +++++++----------------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/Libraries/Reliability/UserFlow.js b/Libraries/Reliability/UserFlow.js
index b795e6ad8be5b9..6cde4cbc44101c 100644
--- a/Libraries/Reliability/UserFlow.js
+++ b/Libraries/Reliability/UserFlow.js
@@ -93,32 +93,17 @@ const UserFlow = {
     }
   },
 
-  completeWithUnexpectedFail(
+  completeWithFail(
     flowId: FlowId,
-    reason: string,
-    failureLocation: string,
+    errorName: string,
+    debugInfo: ?string = null,
   ): void {
-    if (global.nativeUserFlowCompleteWithUnexpectedFail) {
-      global.nativeUserFlowCompleteWithUnexpectedFail(
+    if (global.nativeUserFlowCompleteWithFail) {
+      global.nativeUserFlowCompleteWithFail(
         flowId.markerId,
         flowId.instanceKey,
-        reason,
-        failureLocation,
-      );
-    }
-  },
-
-  completeWithExpectedFail(
-    flowId: FlowId,
-    reason: string,
-    failureLocation: string,
-  ): void {
-    if (global.nativeUserFlowCompleteWithExpectedFail) {
-      global.nativeUserFlowCompleteWithExpectedFail(
-        flowId.markerId,
-        flowId.instanceKey,
-        reason,
-        failureLocation,
+        errorName,
+        debugInfo,
       );
     }
   },

From 923b77aef967934e9a0595d14978f9e6980dc58b Mon Sep 17 00:00:00 2001
From: Dmytro Voronkevych <zloy@fb.com>
Date: Fri, 2 Oct 2020 08:06:17 -0700
Subject: [PATCH 175/241] Renaming UserFlow methods

Summary: Renaming methods in UserFlow to match other APIs

Reviewed By: swillard13

Differential Revision: D24078270

fbshipit-source-id: c3a65d440e389d7b3c76de7706372265584353c8
---
 Libraries/Reliability/UserFlow.js | 42 ++++++++++++++++---------------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/Libraries/Reliability/UserFlow.js b/Libraries/Reliability/UserFlow.js
index 6cde4cbc44101c..9bf60dab2dccc2 100644
--- a/Libraries/Reliability/UserFlow.js
+++ b/Libraries/Reliability/UserFlow.js
@@ -21,10 +21,15 @@ type FlowId = {
  * API for tracking reliability of your user interactions
  *
  * Example:
- * var flowId = UserFlow.newFlowId(QuickLogItentifiersExample.EXAMPLE_EVENT);
+ * const flowId = UserFlow.newFlowId(QuickLogItentifiersExample.EXAMPLE_EVENT);
+ * ...
  * UserFlow.start(flowId, "user_click");
  * ...
- * UserFlow.completeWithSuccess(flowId);
+ * UserFlow.addAnnotation(flowId, "cached", "true");
+ * ...
+ * UserFlow.addPoint(flowId, "reload");
+ * ...
+ * UserFlow.endSuccess(flowId);
  */
 const UserFlow = {
   /**
@@ -59,13 +64,13 @@ const UserFlow = {
     }
   },
 
-  annotate(
+  addAnnotation(
     flowId: FlowId,
     annotationName: string,
     annotationValue: string,
   ): void {
-    if (global.nativeUserFlowAnnotate) {
-      global.nativeUserFlowAnnotate(
+    if (global.nativeUserFlowAddAnnotation) {
+      global.nativeUserFlowAddAnnotation(
         flowId.markerId,
         flowId.instanceKey,
         annotationName,
@@ -74,9 +79,9 @@ const UserFlow = {
     }
   },
 
-  markPoint(flowId: FlowId, pointName: string): void {
-    if (global.nativeUserFlowMarkPoint) {
-      global.nativeUserFlowMarkPoint(
+  addPoint(flowId: FlowId, pointName: string): void {
+    if (global.nativeUserFlowAddPoint) {
+      global.nativeUserFlowAddPoint(
         flowId.markerId,
         flowId.instanceKey,
         pointName,
@@ -84,22 +89,19 @@ const UserFlow = {
     }
   },
 
-  completeWithSuccess(flowId: FlowId): void {
-    if (global.nativeUserFlowCompleteWithSuccess) {
-      global.nativeUserFlowCompleteWithSuccess(
-        flowId.markerId,
-        flowId.instanceKey,
-      );
+  endSuccess(flowId: FlowId): void {
+    if (global.nativeUserFlowEndSuccess) {
+      global.nativeUserFlowEndSuccess(flowId.markerId, flowId.instanceKey);
     }
   },
 
-  completeWithFail(
+  endFailure(
     flowId: FlowId,
     errorName: string,
     debugInfo: ?string = null,
   ): void {
-    if (global.nativeUserFlowCompleteWithFail) {
-      global.nativeUserFlowCompleteWithFail(
+    if (global.nativeUserFlowEndFail) {
+      global.nativeUserFlowEndFail(
         flowId.markerId,
         flowId.instanceKey,
         errorName,
@@ -108,9 +110,9 @@ const UserFlow = {
     }
   },
 
-  cancel(flowId: FlowId, cancelReason: string): void {
-    if (global.nativeUserFlowCancel) {
-      global.nativeUserFlowCancel(
+  endCancel(flowId: FlowId, cancelReason: string): void {
+    if (global.nativeUserFlowEndCancel) {
+      global.nativeUserFlowEndCancel(
         flowId.markerId,
         flowId.instanceKey,
         cancelReason,

From 1511bfa028d2c40fa97fd79804dbb28b14df802f Mon Sep 17 00:00:00 2001
From: Dustin Shahidehpour <dust@fb.com>
Date: Fri, 2 Oct 2020 08:46:14 -0700
Subject: [PATCH 176/241] Do another passthrough of labeling.

Summary:
At this point, I think we are ready to enable validation

Changelog: [INTERNAL]

Differential Revision: D24062829

fbshipit-source-id: c82dcd2c376e5cdeb164451e16b6fb3a666106f4
---
 React/CoreModules/BUCK | 1 +
 1 file changed, 1 insertion(+)

diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
index 45b4b45f0daf1b..2170d80b1f9253 100644
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@@ -36,6 +36,7 @@ rn_apple_library(
     header_path_prefix = "React",
     labels = [
         "depslint_never_remove",  # Some old NativeModule still relies on +load unfortunately.
+        "disable_plugins_only_validation",
         "supermodule:xplat/default/public.react_native.infra",
     ],
     link_whole = True,

From 5fae86fb962e024582f24502bb39c4a87ada4430 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Fri, 2 Oct 2020 18:01:58 -0700
Subject: [PATCH 177/241] Remove license header from third-party code

Summary:
The `flow-typed/npm` path contains third-party code. The propietary Facebook license header should not be included in these files.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24082894

fbshipit-source-id: 34928c7a6a3d1fdf8d91b4cdd86eb72ca6341545
---
 flow-typed/npm/base64-js_v1.x.x.js         | 2 --
 flow-typed/npm/pretty-format_v26.x.x.js    | 2 --
 flow-typed/npm/promise_v8.x.x.js           | 2 --
 flow-typed/npm/prop-types_v15.x.x.js       | 5 -----
 flow-typed/npm/react-dom_v16.x.x.js        | 3 ---
 flow-typed/npm/stacktrace-parser_v0.1.x.js | 2 --
 6 files changed, 16 deletions(-)

diff --git a/flow-typed/npm/base64-js_v1.x.x.js b/flow-typed/npm/base64-js_v1.x.x.js
index 8653866fdba324..209a577e2adbd8 100644
--- a/flow-typed/npm/base64-js_v1.x.x.js
+++ b/flow-typed/npm/base64-js_v1.x.x.js
@@ -1,6 +1,4 @@
 /**
- * (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
- *
  * @flow strict
  * @format
  */
diff --git a/flow-typed/npm/pretty-format_v26.x.x.js b/flow-typed/npm/pretty-format_v26.x.x.js
index 181d7909b34c8c..bd2c68334cffb3 100644
--- a/flow-typed/npm/pretty-format_v26.x.x.js
+++ b/flow-typed/npm/pretty-format_v26.x.x.js
@@ -1,6 +1,4 @@
 /**
- * (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
- *
  * @flow strict
  * @format
  */
diff --git a/flow-typed/npm/promise_v8.x.x.js b/flow-typed/npm/promise_v8.x.x.js
index 580f98cdd6303e..bdb0f5a0e022a2 100644
--- a/flow-typed/npm/promise_v8.x.x.js
+++ b/flow-typed/npm/promise_v8.x.x.js
@@ -1,6 +1,4 @@
 /**
- * (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
- *
  * @flow strict
  * @format
  */
diff --git a/flow-typed/npm/prop-types_v15.x.x.js b/flow-typed/npm/prop-types_v15.x.x.js
index 45f83f922b9baf..f5f6dba9e23852 100644
--- a/flow-typed/npm/prop-types_v15.x.x.js
+++ b/flow-typed/npm/prop-types_v15.x.x.js
@@ -1,9 +1,4 @@
 /**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
  * @flow strict
  * @nolint
  * @format
diff --git a/flow-typed/npm/react-dom_v16.x.x.js b/flow-typed/npm/react-dom_v16.x.x.js
index b99617dd74d89a..01da4d0f52a8d6 100644
--- a/flow-typed/npm/react-dom_v16.x.x.js
+++ b/flow-typed/npm/react-dom_v16.x.x.js
@@ -1,7 +1,4 @@
 /**
- * Copyright (c) 2013-present, Facebook, Inc.
- * All rights reserved.
- *
  * react-dom v16.x.x libdefs from flow-typed
  *
  * @noformat
diff --git a/flow-typed/npm/stacktrace-parser_v0.1.x.js b/flow-typed/npm/stacktrace-parser_v0.1.x.js
index 9e99014453138f..51dd691b259a8b 100644
--- a/flow-typed/npm/stacktrace-parser_v0.1.x.js
+++ b/flow-typed/npm/stacktrace-parser_v0.1.x.js
@@ -1,6 +1,4 @@
 /**
- * (c) Facebook, Inc. and its affiliates. Confidential and proprietary.
- *
  * @flow strict
  * @format
  */

From 7b7c9f2309ff579af0cde892dd6f54f11875c367 Mon Sep 17 00:00:00 2001
From: Riley Dulin <dulinr@fb.com>
Date: Sat, 3 Oct 2020 10:08:34 -0700
Subject: [PATCH 178/241] Change the memory warning forced GC to use the level
 name

Summary:
We're seeing that GCs caused by memory warnings on Android are barely collecting
any memory and are operating on much smaller heaps than natural GCs.

This is likely due to some of the TRIM_MEMORY_* events firing too often.
Log which event name it was, instead of the generic "memory warning", to narrow
down the cases where the memory warning was helpful. Unhelpful warnings will
later be moved to not force a GC.

Note that this diff changes Venice, but we don't see any Venice heaps in production,
so it won't matter much other than making the code match up.

Also note that iOS has a similar memory warning in `RCTCxxBridge.mm`, but it hasn't
been called in production. Perhaps iOS is less trigger-happy for memory warnings than
Android.

Changelog: [Internal]

Reviewed By: neildhar

Differential Revision: D24093394

fbshipit-source-id: 03304f0f79083133c4d9b730559aef291319b6eb
---
 ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
index c4a3d90625e078..f490891446060f 100644
--- a/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
+++ b/ReactCommon/jsiexecutor/jsireact/JSIExecutor.cpp
@@ -344,7 +344,7 @@ void JSIExecutor::handleMemoryPressure(int pressureLevel) {
       // collections.
       LOG(INFO) << "Memory warning (pressure level: " << levelName
                 << ") received by JS VM, running a GC";
-      runtime_->instrumentation().collectGarbage("memory warning");
+      runtime_->instrumentation().collectGarbage(levelName);
       break;
     default:
       // Use the raw number instead of the name here since the name is

From a977ad0071b0a0e086e4c2bfff351e91f6ebb97f Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 4 Oct 2020 11:20:29 -0700
Subject: [PATCH 179/241] Removing outdated warning from View Config infra

Summary:
In theory, view configs can be hierarchical (one can depend on another), at least it was semi-supported on iOS once. And AFAIK there is only one component that seems to use this feature - `RCTComponentHostingView`, all other components essentially inherit RCTView or nothing. At the same time, RCTComponentHostingView does not really need it because RCTComponentHostingView itself does not expose any props.

Changelog: [Internal] Removed outdated warning

Reviewed By: kacieb

Differential Revision: D24095348

fbshipit-source-id: 5629c7433f151b72aae8201c58dd42062990b77e
---
 Libraries/ReactNative/getNativeComponentAttributes.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Libraries/ReactNative/getNativeComponentAttributes.js b/Libraries/ReactNative/getNativeComponentAttributes.js
index 2ec8950379d766..b31603098a5dbf 100644
--- a/Libraries/ReactNative/getNativeComponentAttributes.js
+++ b/Libraries/ReactNative/getNativeComponentAttributes.js
@@ -38,7 +38,6 @@ function getNativeComponentAttributes(uiViewClassName: string): any {
   while (baseModuleName) {
     const baseModule = UIManager.getViewManagerConfig(baseModuleName);
     if (!baseModule) {
-      console.warn('Base module "%s" does not exist', baseModuleName);
       baseModuleName = null;
     } else {
       bubblingEventTypes = {

From 03e120daa90eecffdf492ad44aebe83d6ab287f1 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 4 Oct 2020 19:10:05 -0700
Subject: [PATCH 180/241] Back out "Use ConcreteStateTeller in
 RCTParagraphComponentView"

Summary:
RCTParagraphComponentView does not need to have the state teller because it does not change the state.
Also, we are thinking about removing State Teller, so to simplify a fix coming in the next diff, we are backout the introducing a state telled in RCTParagraphComponentView.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D24095655

fbshipit-source-id: 90bd21cb8b01056c0db902a604b4088bf8c7750e
---
 .../Text/RCTParagraphComponentView.mm         | 47 +++++++++----------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
index 438e513c7aadbf..7756a7761545d3 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -25,7 +25,7 @@
 using namespace facebook::react;
 
 @implementation RCTParagraphComponentView {
-  ParagraphShadowNode::ConcreteStateTeller _stateTeller;
+  ParagraphShadowNode::ConcreteState::Shared _state;
   ParagraphAttributes _paragraphAttributes;
   RCTParagraphComponentAccessibilityProvider *_accessibilityProvider;
 }
@@ -58,12 +58,11 @@ - (NSString *)description
 
 - (NSAttributedString *_Nullable)attributedText
 {
-  auto data = _stateTeller.getData();
-  if (!data.hasValue()) {
+  if (!_state) {
     return nil;
   }
 
-  return RCTNSAttributedStringFromAttributedString(data.value().attributedString);
+  return RCTNSAttributedStringFromAttributedString(_state->getData().attributedString);
 }
 
 #pragma mark - RCTComponentViewProtocol
@@ -91,24 +90,23 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 
 - (void)updateState:(State::Shared const &)state oldState:(State::Shared const &)oldState
 {
-  _stateTeller.setConcreteState(state);
+  _state = std::static_pointer_cast<ParagraphShadowNode::ConcreteState const>(state);
   [self setNeedsDisplay];
 }
 
 - (void)prepareForRecycle
 {
   [super prepareForRecycle];
-  _stateTeller.invalidate();
+  _state.reset();
 }
 
 - (void)drawRect:(CGRect)rect
 {
-  auto data = _stateTeller.getData();
-  if (!data.hasValue()) {
+  if (!_state) {
     return;
   }
 
-  auto textLayoutManager = data.value().layoutManager;
+  auto textLayoutManager = _state->getData().layoutManager;
   assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
 
   if (!textLayoutManager) {
@@ -120,7 +118,7 @@ - (void)drawRect:(CGRect)rect
 
   CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
 
-  [nativeTextLayoutManager drawAttributedString:data.value().attributedString
+  [nativeTextLayoutManager drawAttributedString:_state->getData().attributedString
                             paragraphAttributes:_paragraphAttributes
                                           frame:frame];
 }
@@ -134,27 +132,25 @@ - (NSString *)accessibilityLabel
     return superAccessibilityLabel;
   }
 
-  auto data = _stateTeller.getData();
-
-  if (!data.hasValue()) {
+  if (!_state) {
     return nil;
   }
 
-  return RCTNSStringFromString(data.value().attributedString.getString());
+  return RCTNSStringFromString(_state->getData().attributedString.getString());
 }
 
 - (NSArray *)accessibilityElements
 {
-  auto data = _stateTeller.getData().value();
-  if (![_accessibilityProvider isUpToDate:data.attributedString]) {
+  if (![_accessibilityProvider isUpToDate:_state->getData().attributedString]) {
     RCTTextLayoutManager *textLayoutManager =
-        (RCTTextLayoutManager *)unwrapManagedObject(data.layoutManager->getNativeTextLayoutManager());
+        (RCTTextLayoutManager *)unwrapManagedObject(_state->getData().layoutManager->getNativeTextLayoutManager());
     CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
-    _accessibilityProvider = [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
-                                                                                  layoutManager:textLayoutManager
-                                                                            paragraphAttributes:data.paragraphAttributes
-                                                                                          frame:frame
-                                                                                           view:self];
+    _accessibilityProvider =
+        [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:_state->getData().attributedString
+                                                             layoutManager:textLayoutManager
+                                                       paragraphAttributes:_state->getData().paragraphAttributes
+                                                                     frame:frame
+                                                                      view:self];
   }
 
   self.isAccessibilityElement = NO;
@@ -168,12 +164,11 @@ - (UIAccessibilityTraits)accessibilityTraits
 
 - (SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point
 {
-  auto data = _stateTeller.getData();
-  if (!data.hasValue()) {
+  if (!_state) {
     return _eventEmitter;
   }
 
-  auto textLayoutManager = data.value().layoutManager;
+  auto textLayoutManager = _state->getData().layoutManager;
 
   assert(textLayoutManager && "TextLayoutManager must not be `nullptr`.");
 
@@ -185,7 +180,7 @@ - (SharedTouchEventEmitter)touchEventEmitterAtPoint:(CGPoint)point
       (RCTTextLayoutManager *)unwrapManagedObject(textLayoutManager->getNativeTextLayoutManager());
   CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
 
-  auto eventEmitter = [nativeTextLayoutManager getEventEmitterWithAttributeString:data.value().attributedString
+  auto eventEmitter = [nativeTextLayoutManager getEventEmitterWithAttributeString:_state->getData().attributedString
                                                               paragraphAttributes:_paragraphAttributes
                                                                             frame:frame
                                                                           atPoint:point];

From 7c83eaba80da1e0b608a348663f5493b5d11bc69 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Sun, 4 Oct 2020 19:10:05 -0700
Subject: [PATCH 181/241] Fabric: Fixed crash in `[RCTParagraphComponentView
 accessibilityElements]`

Summary:
Now we check for `_state` being nullptr before dereferencing this.

`accessibilityElements` (as a bunch of other methods that have the same check) can be called by OS any moment (we cannot predict when), so at some very rare moments, it can be called when the view is not fully initialized yet. To prevent crashing we just need to return some default value indicating that the view is empty.

Changelog: [Internal] Fabric-specific internal change.

Reviewed By: sammy-SC

Differential Revision: D24095654

fbshipit-source-id: d8a37f269c5bf7718acb0b512e7a9313e199398e
---
 .../Text/RCTParagraphComponentView.mm         | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
index 7756a7761545d3..824a140c7c7063 100644
--- a/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Text/RCTParagraphComponentView.mm
@@ -141,16 +141,21 @@ - (NSString *)accessibilityLabel
 
 - (NSArray *)accessibilityElements
 {
-  if (![_accessibilityProvider isUpToDate:_state->getData().attributedString]) {
+  if (!_state) {
+    return [NSArray new];
+  }
+
+  auto &data = _state->getData();
+
+  if (![_accessibilityProvider isUpToDate:data.attributedString]) {
     RCTTextLayoutManager *textLayoutManager =
-        (RCTTextLayoutManager *)unwrapManagedObject(_state->getData().layoutManager->getNativeTextLayoutManager());
+        (RCTTextLayoutManager *)unwrapManagedObject(data.layoutManager->getNativeTextLayoutManager());
     CGRect frame = RCTCGRectFromRect(_layoutMetrics.getContentFrame());
-    _accessibilityProvider =
-        [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:_state->getData().attributedString
-                                                             layoutManager:textLayoutManager
-                                                       paragraphAttributes:_state->getData().paragraphAttributes
-                                                                     frame:frame
-                                                                      view:self];
+    _accessibilityProvider = [[RCTParagraphComponentAccessibilityProvider alloc] initWithString:data.attributedString
+                                                                                  layoutManager:textLayoutManager
+                                                                            paragraphAttributes:data.paragraphAttributes
+                                                                                          frame:frame
+                                                                                           view:self];
   }
 
   self.isAccessibilityElement = NO;

From 12a50c0a442b78d9095398d955bec307cfcb0f69 Mon Sep 17 00:00:00 2001
From: "hy.harry.yu@gmail.com" <hy.harry.yu@gmail.com>
Date: Sun, 4 Oct 2020 22:10:41 -0700
Subject: [PATCH 182/241] Fixed TextInput not being selectable in
 removeClippedSubviews FlatLists (#28852)

Summary:
This is a resubmit of D21499015. It resolves https://github.com/facebook/react-native/pull/28852 and https://github.com/facebook/react-native/issues/27787.

From Harry Yu's original PR (too old to merge now):

Text in TextInputs can't be selected by long press. This happens only when they're inside of FlatLists that are rendered with removeClippedSubview prop set to true on Android.

Fixes https://github.com/facebook/react-native/issues/27787

Issue https://github.com/facebook/react-native/issues/6085 2 years ago had fixed this issue with a quick fix, but the code has since disappeared in another change. It has a longer explanation for why it's fixed, but essentially - the text is assumed to be not selectable since the TextInput is initialized without being attached to the window. We need to explicitly set the text to be selectable on attachment. This change redoes that change with a 1-line fix.

Changelog: [Android] [Fixed] - Fixed TextInput not being selectable in removeClippedSubviews FlatLists

Pull Request resolved: https://github.com/facebook/react-native/pull/28852

Test Plan:
This can be tested with a new toggle in RNTesterApp.
Go to the FlatList in RNTesterApp
Toggle on "removeClippedSubviews"
Try selecting some text in the list header. It should fail without this comment but succeed with it

Reviewed By: sammy-SC

Differential Revision: D24043533

Pulled By: JoshuaGross

fbshipit-source-id: c8e60f8131ccc5f6af31ed976c4184d0a16eb3af
---
 .../com/facebook/react/views/textinput/ReactEditText.java  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index d8bac9ffb79c89..b5312d28ae5b6f 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -827,6 +827,13 @@ public void onStartTemporaryDetach() {
   @Override
   public void onAttachedToWindow() {
     super.onAttachedToWindow();
+
+    // Used to ensure that text is selectable inside of removeClippedSubviews
+    // See https://github.com/facebook/react-native/issues/6805 for original
+    // fix that was ported to here.
+
+    super.setTextIsSelectable(true);
+
     if (mContainsImages) {
       Spanned text = getText();
       TextInlineImageSpan[] spans = text.getSpans(0, text.length(), TextInlineImageSpan.class);

From 43624dd1935b3aa5939b3666aeaaaa84e5fea72d Mon Sep 17 00:00:00 2001
From: Christoph Nakazawa <cpojer@fb.com>
Date: Mon, 5 Oct 2020 05:43:58 -0700
Subject: [PATCH 183/241] Update Babel to 7.11.6

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D24039996

fbshipit-source-id: 26ec2a988faadf24ea76d9124052d9397682787b
---
 packages/react-native-codegen/package.json    |  2 +-
 .../GenerateViewConfigJs-test.js.snap         | 41 +++++++++++++++----
 repo-config/package.json                      |  2 +-
 yarn.lock                                     | 38 ++++++++++-------
 4 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/packages/react-native-codegen/package.json b/packages/react-native-codegen/package.json
index 014bd03565390b..8edb4fe11d4c2d 100644
--- a/packages/react-native-codegen/package.json
+++ b/packages/react-native-codegen/package.json
@@ -19,7 +19,7 @@
   ],
   "dependencies": {
     "flow-parser": "^0.121.0",
-    "jscodeshift": "^0.9.0",
+    "jscodeshift": "^0.11.0",
     "nullthrows": "^1.1.1"
   },
   "devDependencies": {
diff --git a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
index 35c49ffe489873..27bf707c6a83ff 100644
--- a/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
+++ b/packages/react-native-codegen/src/generators/components/__tests__/__snapshots__/GenerateViewConfigJs-test.js.snap
@@ -26,7 +26,11 @@ const ArrayPropsNativeComponentViewConfig = {
     disableds: true,
     progress: true,
     radii: true,
-    colors: { process: require('processColorArray') },
+
+    colors: {
+      process: require('processColorArray'),
+    },
+
     srcs: true,
     points: true,
     sizes: true,
@@ -143,7 +147,9 @@ const ColorPropNativeComponentViewConfig = {
   uiViewClassName: 'ColorPropNativeComponent',
 
   validAttributes: {
-    tintColor: { process: require('processColor') },
+    tintColor: {
+      process: require('processColor'),
+    },
   },
 };
 
@@ -603,7 +609,9 @@ const ImagePropNativeComponentViewConfig = {
   uiViewClassName: 'ImagePropNativeComponent',
 
   validAttributes: {
-    thumbImage: { process: require('resolveAssetSource') },
+    thumbImage: {
+      process: require('resolveAssetSource'),
+    },
   },
 };
 
@@ -640,7 +648,9 @@ const InsetsPropNativeComponentViewConfig = {
   uiViewClassName: 'InsetsPropNativeComponent',
 
   validAttributes: {
-    contentInset: { diff: require('insetsDiffer') },
+    contentInset: {
+      diff: require('insetsDiffer'),
+    },
   },
 };
 
@@ -800,10 +810,21 @@ const ImageColorPropNativeComponentViewConfig = {
   uiViewClassName: 'ImageColorPropNativeComponent',
 
   validAttributes: {
-    thumbImage: { process: require('resolveAssetSource') },
-    color: { process: require('processColor') },
-    thumbTintColor: { process: require('processColor') },
-    point: { diff: require('pointsDiffer') },
+    thumbImage: {
+      process: require('resolveAssetSource'),
+    },
+
+    color: {
+      process: require('processColor'),
+    },
+
+    thumbTintColor: {
+      process: require('processColor'),
+    },
+
+    point: {
+      diff: require('pointsDiffer'),
+    },
   },
 };
 
@@ -911,7 +932,9 @@ const PointPropNativeComponentViewConfig = {
   uiViewClassName: 'PointPropNativeComponent',
 
   validAttributes: {
-    startPoint: { diff: require('pointsDiffer') },
+    startPoint: {
+      diff: require('pointsDiffer'),
+    },
   },
 };
 
diff --git a/repo-config/package.json b/repo-config/package.json
index 3e7a2c74386a8e..c791ac2eb22325 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -36,7 +36,7 @@
     "flow-bin": "^0.135.0",
     "jest": "^26.0.1",
     "jest-junit": "^10.0.0",
-    "jscodeshift": "^0.9.0",
+    "jscodeshift": "^0.11.0",
     "mkdirp": "^0.5.1",
     "prettier": "1.19.1",
     "react": "16.13.1",
diff --git a/yarn.lock b/yarn.lock
index 74a476a1ad8591..f452fc8e1a00a3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1532,10 +1532,12 @@ ast-types-flow@0.0.7, ast-types-flow@^0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
-ast-types@0.13.2:
-  version "0.13.2"
-  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.13.2.tgz#df39b677a911a83f3a049644fb74fdded23cea48"
-  integrity sha512-uWMHxJxtfj/1oZClOxDEV1sQ1HCDkA4MG8Gr69KKeBjEVH0R84WlejZ0y2DcwyBlpAEMltmVYkVgqfLFb2oyiA==
+ast-types@0.14.1:
+  version "0.14.1"
+  resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.14.1.tgz#0b415043770d7a2cbe4b2770271cbd7d2c9f61b9"
+  integrity sha512-pfSiukbt23P1qMhNnsozLzhMLBs7EEeXqPyvPmnuZM+RMfwfqwDbSVKYflgGuVI7/VehR4oMks0igzdNAg4VeQ==
+  dependencies:
+    tslib "^2.0.1"
 
 astral-regex@^1.0.0:
   version "1.0.0"
@@ -4375,10 +4377,10 @@ jsc-android@^245459.0.0:
   resolved "https://registry.yarnpkg.com/jsc-android/-/jsc-android-245459.0.0.tgz#e584258dd0b04c9159a27fb104cd5d491fd202c9"
   integrity sha512-wkjURqwaB1daNkDi2OYYbsLnIdC/lUM2nPXQKRs5pqEU9chDg435bjvo+LSaHotDENygHQDHe+ntUkkw2gwMtg==
 
-jscodeshift@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.9.0.tgz#672025658e868a63e24d6a6f4c44af9edb6e55f3"
-  integrity sha512-SUeXq8dJzj5LR8uy71axgG3bmiHoC0IdHy7n89SqKzkzBWpAds5F9IIGE+lqUSZX9J0ZfEzN8fXWIqQV0dIp2w==
+jscodeshift@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/jscodeshift/-/jscodeshift-0.11.0.tgz#4f95039408f3f06b0e39bb4d53bc3139f5330e2f"
+  integrity sha512-SdRK2C7jjs4k/kT2mwtO07KJN9RnjxtKn03d9JVj6c3j9WwaLcFYsICYDnLAzY0hp+wG2nxl+Cm2jWLiNVYb8g==
   dependencies:
     "@babel/core" "^7.1.6"
     "@babel/parser" "^7.1.6"
@@ -4392,11 +4394,11 @@ jscodeshift@^0.9.0:
     babel-core "^7.0.0-bridge.0"
     colors "^1.1.2"
     flow-parser "0.*"
-    graceful-fs "^4.1.11"
+    graceful-fs "^4.2.4"
     micromatch "^3.1.10"
     neo-async "^2.5.0"
     node-dir "^0.1.17"
-    recast "^0.18.1"
+    recast "^0.20.3"
     temp "^0.8.1"
     write-file-atomic "^2.3.0"
 
@@ -5979,15 +5981,16 @@ readable-stream@^2.0.1, readable-stream@^2.0.6, readable-stream@^2.2.2, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-recast@^0.18.1:
-  version "0.18.7"
-  resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.7.tgz#56338a6d803c8c3b9113344440dc70d13c8a1ef7"
-  integrity sha512-qNfoxvMkW4k8jJgNCfmIES7S31MEejXcEQs57eKUcQGiJUuX7cXNOD2h+W9z0rjNun2EkKqf0WvuRtmHw4NPNg==
+recast@^0.20.3:
+  version "0.20.3"
+  resolved "https://registry.yarnpkg.com/recast/-/recast-0.20.3.tgz#ac9387e4a59e5c8caef9057a35e306646287a7ef"
+  integrity sha512-jrEPzRV5B7wfRiN0UYMtjgIx1Hp8MRHdLcMYqMNd0DoOe1CB5JmPL/04I7WPuuApCs7LCSisYK/FfKnPEaJrzw==
   dependencies:
-    ast-types "0.13.2"
+    ast-types "0.14.1"
     esprima "~4.0.0"
     private "^0.1.8"
     source-map "~0.6.1"
+    tslib "^2.0.1"
 
 rechoir@^0.6.2:
   version "0.6.2"
@@ -7008,6 +7011,11 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.2.tgz#9c79d83272c9a7aaf166f73915c9667ecdde3cc9"
   integrity sha512-tTSkux6IGPnUGUd1XAZHcpu85MOkIl5zX49pO+jfsie3eP0B6pyhOlLXm3cAC6T7s+euSDDUUV+Acop5WmtkVg==
 
+tslib@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
+  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"

From d4937b925bcd60df4c1bc8fda1cc83909aed9006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Mon, 5 Oct 2020 12:55:09 -0700
Subject: [PATCH 184/241] Use correct var name for element when handling arrays
 of type aliases

Summary:
Fixes an issue where, if a spec uses an array of elements where the element is a type alias, the generated code would use the wrong variable name.

An example of such a spec can be found in `NativeExceptionsManager.js`:
```
  +reportSoftException: (
    message: string,
    stack: Array<StackFrame>,
    exceptionId: number,
  ) => void;
```

The fix ensures the local variable name is passed through, ensuring that either p or itemValue_N is used when appropriate.

Changelog: [Internal]

Reviewed By: RSNara

Differential Revision: D24116429

fbshipit-source-id: f39b75adb604c751d70a284a11a7fa6649b1344d
---
 .../GenerateModuleObjCpp/header/serializeRegularStruct.js     | 4 ++--
 .../__snapshots__/GenerateModuleHObjCpp-test.js.snap          | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
index 6815dd05c54204..76e9fa28646e5e 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
@@ -195,8 +195,8 @@ function toObjCValue(
       );
 
       return !isRequired
-        ? `(p == nil ? folly::none : folly::make_optional(${namespacedStructName}(p)))`
-        : `${namespacedStructName}(p)`;
+        ? `(${value} == nil ? folly::none : folly::make_optional(${namespacedStructName}(${value})))`
+        : `${namespacedStructName}(${value})`;
     default:
       (typeAnnotation.type: empty);
       throw new Error(
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
index 2d7f078c5257b9..3e71d06832abc1 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
@@ -309,7 +309,7 @@ inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeSample
 inline facebook::react::LazyVector<JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement> JS::NativeSampleTurboModule::SpecGetArraysOptions::arrayOfObjects() const
 {
   id const p = _v[@\\"arrayOfObjects\\"];
-  return RCTBridgingToVec(p, ^JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(id itemValue_0) { return JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(p); });
+  return RCTBridgingToVec(p, ^JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(id itemValue_0) { return JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(itemValue_0); });
 }
 
 ",
@@ -890,7 +890,7 @@ inline NSString *JS::NativeExceptionsManager::ExceptionData::componentStack() co
 inline facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> JS::NativeExceptionsManager::ExceptionData::stack() const
 {
   id const p = _v[@\\"stack\\"];
-  return RCTBridgingToVec(p, ^JS::NativeExceptionsManager::StackFrame(id itemValue_0) { return JS::NativeExceptionsManager::StackFrame(p); });
+  return RCTBridgingToVec(p, ^JS::NativeExceptionsManager::StackFrame(id itemValue_0) { return JS::NativeExceptionsManager::StackFrame(itemValue_0); });
 }
 
 

From 02005973ee5ed3b4d31b6c5c2dffb660c74bccaa Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Mon, 5 Oct 2020 14:34:26 -0700
Subject: [PATCH 185/241] Fix sloppy boolean error that breaks certain Fabric
 TextInputs

Summary:
When I landed D24042677 (https://github.com/facebook/react-native/commit/030d2c1931fb9ff97f682343914503a1c359e1c4), I had the right idea in spirit but forgot to negate the if statement. Oops.

This means that in non-Fabric, the cached spannable will be updated (potentially causing a crash) and the cached spannable will *never* be updated, meaning that most TextInputs will be measured as 0 in Fabric.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D24119952

fbshipit-source-id: dc86137956535e1f2b147bb432d050b3561e2658
---
 .../java/com/facebook/react/views/textinput/ReactEditText.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index b5312d28ae5b6f..f11daf378fc83e 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -943,7 +943,7 @@ public FabricViewStateManager getFabricViewStateManager() {
    */
   private void updateCachedSpannable(boolean resetStyles) {
     // Noops in non-Fabric
-    if (mFabricViewStateManager.hasStateWrapper()) {
+    if (!mFabricViewStateManager.hasStateWrapper()) {
       return;
     }
     // If this view doesn't have an ID yet, we don't have a cache key, so bail here

From 77f7658e4ee95d37d10b9d547e4326226d2bc91e Mon Sep 17 00:00:00 2001
From: Chris Dinh <cdinh@fb.com>
Date: Mon, 5 Oct 2020 16:26:15 -0700
Subject: [PATCH 186/241] Export FlowId type

Summary:
The UserFlow API takes in a FlowId as a parameter on all of its calls. However, this type is currently not exported so consumers cannot store a generated FlowId without creating their own matching type.

Changelog: [Internal]

Reviewed By: dmitry-voronkevich

Differential Revision: D24115983

fbshipit-source-id: 63afbca01343a31aa60042db3693a96a6b854939
---
 Libraries/Reliability/UserFlow.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Libraries/Reliability/UserFlow.js b/Libraries/Reliability/UserFlow.js
index 9bf60dab2dccc2..e2e2a62e0162ae 100644
--- a/Libraries/Reliability/UserFlow.js
+++ b/Libraries/Reliability/UserFlow.js
@@ -12,7 +12,7 @@
 
 const AUTO_INSTANCE_KEY = -1;
 
-type FlowId = {
+export type FlowId = {
   markerId: number,
   instanceKey: number,
 };

From e41ee4296795566baf9c8df68293a0e8a1b12b2b Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Mon, 5 Oct 2020 18:54:55 -0700
Subject: [PATCH 187/241] Add more off-by-default logging options for
 debug-mode builds: ReactEditText, TextLayoutManager

Summary:
Put more logging behind debug-build-only build flags.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24120153

fbshipit-source-id: 3b33db3e701a2bd3304c7c6502d58eb84e6bdc7f
---
 .../react/views/text/TextLayoutManager.java   | 20 ++++++++++--
 .../react/views/textinput/ReactEditText.java  | 32 ++++++++++++++++++-
 .../textinput/ReactTextInputManager.java      |  4 +++
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
index 34ad7c4e9af018..3b10c2c7d1c402 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/text/TextLayoutManager.java
@@ -28,6 +28,7 @@
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.ReadableNativeMap;
 import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.uimanager.PixelUtil;
 import com.facebook.react.uimanager.ReactAccessibilityDelegate;
@@ -44,9 +45,9 @@
 public class TextLayoutManager {
 
   // TODO T67606397: Refactor configuration of fabric logs
-  private static final boolean ENABLE_MEASURE_LOGGING = false;
+  private static final boolean ENABLE_MEASURE_LOGGING = ReactBuildConfig.DEBUG && false;
 
-  private static final String TAG = "TextLayoutManager";
+  private static final String TAG = TextLayoutManager.class.getSimpleName();
 
   // It's important to pass the ANTI_ALIAS_FLAG flag to the constructor rather than setting it
   // later by calling setFlags. This is because the latter approach triggers a bug on Android 4.4.2.
@@ -82,10 +83,16 @@ public static boolean isRTL(ReadableMap attributedString) {
   }
 
   public static void setCachedSpannabledForTag(int reactTag, @NonNull Spannable sp) {
+    if (ENABLE_MEASURE_LOGGING) {
+      FLog.e(TAG, "Set cached spannable for tag[" + reactTag + "]: " + sp.toString());
+    }
     sTagToSpannableCache.put(reactTag, sp);
   }
 
   public static void deleteCachedSpannableForTag(int reactTag) {
+    if (ENABLE_MEASURE_LOGGING) {
+      FLog.e(TAG, "Delete cached spannable for tag[" + reactTag + "]");
+    }
     sTagToSpannableCache.remove(reactTag);
   }
 
@@ -360,9 +367,18 @@ public static long measureText(
     Spannable text;
     if (attributedString.hasKey("cacheId")) {
       int cacheId = attributedString.getInt("cacheId");
+      if (ENABLE_MEASURE_LOGGING) {
+        FLog.e(TAG, "Get cached spannable for cacheId[" + cacheId + "]");
+      }
       if (sTagToSpannableCache.containsKey(cacheId)) {
         text = sTagToSpannableCache.get(cacheId);
+        if (ENABLE_MEASURE_LOGGING) {
+          FLog.e(TAG, "Text for spannable found for cacheId[" + cacheId + "]: " + text.toString());
+        }
       } else {
+        if (ENABLE_MEASURE_LOGGING) {
+          FLog.e(TAG, "No cached spannable found for cacheId[" + cacheId + "]");
+        }
         return 0;
       }
     } else {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
index f11daf378fc83e..4d4147215d88bc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java
@@ -38,8 +38,10 @@
 import androidx.appcompat.widget.AppCompatEditText;
 import androidx.core.view.AccessibilityDelegateCompat;
 import androidx.core.view.ViewCompat;
+import com.facebook.common.logging.FLog;
 import com.facebook.infer.annotation.Assertions;
 import com.facebook.react.bridge.ReactContext;
+import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.uimanager.FabricViewStateManager;
 import com.facebook.react.uimanager.UIManagerModule;
 import com.facebook.react.views.text.CustomLetterSpacingSpan;
@@ -70,8 +72,10 @@
  */
 public class ReactEditText extends AppCompatEditText
     implements FabricViewStateManager.HasFabricViewStateManager {
-
   private final InputMethodManager mInputMethodManager;
+  private final String TAG = ReactEditText.class.getSimpleName();
+  public static final boolean DEBUG_MODE = ReactBuildConfig.DEBUG && false;
+
   // This flag is set to true when we set the text of the EditText explicitly. In that case, no
   // *TextChanged events should be triggered. This is less expensive than removing the text
   // listeners and adding them back again after the text change is completed.
@@ -169,6 +173,9 @@ public boolean performAccessibilityAction(View host, int action, Bundle args) {
 
   @Override
   protected void finalize() {
+    if (DEBUG_MODE) {
+      FLog.e(TAG, "finalize[" + getId() + "] delete cached spannable");
+    }
     TextLayoutManager.deleteCachedSpannableForTag(getId());
   }
 
@@ -326,11 +333,18 @@ public void maybeSetSelection(int eventCounter, int start, int end) {
 
   @Override
   public void setSelection(int start, int end) {
+    if (DEBUG_MODE) {
+      FLog.e(TAG, "setSelection[" + getId() + "]: " + start + " " + end);
+    }
     super.setSelection(start, end);
   }
 
   @Override
   protected void onSelectionChanged(int selStart, int selEnd) {
+    if (DEBUG_MODE) {
+      FLog.e(TAG, "onSelectionChanged[" + getId() + "]: " + selStart + " " + selEnd);
+    }
+
     super.onSelectionChanged(selStart, selEnd);
     if (!mIsSettingTextFromCacheUpdate && mSelectionWatcher != null && hasFocus()) {
       mSelectionWatcher.onSelectionChanged(selStart, selEnd);
@@ -502,6 +516,17 @@ public void maybeSetText(ReactTextUpdate reactTextUpdate) {
       return;
     }
 
+    if (DEBUG_MODE) {
+      FLog.e(
+          TAG,
+          "maybeSetText["
+              + getId()
+              + "]: current text: "
+              + getText()
+              + " update: "
+              + reactTextUpdate.getText());
+    }
+
     // The current text gets replaced with the text received from JS. However, the spans on the
     // current text need to be adapted to the new text. Since TextView#setText() will remove or
     // reset some of these spans even if they are set directly, SpannableStringBuilder#replace() is
@@ -1004,6 +1029,11 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {
+      if (DEBUG_MODE) {
+        FLog.e(
+            TAG, "onTextChanged[" + getId() + "]: " + s + " " + start + " " + before + " " + count);
+      }
+
       if (!mIsSettingTextFromCacheUpdate) {
         if (!mIsSettingTextFromJS && mListeners != null) {
           for (TextWatcher listener : mListeners) {
diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
index a8894676574b81..6d9ab0d39b6d4c 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java
@@ -1183,6 +1183,10 @@ protected EditText createInternalEditText(ThemedReactContext themedReactContext)
   public Object updateState(
       ReactEditText view, ReactStylesDiffMap props, @Nullable StateWrapper stateWrapper) {
 
+    if (ReactEditText.DEBUG_MODE) {
+      FLog.e(TAG, "updateState: [" + view.getId() + "]");
+    }
+
     view.getFabricViewStateManager().setStateWrapper(stateWrapper);
 
     ReadableNativeMap state = stateWrapper.getState();

From eca3066291b71effb290498bcb2b96456b82c18a Mon Sep 17 00:00:00 2001
From: Christoph Nakazawa <cpojer@fb.com>
Date: Mon, 5 Oct 2020 20:02:14 -0700
Subject: [PATCH 188/241] Upgrade Jest to 26.4.2

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D24107283

fbshipit-source-id: 91a72ae7e06133998fefa490584477166c874685
---
 package.json             |   2 +-
 repo-config/package.json |   2 +-
 yarn.lock                | 813 +++++++++++++++++++++------------------
 3 files changed, 443 insertions(+), 374 deletions(-)

diff --git a/package.json b/package.json
index 4bdaad594b992b..87e533827ec418 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
     "metro-runtime": "0.63.0",
     "metro-source-map": "0.63.0",
     "nullthrows": "^1.1.1",
-    "pretty-format": "^26.0.1",
+    "pretty-format": "^26.4.2",
     "promise": "^8.0.3",
     "prop-types": "^15.7.2",
     "qs": "^6.5.1",
diff --git a/repo-config/package.json b/repo-config/package.json
index c791ac2eb22325..38e9caaa3a11da 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -34,7 +34,7 @@
     "eslint-plugin-react-native": "3.8.1",
     "eslint-plugin-relay": "1.7.1",
     "flow-bin": "^0.135.0",
-    "jest": "^26.0.1",
+    "jest": "^26.4.2",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.11.0",
     "mkdirp": "^0.5.1",
diff --git a/yarn.lock b/yarn.lock
index f452fc8e1a00a3..4e0587ef2b1cdd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -166,6 +166,11 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
   integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
 
+"@babel/helper-plugin-utils@^7.10.4":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
+  integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
+
 "@babel/helper-regex@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz#139772607d51b93f23effe72105b319d2a4c6965"
@@ -345,6 +350,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
+"@babel/plugin-syntax-import-meta@^7.8.3":
+  version "7.10.4"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz#ee601348c370fa334d2207be158777496521fd51"
+  integrity sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.10.4"
+
 "@babel/plugin-syntax-json-strings@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz#01ca21b668cd8218c9e640cb6dd88c5412b2c96a"
@@ -790,58 +802,61 @@
     chalk "^2.0.1"
     slash "^2.0.0"
 
-"@jest/console@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.0.1.tgz#62b3b2fa8990f3cbffbef695c42ae9ddbc8f4b39"
-  integrity sha512-9t1KUe/93coV1rBSxMmBAOIK3/HVpwxArCA1CxskKyRiv6o8J70V8C/V3OJminVCTa2M0hQI9AWRd5wxu2dAHw==
+"@jest/console@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856"
+  integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.0.1"
-    jest-util "^26.0.1"
+    jest-message-util "^26.3.0"
+    jest-util "^26.3.0"
     slash "^3.0.0"
 
-"@jest/core@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.0.1.tgz#aa538d52497dfab56735efb00e506be83d841fae"
-  integrity sha512-Xq3eqYnxsG9SjDC+WLeIgf7/8KU6rddBxH+SCt18gEpOhAGYC/Mq+YbtlNcIdwjnnT+wDseXSbU0e5X84Y4jTQ==
+"@jest/core@^26.4.2":
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc"
+  integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==
   dependencies:
-    "@jest/console" "^26.0.1"
-    "@jest/reporters" "^26.0.1"
-    "@jest/test-result" "^26.0.1"
-    "@jest/transform" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/console" "^26.3.0"
+    "@jest/reporters" "^26.4.1"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^26.0.1"
-    jest-config "^26.0.1"
-    jest-haste-map "^26.0.1"
-    jest-message-util "^26.0.1"
+    jest-changed-files "^26.3.0"
+    jest-config "^26.4.2"
+    jest-haste-map "^26.3.0"
+    jest-message-util "^26.3.0"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.0.1"
-    jest-resolve-dependencies "^26.0.1"
-    jest-runner "^26.0.1"
-    jest-runtime "^26.0.1"
-    jest-snapshot "^26.0.1"
-    jest-util "^26.0.1"
-    jest-validate "^26.0.1"
-    jest-watcher "^26.0.1"
+    jest-resolve "^26.4.0"
+    jest-resolve-dependencies "^26.4.2"
+    jest-runner "^26.4.2"
+    jest-runtime "^26.4.2"
+    jest-snapshot "^26.4.2"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
+    jest-watcher "^26.3.0"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
-"@jest/environment@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.0.1.tgz#82f519bba71959be9b483675ee89de8c8f72a5c8"
-  integrity sha512-xBDxPe8/nx251u0VJ2dFAFz2H23Y98qdIaNwnMK6dFQr05jc+Ne/2np73lOAx+5mSBO/yuQldRrQOf6hP1h92g==
+"@jest/environment@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
+  integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==
   dependencies:
-    "@jest/fake-timers" "^26.0.1"
-    "@jest/types" "^26.0.1"
-    jest-mock "^26.0.1"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
 
 "@jest/fake-timers@^24.8.0":
   version "24.8.0"
@@ -852,57 +867,58 @@
     jest-message-util "^24.8.0"
     jest-mock "^24.8.0"
 
-"@jest/fake-timers@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.0.1.tgz#f7aeff13b9f387e9d0cac9a8de3bba538d19d796"
-  integrity sha512-Oj/kCBnTKhm7CR+OJSjZty6N1bRDr9pgiYQr4wY221azLz5PHi08x/U+9+QpceAYOWheauLP8MhtSVFrqXQfhg==
+"@jest/fake-timers@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a"
+  integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     "@sinonjs/fake-timers" "^6.0.1"
-    jest-message-util "^26.0.1"
-    jest-mock "^26.0.1"
-    jest-util "^26.0.1"
+    "@types/node" "*"
+    jest-message-util "^26.3.0"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
 
-"@jest/globals@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.0.1.tgz#3f67b508a7ce62b6e6efc536f3d18ec9deb19a9c"
-  integrity sha512-iuucxOYB7BRCvT+TYBzUqUNuxFX1hqaR6G6IcGgEqkJ5x4htNKo1r7jk1ji9Zj8ZMiMw0oB5NaA7k5Tx6MVssA==
+"@jest/globals@^26.4.2":
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a"
+  integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==
   dependencies:
-    "@jest/environment" "^26.0.1"
-    "@jest/types" "^26.0.1"
-    expect "^26.0.1"
+    "@jest/environment" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    expect "^26.4.2"
 
-"@jest/reporters@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.0.1.tgz#14ae00e7a93e498cec35b0c00ab21c375d9b078f"
-  integrity sha512-NWWy9KwRtE1iyG/m7huiFVF9YsYv/e+mbflKRV84WDoJfBqUrNRyDbL/vFxQcYLl8IRqI4P3MgPn386x76Gf2g==
+"@jest/reporters@^26.4.1":
+  version "26.4.1"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795"
+  integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.0.1"
-    "@jest/test-result" "^26.0.1"
-    "@jest/transform" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/console" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.2"
     graceful-fs "^4.2.4"
     istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-instrument "^4.0.0"
+    istanbul-lib-instrument "^4.0.3"
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^26.0.1"
-    jest-resolve "^26.0.1"
-    jest-util "^26.0.1"
-    jest-worker "^26.0.0"
+    jest-haste-map "^26.3.0"
+    jest-resolve "^26.4.0"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
     terminal-link "^2.0.0"
-    v8-to-istanbul "^4.1.3"
+    v8-to-istanbul "^5.0.1"
   optionalDependencies:
-    node-notifier "^7.0.0"
+    node-notifier "^8.0.0"
 
 "@jest/source-map@^24.3.0":
   version "24.3.0"
@@ -913,10 +929,10 @@
     graceful-fs "^4.1.15"
     source-map "^0.6.0"
 
-"@jest/source-map@^26.0.0":
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.0.0.tgz#fd7706484a7d3faf7792ae29783933bbf48a4749"
-  integrity sha512-S2Z+Aj/7KOSU2TfW0dyzBze7xr95bkm5YXNUqqCek+HE0VbNNSNzrRwfIi5lf7wvzDTSS0/ib8XQ1krFNyYgbQ==
+"@jest/source-map@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9"
+  integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==
   dependencies:
     callsites "^3.0.0"
     graceful-fs "^4.2.4"
@@ -931,42 +947,42 @@
     "@jest/types" "^24.8.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
 
-"@jest/test-result@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.0.1.tgz#1ffdc1ba4bc289919e54b9414b74c9c2f7b2b718"
-  integrity sha512-oKwHvOI73ICSYRPe8WwyYPTtiuOAkLSbY8/MfWF3qDEd/sa8EDyZzin3BaXTqufir/O/Gzea4E8Zl14XU4Mlyg==
+"@jest/test-result@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb"
+  integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==
   dependencies:
-    "@jest/console" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/console" "^26.3.0"
+    "@jest/types" "^26.3.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.0.1.tgz#b0563424728f3fe9e75d1442b9ae4c11da73f090"
-  integrity sha512-ssga8XlwfP8YjbDcmVhwNlrmblddMfgUeAkWIXts1V22equp2GMIHxm7cyeD5Q/B0ZgKPK/tngt45sH99yLLGg==
+"@jest/test-sequencer@^26.4.2":
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba"
+  integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==
   dependencies:
-    "@jest/test-result" "^26.0.1"
+    "@jest/test-result" "^26.3.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.0.1"
-    jest-runner "^26.0.1"
-    jest-runtime "^26.0.1"
+    jest-haste-map "^26.3.0"
+    jest-runner "^26.4.2"
+    jest-runtime "^26.4.2"
 
-"@jest/transform@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.0.1.tgz#0e3ecbb34a11cd4b2080ed0a9c4856cf0ceb0639"
-  integrity sha512-pPRkVkAQ91drKGbzCfDOoHN838+FSbYaEAvBXvKuWeeRRUD8FjwXkqfUNUZL6Ke48aA/1cqq/Ni7kVMCoqagWA==
+"@jest/transform@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55"
+  integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     babel-plugin-istanbul "^6.0.0"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.0.1"
+    jest-haste-map "^26.3.0"
     jest-regex-util "^26.0.0"
-    jest-util "^26.0.1"
+    jest-util "^26.3.0"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     slash "^3.0.0"
@@ -992,13 +1008,14 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jest/types@^26.0.1":
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.0.1.tgz#b78333fbd113fa7aec8d39de24f88de8686dac67"
-  integrity sha512-IbtjvqI9+eS1qFnOIEL7ggWmT+iK/U+Vde9cGWtYb/b6XgKb3X44ZAe/z9YZzoAAZ/E92m0DqrilF934IGNnQA==
+"@jest/types@^26.3.0":
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71"
+  integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
-    "@types/istanbul-reports" "^1.1.1"
+    "@types/istanbul-reports" "^3.0.0"
+    "@types/node" "*"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
 
@@ -1139,6 +1156,17 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
+"@types/babel__core@^7.0.0":
+  version "7.1.10"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
+  integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
+  dependencies:
+    "@babel/parser" "^7.1.0"
+    "@babel/types" "^7.0.0"
+    "@types/babel__generator" "*"
+    "@types/babel__template" "*"
+    "@types/babel__traverse" "*"
+
 "@types/babel__core@^7.1.7":
   version "7.1.7"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
@@ -1204,6 +1232,13 @@
     "@types/istanbul-lib-coverage" "*"
     "@types/istanbul-lib-report" "*"
 
+"@types/istanbul-reports@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz#508b13aa344fa4976234e75dddcc34925737d821"
+  integrity sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==
+  dependencies:
+    "@types/istanbul-lib-report" "*"
+
 "@types/node@*":
   version "13.13.4"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-13.13.4.tgz#1581d6c16e3d4803eb079c87d4ac893ee7501c2c"
@@ -1605,16 +1640,16 @@ babel-eslint@^10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.0.1.tgz#450139ce4b6c17174b136425bda91885c397bc46"
-  integrity sha512-Z4GGmSNQ8pX3WS1O+6v3fo41YItJJZsVxG5gIQ+HuB/iuAQBJxMTHTwz292vuYws1LnHfwSRgoqI+nxdy/pcvw==
+babel-jest@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463"
+  integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==
   dependencies:
-    "@jest/transform" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
     "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.0.0"
+    babel-preset-jest "^26.3.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     slash "^3.0.0"
@@ -1637,13 +1672,14 @@ babel-plugin-istanbul@^6.0.0:
     istanbul-lib-instrument "^4.0.0"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.0.0.tgz#fd1d35f95cf8849fc65cb01b5e58aedd710b34a8"
-  integrity sha512-+AuoehOrjt9irZL7DOt2+4ZaTM6dlu1s5TTS46JBa0/qem4dy7VNW3tMb96qeEqcIh20LD73TVNtmVEeymTG7w==
+babel-plugin-jest-hoist@^26.2.0:
+  version "26.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd"
+  integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
+    "@types/babel__core" "^7.0.0"
     "@types/babel__traverse" "^7.0.6"
 
 babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
@@ -1651,14 +1687,15 @@ babel-plugin-syntax-trailing-function-commas@^7.0.0-beta.0:
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0.tgz#aa213c1435e2bffeb6fca842287ef534ad05d5cf"
   integrity sha512-Xj9XuRuz3nTSbaTXWv3itLOcxyF4oPD8douBBmj7U9BBC6nEBYfyOJYQMf/8PJAFotC62UY5dFfIGEPr7WswzQ==
 
-babel-preset-current-node-syntax@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.2.tgz#fb4a4c51fe38ca60fede1dc74ab35eb843cb41d6"
-  integrity sha512-u/8cS+dEiK1SFILbOC8/rUI3ml9lboKuuMvZ/4aQnQmhecQAgPw5ew066C1ObnEAUmlx7dv/s2z52psWEtLNiw==
+babel-preset-current-node-syntax@^0.1.3:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz#826f1f8e7245ad534714ba001f84f7e906c3b615"
+  integrity sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==
   dependencies:
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-bigint" "^7.8.3"
     "@babel/plugin-syntax-class-properties" "^7.8.3"
+    "@babel/plugin-syntax-import-meta" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.8.3"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
@@ -1700,13 +1737,13 @@ babel-preset-fbjs@^3.0.0, babel-preset-fbjs@^3.3.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
-babel-preset-jest@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.0.0.tgz#1eac82f513ad36c4db2e9263d7c485c825b1faa6"
-  integrity sha512-9ce+DatAa31DpR4Uir8g4Ahxs5K4W4L8refzt+qHWQANb6LhGcAEfIFgLUwk67oya2cCUd6t4eUMtO/z64ocNw==
+babel-preset-jest@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776"
+  integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==
   dependencies:
-    babel-plugin-jest-hoist "^26.0.0"
-    babel-preset-current-node-syntax "^0.1.2"
+    babel-plugin-jest-hoist "^26.2.0"
+    babel-preset-current-node-syntax "^0.1.3"
 
 balanced-match@^1.0.0:
   version "1.0.0"
@@ -2448,10 +2485,10 @@ detox@15.4.4:
     yargs "^13.0.0"
     yargs-parser "^13.0.0"
 
-diff-sequences@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.0.0.tgz#0760059a5c287637b842bd7085311db7060e88a6"
-  integrity sha512-JC/eHYEC3aSS0vZGjuoc4vHA0yAQTzhQQldXMeMF+JlxLGJlCO38Gma82NV9gk1jGFz8mDzUMeaKXvjRRdJ2dg==
+diff-sequences@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2"
+  integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -2494,6 +2531,11 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
+emittery@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/emittery/-/emittery-0.7.1.tgz#c02375a927a40948c0345cc903072597f5270451"
+  integrity sha512-d34LN4L6h18Bzz9xpoku2nPwKxCPlPMr3EEKTkoEBi+1/+b0lcRkRJ1UVyyZaKNeqGR3swcGl6s390DNO4YVgQ==
+
 emoji-regex@^7.0.1, emoji-regex@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
@@ -2880,16 +2922,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.0.1.tgz#18697b9611a7e2725e20ba3ceadda49bc9865421"
-  integrity sha512-QcCy4nygHeqmbw564YxNbHTJlXh47dVID2BUP52cZFpLU9zHViMFK6h07cC1wf7GYCTIigTdAXhVua8Yl1FkKg==
+expect@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1"
+  integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     ansi-styles "^4.0.0"
-    jest-get-type "^26.0.0"
-    jest-matcher-utils "^26.0.1"
-    jest-message-util "^26.0.1"
+    jest-get-type "^26.3.0"
+    jest-matcher-utils "^26.4.2"
+    jest-message-util "^26.3.0"
     jest-regex-util "^26.0.0"
 
 extend-shallow@^1.1.2:
@@ -3692,6 +3734,11 @@ is-directory@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
   integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
+is-docker@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
+  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@@ -3801,10 +3848,12 @@ is-wsl@^1.1.0:
   resolved "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
-is-wsl@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz#4a1c152d429df3d441669498e2486d3596ebaf1d"
-  integrity sha512-umZHcSrwlDHo2TGMXv0DZ8dIUGunZ2Iv68YZnrmCiBPkZ4aaOhtv7pXJKeki9k3qJ3RJr0cDyitcl5wEH3AYog==
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
 
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
@@ -3859,6 +3908,16 @@ istanbul-lib-instrument@^4.0.0:
     istanbul-lib-coverage "^3.0.0"
     semver "^6.3.0"
 
+istanbul-lib-instrument@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
+  integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
+  dependencies:
+    "@babel/core" "^7.7.5"
+    "@istanbuljs/schema" "^0.1.2"
+    istanbul-lib-coverage "^3.0.0"
+    semver "^6.3.0"
+
 istanbul-lib-report@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz#7518fe52ea44de372f460a76b5ecda9ffb73d8a6"
@@ -3885,67 +3944,67 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.0.1.tgz#1334630c6a1ad75784120f39c3aa9278e59f349f"
-  integrity sha512-q8LP9Sint17HaE2LjxQXL+oYWW/WeeXMPE2+Op9X3mY8IEGFVc14xRxFjUuXUbcPAlDLhtWdIEt59GdQbn76Hw==
+jest-changed-files@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1"
+  integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     execa "^4.0.0"
     throat "^5.0.0"
 
-jest-cli@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.0.1.tgz#3a42399a4cbc96a519b99ad069a117d955570cac"
-  integrity sha512-pFLfSOBcbG9iOZWaMK4Een+tTxi/Wcm34geqZEqrst9cZDkTQ1LZ2CnBrTlHWuYAiTMFr0EQeK52ScyFU8wK+w==
+jest-cli@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da"
+  integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==
   dependencies:
-    "@jest/core" "^26.0.1"
-    "@jest/test-result" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/core" "^26.4.2"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^26.0.1"
-    jest-util "^26.0.1"
-    jest-validate "^26.0.1"
+    jest-config "^26.4.2"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
     prompts "^2.0.1"
     yargs "^15.3.1"
 
-jest-config@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.0.1.tgz#096a3d4150afadf719d1fab00e9a6fb2d6d67507"
-  integrity sha512-9mWKx2L1LFgOXlDsC4YSeavnblN6A4CPfXFiobq+YYLaBMymA/SczN7xYTSmLaEYHZOcB98UdoN4m5uNt6tztg==
+jest-config@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558"
+  integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.0.1"
-    "@jest/types" "^26.0.1"
-    babel-jest "^26.0.1"
+    "@jest/test-sequencer" "^26.4.2"
+    "@jest/types" "^26.3.0"
+    babel-jest "^26.3.0"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.0.1"
-    jest-environment-node "^26.0.1"
-    jest-get-type "^26.0.0"
-    jest-jasmine2 "^26.0.1"
+    jest-environment-jsdom "^26.3.0"
+    jest-environment-node "^26.3.0"
+    jest-get-type "^26.3.0"
+    jest-jasmine2 "^26.4.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.0.1"
-    jest-util "^26.0.1"
-    jest-validate "^26.0.1"
+    jest-resolve "^26.4.0"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
     micromatch "^4.0.2"
-    pretty-format "^26.0.1"
+    pretty-format "^26.4.2"
 
-jest-diff@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.0.1.tgz#c44ab3cdd5977d466de69c46929e0e57f89aa1de"
-  integrity sha512-odTcHyl5X+U+QsczJmOjWw5tPvww+y9Yim5xzqxVl/R1j4z71+fHW4g8qu1ugMmKdFdxw+AtQgs5mupPnzcIBQ==
+jest-diff@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa"
+  integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.0.0"
-    jest-get-type "^26.0.0"
-    pretty-format "^26.0.1"
+    diff-sequences "^26.3.0"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.2"
 
 jest-docblock@^21.0.0:
   version "21.2.0"
@@ -3959,49 +4018,51 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.0.1.tgz#633083061619302fc90dd8f58350f9d77d67be04"
-  integrity sha512-OTgJlwXCAR8NIWaXFL5DBbeS4QIYPuNASkzSwMCJO+ywo9BEa6TqkaSWsfR7VdbMLdgYJqSfQcIyjJCNwl5n4Q==
+jest-each@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae"
+  integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     chalk "^4.0.0"
-    jest-get-type "^26.0.0"
-    jest-util "^26.0.1"
-    pretty-format "^26.0.1"
-
-jest-environment-jsdom@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.0.1.tgz#217690852e5bdd7c846a4e3b50c8ffd441dfd249"
-  integrity sha512-u88NJa3aptz2Xix2pFhihRBAatwZHWwSiRLBDBQE1cdJvDjPvv7ZGA0NQBxWwDDn7D0g1uHqxM8aGgfA9Bx49g==
-  dependencies:
-    "@jest/environment" "^26.0.1"
-    "@jest/fake-timers" "^26.0.1"
-    "@jest/types" "^26.0.1"
-    jest-mock "^26.0.1"
-    jest-util "^26.0.1"
+    jest-get-type "^26.3.0"
+    jest-util "^26.3.0"
+    pretty-format "^26.4.2"
+
+jest-environment-jsdom@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c"
+  integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==
+  dependencies:
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
     jsdom "^16.2.2"
 
-jest-environment-node@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.0.1.tgz#584a9ff623124ff6eeb49e0131b5f7612b310b13"
-  integrity sha512-4FRBWcSn5yVo0KtNav7+5NH5Z/tEgDLp7VRQVS5tCouWORxj+nI+1tOLutM07Zb2Qi7ja+HEDoOUkjBSWZg/IQ==
+jest-environment-node@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849"
+  integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==
   dependencies:
-    "@jest/environment" "^26.0.1"
-    "@jest/fake-timers" "^26.0.1"
-    "@jest/types" "^26.0.1"
-    jest-mock "^26.0.1"
-    jest-util "^26.0.1"
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
+    jest-mock "^26.3.0"
+    jest-util "^26.3.0"
 
 jest-get-type@^24.9.0:
   version "24.9.0"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-24.9.0.tgz#1684a0c8a50f2e4901b6644ae861f579eed2ef0e"
   integrity sha512-lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q==
 
-jest-get-type@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.0.0.tgz#381e986a718998dbfafcd5ec05934be538db4039"
-  integrity sha512-zRc1OAPnnws1EVfykXOj19zo2EMw5Hi6HLbFCSjpuJiXtOWAYIjNsHVSbpQ8bDX7L5BGYGI8m+HmKdjHYFF0kg==
+jest-get-type@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0"
+  integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==
 
 jest-haste-map@^24.7.1:
   version "24.8.1"
@@ -4022,47 +4083,49 @@ jest-haste-map@^24.7.1:
   optionalDependencies:
     fsevents "^1.2.7"
 
-jest-haste-map@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.0.1.tgz#40dcc03c43ac94d25b8618075804d09cd5d49de7"
-  integrity sha512-J9kBl/EdjmDsvyv7CiyKY5+DsTvVOScenprz/fGqfLg/pm1gdjbwwQ98nW0t+OIt+f+5nAVaElvn/6wP5KO7KA==
+jest-haste-map@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726"
+  integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     "@types/graceful-fs" "^4.1.2"
+    "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-serializer "^26.0.0"
-    jest-util "^26.0.1"
-    jest-worker "^26.0.0"
+    jest-regex-util "^26.0.0"
+    jest-serializer "^26.3.0"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
     micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
-    which "^2.0.2"
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.0.1.tgz#947c40ee816636ba23112af3206d6fa7b23c1c1c"
-  integrity sha512-ILaRyiWxiXOJ+RWTKupzQWwnPaeXPIoLS5uW41h18varJzd9/7I0QJGqg69fhTT1ev9JpSSo9QtalriUN0oqOg==
+jest-jasmine2@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257"
+  integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.0.1"
-    "@jest/source-map" "^26.0.0"
-    "@jest/test-result" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/environment" "^26.3.0"
+    "@jest/source-map" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^26.0.1"
+    expect "^26.4.2"
     is-generator-fn "^2.0.0"
-    jest-each "^26.0.1"
-    jest-matcher-utils "^26.0.1"
-    jest-message-util "^26.0.1"
-    jest-runtime "^26.0.1"
-    jest-snapshot "^26.0.1"
-    jest-util "^26.0.1"
-    pretty-format "^26.0.1"
+    jest-each "^26.4.2"
+    jest-matcher-utils "^26.4.2"
+    jest-message-util "^26.3.0"
+    jest-runtime "^26.4.2"
+    jest-snapshot "^26.4.2"
+    jest-util "^26.3.0"
+    pretty-format "^26.4.2"
     throat "^5.0.0"
 
 jest-junit@^10.0.0:
@@ -4076,23 +4139,23 @@ jest-junit@^10.0.0:
     uuid "^3.3.3"
     xml "^1.0.1"
 
-jest-leak-detector@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.0.1.tgz#79b19ab3f41170e0a78eb8fa754a116d3447fb8c"
-  integrity sha512-93FR8tJhaYIWrWsbmVN1pQ9ZNlbgRpfvrnw5LmgLRX0ckOJ8ut/I35CL7awi2ecq6Ca4lL59bEK9hr7nqoHWPA==
+jest-leak-detector@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f"
+  integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==
   dependencies:
-    jest-get-type "^26.0.0"
-    pretty-format "^26.0.1"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.2"
 
-jest-matcher-utils@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.0.1.tgz#12e1fc386fe4f14678f4cc8dbd5ba75a58092911"
-  integrity sha512-PUMlsLth0Azen8Q2WFTwnSkGh2JZ8FYuwijC8NR47vXKpsrKmA1wWvgcj1CquuVfcYiDEdj985u5Wmg7COEARw==
+jest-matcher-utils@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06"
+  integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.0.1"
-    jest-get-type "^26.0.0"
-    pretty-format "^26.0.1"
+    jest-diff "^26.4.2"
+    jest-get-type "^26.3.0"
+    pretty-format "^26.4.2"
 
 jest-message-util@^24.8.0:
   version "24.8.0"
@@ -4108,13 +4171,13 @@ jest-message-util@^24.8.0:
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-message-util@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.0.1.tgz#07af1b42fc450b4cc8e90e4c9cef11b33ce9b0ac"
-  integrity sha512-CbK8uQREZ8umUfo8+zgIfEt+W7HAHjQCoRaNs4WxKGhAYBGwEyvxuK81FXa7VeB9pwDEXeeKOB2qcsNVCAvB7Q==
+jest-message-util@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a"
+  integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     "@types/stack-utils" "^1.0.1"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
@@ -4129,99 +4192,101 @@ jest-mock@^24.8.0:
   dependencies:
     "@jest/types" "^24.8.0"
 
-jest-mock@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.0.1.tgz#7fd1517ed4955397cf1620a771dc2d61fad8fd40"
-  integrity sha512-MpYTBqycuPYSY6xKJognV7Ja46/TeRbAZept987Zp+tuJvMN0YBWyyhG9mXyYQaU3SBI0TUlSaO5L3p49agw7Q==
+jest-mock@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba"
+  integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
 
-jest-pnp-resolver@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz#ecdae604c077a7fbc70defb6d517c3c1c898923a"
-  integrity sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==
+jest-pnp-resolver@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz#b704ac0ae028a89108a4d040b3f919dfddc8e33c"
+  integrity sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==
 
 jest-regex-util@^26.0.0:
   version "26.0.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.0.1.tgz#607ba7ccc32151d185a477cff45bf33bce417f0b"
-  integrity sha512-9d5/RS/ft0vB/qy7jct/qAhzJsr6fRQJyGAFigK3XD4hf9kIbEH5gks4t4Z7kyMRhowU6HWm/o8ILqhaHdSqLw==
+jest-resolve-dependencies@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5"
+  integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     jest-regex-util "^26.0.0"
-    jest-snapshot "^26.0.1"
+    jest-snapshot "^26.4.2"
 
-jest-resolve@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.0.1.tgz#21d1ee06f9ea270a343a8893051aeed940cde736"
-  integrity sha512-6jWxk0IKZkPIVTvq6s72RH735P8f9eCJW3IM5CX/SJFeKq1p2cZx0U49wf/SdMlhaB/anann5J2nCJj6HrbezQ==
+jest-resolve@^26.4.0:
+  version "26.4.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7"
+  integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
-    jest-pnp-resolver "^1.2.1"
-    jest-util "^26.0.1"
+    jest-pnp-resolver "^1.2.2"
+    jest-util "^26.3.0"
     read-pkg-up "^7.0.1"
     resolve "^1.17.0"
     slash "^3.0.0"
 
-jest-runner@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.0.1.tgz#ea03584b7ae4bacfb7e533d680a575a49ae35d50"
-  integrity sha512-CApm0g81b49Znm4cZekYQK67zY7kkB4umOlI2Dx5CwKAzdgw75EN+ozBHRvxBzwo1ZLYZ07TFxkaPm+1t4d8jA==
+jest-runner@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853"
+  integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==
   dependencies:
-    "@jest/console" "^26.0.1"
-    "@jest/environment" "^26.0.1"
-    "@jest/test-result" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/console" "^26.3.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
     chalk "^4.0.0"
+    emittery "^0.7.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-config "^26.0.1"
+    jest-config "^26.4.2"
     jest-docblock "^26.0.0"
-    jest-haste-map "^26.0.1"
-    jest-jasmine2 "^26.0.1"
-    jest-leak-detector "^26.0.1"
-    jest-message-util "^26.0.1"
-    jest-resolve "^26.0.1"
-    jest-runtime "^26.0.1"
-    jest-util "^26.0.1"
-    jest-worker "^26.0.0"
+    jest-haste-map "^26.3.0"
+    jest-leak-detector "^26.4.2"
+    jest-message-util "^26.3.0"
+    jest-resolve "^26.4.0"
+    jest-runtime "^26.4.2"
+    jest-util "^26.3.0"
+    jest-worker "^26.3.0"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.0.1.tgz#a121a6321235987d294168e282d52b364d7d3f89"
-  integrity sha512-Ci2QhYFmANg5qaXWf78T2Pfo6GtmIBn2rRaLnklRyEucmPccmCKvS9JPljcmtVamsdMmkyNkVFb9pBTD6si9Lw==
-  dependencies:
-    "@jest/console" "^26.0.1"
-    "@jest/environment" "^26.0.1"
-    "@jest/fake-timers" "^26.0.1"
-    "@jest/globals" "^26.0.1"
-    "@jest/source-map" "^26.0.0"
-    "@jest/test-result" "^26.0.1"
-    "@jest/transform" "^26.0.1"
-    "@jest/types" "^26.0.1"
+jest-runtime@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42"
+  integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==
+  dependencies:
+    "@jest/console" "^26.3.0"
+    "@jest/environment" "^26.3.0"
+    "@jest/fake-timers" "^26.3.0"
+    "@jest/globals" "^26.4.2"
+    "@jest/source-map" "^26.3.0"
+    "@jest/test-result" "^26.3.0"
+    "@jest/transform" "^26.3.0"
+    "@jest/types" "^26.3.0"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-config "^26.0.1"
-    jest-haste-map "^26.0.1"
-    jest-message-util "^26.0.1"
-    jest-mock "^26.0.1"
+    jest-config "^26.4.2"
+    jest-haste-map "^26.3.0"
+    jest-message-util "^26.3.0"
+    jest-mock "^26.3.0"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.0.1"
-    jest-snapshot "^26.0.1"
-    jest-util "^26.0.1"
-    jest-validate "^26.0.1"
+    jest-resolve "^26.4.0"
+    jest-snapshot "^26.4.2"
+    jest-util "^26.3.0"
+    jest-validate "^26.4.2"
     slash "^3.0.0"
     strip-bom "^4.0.0"
     yargs "^15.3.1"
@@ -4231,32 +4296,33 @@ jest-serializer@^24.4.0:
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
   integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
 
-jest-serializer@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.0.0.tgz#f6c521ddb976943b93e662c0d4d79245abec72a3"
-  integrity sha512-sQGXLdEGWFAE4wIJ2ZaIDb+ikETlUirEOBsLXdoBbeLhTHkZUJwgk3+M8eyFizhM6le43PDCCKPA1hzkSDo4cQ==
+jest-serializer@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef"
+  integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==
   dependencies:
+    "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.0.1.tgz#1baa942bd83d47b837a84af7fcf5fd4a236da399"
-  integrity sha512-jxd+cF7+LL+a80qh6TAnTLUZHyQoWwEHSUFJjkw35u3Gx+BZUNuXhYvDqHXr62UQPnWo2P6fvQlLjsU93UKyxA==
+jest-snapshot@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6"
+  integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     "@types/prettier" "^2.0.0"
     chalk "^4.0.0"
-    expect "^26.0.1"
+    expect "^26.4.2"
     graceful-fs "^4.2.4"
-    jest-diff "^26.0.1"
-    jest-get-type "^26.0.0"
-    jest-matcher-utils "^26.0.1"
-    jest-message-util "^26.0.1"
-    jest-resolve "^26.0.1"
-    make-dir "^3.0.0"
+    jest-diff "^26.4.2"
+    jest-get-type "^26.3.0"
+    jest-haste-map "^26.3.0"
+    jest-matcher-utils "^26.4.2"
+    jest-message-util "^26.3.0"
+    jest-resolve "^26.4.0"
     natural-compare "^1.4.0"
-    pretty-format "^26.0.1"
+    pretty-format "^26.4.2"
     semver "^7.3.2"
 
 jest-util@^24.8.0:
@@ -4277,16 +4343,17 @@ jest-util@^24.8.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-util@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.0.1.tgz#72c4c51177b695fdd795ca072a6f94e3d7cef00a"
-  integrity sha512-byQ3n7ad1BO/WyFkYvlWQHTsomB6GIewBh8tlGtusiylAlaxQ1UpS0XYH0ngOyhZuHVLN79Qvl6/pMiDMSSG1g==
+jest-util@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e"
+  integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     is-ci "^2.0.0"
-    make-dir "^3.0.0"
+    micromatch "^4.0.2"
 
 jest-validate@^24.7.0, jest-validate@^24.9.0:
   version "24.9.0"
@@ -4300,28 +4367,29 @@ jest-validate@^24.7.0, jest-validate@^24.9.0:
     leven "^3.1.0"
     pretty-format "^24.9.0"
 
-jest-validate@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.0.1.tgz#a62987e1da5b7f724130f904725e22f4e5b2e23c"
-  integrity sha512-u0xRc+rbmov/VqXnX3DlkxD74rHI/CfS5xaV2VpeaVySjbb1JioNVOyly5b56q2l9ZKe7bVG5qWmjfctkQb0bA==
+jest-validate@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c"
+  integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     camelcase "^6.0.0"
     chalk "^4.0.0"
-    jest-get-type "^26.0.0"
+    jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^26.0.1"
+    pretty-format "^26.4.2"
 
-jest-watcher@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.0.1.tgz#5b5e3ebbdf10c240e22a98af66d645631afda770"
-  integrity sha512-pdZPydsS8475f89kGswaNsN3rhP6lnC3/QDCppP7bg1L9JQz7oU9Mb/5xPETk1RHDCWeqmVC47M4K5RR7ejxFw==
+jest-watcher@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08"
+  integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==
   dependencies:
-    "@jest/test-result" "^26.0.1"
-    "@jest/types" "^26.0.1"
+    "@jest/test-result" "^26.3.0"
+    "@jest/types" "^26.3.0"
+    "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.0.1"
+    jest-util "^26.3.0"
     string-length "^4.0.1"
 
 jest-worker@^24.6.0:
@@ -4332,22 +4400,23 @@ jest-worker@^24.6.0:
     merge-stream "^1.0.1"
     supports-color "^6.1.0"
 
-jest-worker@^26.0.0:
-  version "26.0.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.0.0.tgz#4920c7714f0a96c6412464718d0c58a3df3fb066"
-  integrity sha512-pPaYa2+JnwmiZjK9x7p9BoZht+47ecFCDFA/CJxspHzeDvQcfVBLWzCiWyo+EGrSiQMWZtCFo9iSvMZnAAo8vw==
+jest-worker@^26.3.0:
+  version "26.3.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
+  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
   dependencies:
+    "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.0.1.tgz#5c51a2e58dff7525b65f169721767173bf832694"
-  integrity sha512-29Q54kn5Bm7ZGKIuH2JRmnKl85YRigp0o0asTc6Sb6l2ch1DCXIeZTLLFy9ultJvhkTqbswF5DEx4+RlkmCxWg==
+jest@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312"
+  integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==
   dependencies:
-    "@jest/core" "^26.0.1"
+    "@jest/core" "^26.4.2"
     import-local "^3.0.2"
-    jest-cli "^26.0.1"
+    jest-cli "^26.4.2"
 
 jetifier@^1.6.2:
   version "1.6.4"
@@ -5284,16 +5353,16 @@ node-modules-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
-node-notifier@^7.0.0:
-  version "7.0.0"
-  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-7.0.0.tgz#513bc42f2aa3a49fce1980a7ff375957c71f718a"
-  integrity sha512-y8ThJESxsHcak81PGpzWwQKxzk+5YtP3IxR8AYdpXQ1IB6FmcVzFdZXrkPin49F/DKUCfeeiziB8ptY9npzGuA==
+node-notifier@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/node-notifier/-/node-notifier-8.0.0.tgz#a7eee2d51da6d0f7ff5094bc7108c911240c1620"
+  integrity sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==
   dependencies:
     growly "^1.3.0"
-    is-wsl "^2.1.1"
-    semver "^7.2.1"
+    is-wsl "^2.2.0"
+    semver "^7.3.2"
     shellwords "^0.1.1"
-    uuid "^7.0.3"
+    uuid "^8.3.0"
     which "^2.0.2"
 
 node-pre-gyp@^0.10.0:
@@ -5787,12 +5856,12 @@ pretty-format@^25.1.0, pretty-format@^25.2.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-pretty-format@^26.0.1:
-  version "26.0.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.0.1.tgz#a4fe54fe428ad2fd3413ca6bbd1ec8c2e277e197"
-  integrity sha512-SWxz6MbupT3ZSlL0Po4WF/KujhQaVehijR2blyRDCzk9e45EaYMVhMBn49fnRuHxtkSpXTes1GxNpVmH86Bxfw==
+pretty-format@^26.4.2:
+  version "26.4.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237"
+  integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==
   dependencies:
-    "@jest/types" "^26.0.1"
+    "@jest/types" "^26.3.0"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
@@ -6324,7 +6393,7 @@ semver@^6.0.0, semver@^6.1.2, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-semver@^7.2.1, semver@^7.3.2:
+semver@^7.3.2:
   version "7.3.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz#604962b052b81ed0786aae84389ffba70ffd3938"
   integrity sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==
@@ -7183,20 +7252,20 @@ uuid@^3.0.1, uuid@^3.3.2, uuid@^3.3.3:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
-uuid@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-7.0.3.tgz#c5c9f2c8cf25dc0a372c4df1441c41f5bd0c680b"
-  integrity sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==
+uuid@^8.3.0:
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.1.tgz#2ba2e6ca000da60fce5a196954ab241131e05a31"
+  integrity sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==
 
 v8-compile-cache@^2.0.3:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
   integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
-v8-to-istanbul@^4.1.3:
-  version "4.1.3"
-  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz#22fe35709a64955f49a08a7c7c959f6520ad6f20"
-  integrity sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==
+v8-to-istanbul@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5"
+  integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"

From d1ff2572d01a3b986bf923e5e0f7ba5c0db82f15 Mon Sep 17 00:00:00 2001
From: Nick Gerleman <ngerlem@microsoft.com>
Date: Tue, 6 Oct 2020 01:00:42 -0700
Subject: [PATCH 189/241] Publish Custom Flow Library Definitions (#30102)

Summary:
react-native has moved more code to be flow-strict. Part of this move involved adding custom flow-typed definitions for some third-party dependencies where not previously present. These definitions are not currently published, which prevents type-checking some parts of react-native externally.

This change publishes these type definitions as part of the react-native NPM package. Impact to package size is pretty negligible.

## Changelog

[Internal] [Fixed] - Publish Custom Flow Library Definitions

Pull Request resolved: https://github.com/facebook/react-native/pull/30102

Reviewed By: TheSavior

Differential Revision: D24099502

Pulled By: cpojer

fbshipit-source-id: bf3942aa973df4cfc2843ec3e7dbec82623f0447
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 87e533827ec418..c6555adda1c658 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "!template/yarn.lock",
     "cli.js",
     "flow",
+    "flow-typed",
     "index.js",
     "interface.js",
     "jest-preset.js",

From 4eb8bd508414574139939724c6c7267421724354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Tue, 6 Oct 2020 01:42:05 -0700
Subject: [PATCH 190/241] trivial: Remove whitespace in generated output

Summary:
Remove extraneous newlines before and after structs, before copyright headers, and other locations.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24117137

fbshipit-source-id: 194996019b4cadef9239a78334f31c0bc89e3901
---
 .../GenerateModuleObjCpp-test.js.snap         | 357 +-----------------
 .../generators/modules/GenerateModuleCpp.js   |  12 +-
 .../src/generators/modules/GenerateModuleH.js |   6 +-
 .../header/serializeConstantsStruct.js        |   6 +-
 .../header/serializeRegularStruct.js          |  12 +-
 .../modules/GenerateModuleObjCpp/index.js     |  31 +-
 .../source/serializeModule.js                 |  18 +-
 .../GenerateModuleCpp-test.js.snap            |  37 +-
 .../GenerateModuleH-test.js.snap              |  32 +-
 .../GenerateModuleHObjCpp-test.js.snap        | 298 +++------------
 .../GenerateModuleMm-test.js.snap             | 143 +------
 11 files changed, 124 insertions(+), 828 deletions(-)

diff --git a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
index c0df45acc209bc..00621f37af660c 100644
--- a/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
+++ b/packages/react-native-codegen/e2e/__tests__/modules/__snapshots__/GenerateModuleObjCpp-test.js.snap
@@ -1,36 +1,32 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`GenerateModuleObjCpp can generate a header file NativeModule specs 1`] = `
-"
-/**
+"/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
+#import <folly/Optional.h>
+#import <vector>
 
 
 @protocol NativeArrayTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
@@ -53,8 +49,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativeBooleanTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (NSNumber *)getBoolean:(BOOL)arg;
@@ -73,8 +67,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativeCallbackTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getValueWithCallback:(RCTResponseSenderBlock)callback;
@@ -93,8 +85,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativeNullableTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (NSNumber * _Nullable)getBool:(NSNumber *)a;
@@ -118,8 +108,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativeNumberTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (NSNumber *)getNumber:(double)arg;
@@ -137,9 +125,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeObjectTurboModule {
     struct SpecDifficultObjectAE {
@@ -157,8 +142,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectAE)
 + (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectAE:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeObjectTurboModule {
     struct SpecDifficultObjectA {
@@ -176,8 +159,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectA)
 + (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectA:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeObjectTurboModule {
     struct ConstantsEEE {
@@ -207,7 +188,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeObjectTurboModule {
     struct ConstantsEE {
@@ -237,7 +217,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeObjectTurboModule {
     struct ConstantsE {
@@ -267,7 +246,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeObjectTurboModule {
     struct Constants {
@@ -318,9 +296,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeOptionalObjectTurboModule {
     struct ConstantsEEE {
@@ -350,7 +325,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeOptionalObjectTurboModule {
     struct ConstantsEE {
@@ -380,7 +354,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeOptionalObjectTurboModule {
     struct ConstantsE {
@@ -410,7 +383,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeOptionalObjectTurboModule {
     struct Constants {
@@ -459,8 +431,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativePromiseTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getValueWithPromise:(BOOL)error
@@ -482,9 +452,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct SpecGetObjectShapeArg {
@@ -500,8 +467,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetObjectShapeArg:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct Animal {
@@ -517,8 +482,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_Animal:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct Constants {
@@ -581,9 +544,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeSampleTurboModuleArrays {
     struct ConstantsIdElement {
@@ -611,7 +571,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeSampleTurboModuleArrays {
     struct Constants {
@@ -675,9 +634,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeSampleTurboModuleNullable {
     struct SpecGetObjectShapeArg {
@@ -693,8 +649,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModuleNullable_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_SpecGetObjectShapeArg:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModuleNullable {
     struct Animal {
@@ -710,8 +664,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModuleNullable_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_Animal:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModuleNullable {
     struct Constants {
@@ -774,9 +726,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeSampleTurboModuleNullableAndOptional {
     struct SpecGetObjectShapeArg {
@@ -792,8 +741,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModuleNullableAndOptional {
     struct Animal {
@@ -809,8 +756,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_Animal:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModuleNullableAndOptional {
     struct Constants {
@@ -873,9 +818,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeSampleTurboModuleOptional {
     struct SpecGetObjectShapeArg {
@@ -891,8 +833,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModuleOptional_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_SpecGetObjectShapeArg:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModuleOptional {
     struct Animal {
@@ -908,8 +848,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModuleOptional_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_Animal:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModuleOptional {
     struct Constants {
@@ -973,8 +911,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativeStringTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (NSString *)getString:(NSString *)arg;
@@ -997,51 +933,36 @@ namespace facebook {
 
 
 
-
-
-
 inline bool JS::NativeObjectTurboModule::SpecDifficultObjectAE::D() const
 {
   id const p = _v[@\\"D\\"];
   return RCTBridgingToBool(p);
 }
-
-
 inline double JS::NativeObjectTurboModule::SpecDifficultObjectAE::E() const
 {
   id const p = _v[@\\"E\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline NSString *JS::NativeObjectTurboModule::SpecDifficultObjectAE::F() const
 {
   id const p = _v[@\\"F\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline bool JS::NativeObjectTurboModule::SpecDifficultObjectA::D() const
 {
   id const p = _v[@\\"D\\"];
   return RCTBridgingToBool(p);
 }
-
-
 inline JS::NativeObjectTurboModule::SpecDifficultObjectAE JS::NativeObjectTurboModule::SpecDifficultObjectA::E() const
 {
   id const p = _v[@\\"E\\"];
   return JS::NativeObjectTurboModule::SpecDifficultObjectAE(p);
 }
-
-
 inline NSString *JS::NativeObjectTurboModule::SpecDifficultObjectA::F() const
 {
   id const p = _v[@\\"F\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline JS::NativeObjectTurboModule::ConstantsEEE::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D.get();
@@ -1055,7 +976,6 @@ inline JS::NativeObjectTurboModule::ConstantsEEE::Builder::Builder(const Input i
 inline JS::NativeObjectTurboModule::ConstantsEEE::Builder::Builder(ConstantsEEE i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeObjectTurboModule::ConstantsEE::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D.get();
@@ -1069,7 +989,6 @@ inline JS::NativeObjectTurboModule::ConstantsEE::Builder::Builder(const Input i)
 inline JS::NativeObjectTurboModule::ConstantsEE::Builder::Builder(ConstantsEE i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeObjectTurboModule::ConstantsE::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D.get();
@@ -1083,7 +1002,6 @@ inline JS::NativeObjectTurboModule::ConstantsE::Builder::Builder(const Input i)
 inline JS::NativeObjectTurboModule::ConstantsE::Builder::Builder(ConstantsE i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeObjectTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D.get();
@@ -1097,7 +1015,6 @@ inline JS::NativeObjectTurboModule::Constants::Builder::Builder(const Input i) :
 inline JS::NativeObjectTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D;
@@ -1111,7 +1028,6 @@ inline JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder::Builder(const
 inline JS::NativeOptionalObjectTurboModule::ConstantsEEE::Builder::Builder(ConstantsEEE i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D;
@@ -1125,7 +1041,6 @@ inline JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder::Builder(const
 inline JS::NativeOptionalObjectTurboModule::ConstantsEE::Builder::Builder(ConstantsEE i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeOptionalObjectTurboModule::ConstantsE::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D;
@@ -1139,7 +1054,6 @@ inline JS::NativeOptionalObjectTurboModule::ConstantsE::Builder::Builder(const I
 inline JS::NativeOptionalObjectTurboModule::ConstantsE::Builder::Builder(ConstantsE i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeOptionalObjectTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto D = i.D;
@@ -1156,21 +1070,16 @@ inline JS::NativeOptionalObjectTurboModule::Constants::Builder::Builder(Constant
   return i.unsafeRawValue();
 }) {}
 
-
 inline double JS::NativeSampleTurboModule::SpecGetObjectShapeArg::prop() const
 {
   id const p = _v[@\\"prop\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline NSString *JS::NativeSampleTurboModule::Animal::name() const
 {
   id const p = _v[@\\"name\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto const1 = i.const1.get();
@@ -1184,7 +1093,6 @@ inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) :
 inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto prop = i.prop.get();
@@ -1194,7 +1102,6 @@ inline JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder::Builder(c
 inline JS::NativeSampleTurboModuleArrays::ConstantsIdElement::Builder::Builder(ConstantsIdElement i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto const1 = i.const1.get();
@@ -1210,21 +1117,16 @@ inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(const Inpu
 inline JS::NativeSampleTurboModuleArrays::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline folly::Optional<double> JS::NativeSampleTurboModuleNullable::SpecGetObjectShapeArg::prop() const
 {
   id const p = _v[@\\"prop\\"];
   return RCTBridgingToOptionalDouble(p);
 }
-
-
 inline NSString *JS::NativeSampleTurboModuleNullable::Animal::name() const
 {
   id const p = _v[@\\"name\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline JS::NativeSampleTurboModuleNullable::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto const1 = i.const1.get();
@@ -1238,21 +1140,16 @@ inline JS::NativeSampleTurboModuleNullable::Constants::Builder::Builder(const In
 inline JS::NativeSampleTurboModuleNullable::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline folly::Optional<double> JS::NativeSampleTurboModuleNullableAndOptional::SpecGetObjectShapeArg::prop() const
 {
   id const p = _v[@\\"prop\\"];
   return RCTBridgingToOptionalDouble(p);
 }
-
-
 inline NSString *JS::NativeSampleTurboModuleNullableAndOptional::Animal::name() const
 {
   id const p = _v[@\\"name\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto const1 = i.const1;
@@ -1266,21 +1163,16 @@ inline JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder::Build
 inline JS::NativeSampleTurboModuleNullableAndOptional::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-
 inline folly::Optional<double> JS::NativeSampleTurboModuleOptional::SpecGetObjectShapeArg::prop() const
 {
   id const p = _v[@\\"prop\\"];
   return RCTBridgingToOptionalDouble(p);
 }
-
-
 inline NSString *JS::NativeSampleTurboModuleOptional::Animal::name() const
 {
   id const p = _v[@\\"name\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline JS::NativeSampleTurboModuleOptional::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto const1 = i.const1;
@@ -1299,14 +1191,13 @@ inline JS::NativeSampleTurboModuleOptional::Constants::Builder::Builder(Constant
 `;
 
 exports[`GenerateModuleObjCpp can generate an implementation file NativeModule specs 1`] = `
-"
-/**
+"/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -1316,7 +1207,6 @@ exports[`GenerateModuleObjCpp can generate an implementation file NativeModule s
 #import \\"RNCodegenModuleFixtures.h\\"
 
 
-
 namespace facebook {
   namespace react {
     
@@ -1324,37 +1214,29 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI_getReadOnlyArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getReadOnlyArray\\", @selector(getReadOnlyArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeArrayTurboModuleSpecJSI_getArrayWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArrayWithAlias\\", @selector(getArrayWithAlias:b:), args, count);
     }
 
-
     NativeArrayTurboModuleSpecJSI::NativeArrayTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeArrayTurboModuleSpecJSI_getArray};
         
-
         
         methodMap_[\\"getReadOnlyArray\\"] = MethodMetadata {1, __hostFunction_NativeArrayTurboModuleSpecJSI_getReadOnlyArray};
         
-
         
         methodMap_[\\"getArrayWithAlias\\"] = MethodMetadata {2, __hostFunction_NativeArrayTurboModuleSpecJSI_getArrayWithAlias};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -1362,28 +1244,22 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBoolean\\", @selector(getBoolean:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeBooleanTurboModuleSpecJSI_getBooleanWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBooleanWithAlias\\", @selector(getBooleanWithAlias:), args, count);
     }
 
-
     NativeBooleanTurboModuleSpecJSI::NativeBooleanTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getBoolean\\"] = MethodMetadata {1, __hostFunction_NativeBooleanTurboModuleSpecJSI_getBoolean};
         
-
         
         methodMap_[\\"getBooleanWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeBooleanTurboModuleSpecJSI_getBooleanWithAlias};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -1391,28 +1267,22 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallbackWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallbackWithAlias\\", @selector(getValueWithCallbackWithAlias:), args, count);
     }
 
-
     NativeCallbackTurboModuleSpecJSI::NativeCallbackTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallback};
         
-
         
         methodMap_[\\"getValueWithCallbackWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeCallbackTurboModuleSpecJSI_getValueWithCallbackWithAlias};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -1420,64 +1290,50 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeNullableTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:reject:), args, count);
     }
 
-
     NativeNullableTurboModuleSpecJSI::NativeNullableTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getBool};
         
-
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getString};
         
-
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getArray};
         
-
         
         methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeNullableTurboModuleSpecJSI_getObject};
         
-
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {0, __hostFunction_NativeNullableTurboModuleSpecJSI_getValueWithPromise};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -1485,43 +1341,33 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeNumberTurboModuleSpecJSI_getNumberWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumberWithAlias\\", @selector(getNumberWithAlias:), args, count);
     }
 
-
     NativeNumberTurboModuleSpecJSI::NativeNumberTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeNumberTurboModuleSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getNumberWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeNumberTurboModuleSpecJSI_getNumberWithAlias};
         
-
     }
   } // namespace react
 } // namespace facebook
-
-
-
 @implementation RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectAE)
 + (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectAE:(id)json
 {
   return facebook::react::managedPointer<JS::NativeObjectTurboModule::SpecDifficultObjectAE>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeObjectTurboModule_SpecDifficultObjectA)
 + (RCTManagedPointer *)JS_NativeObjectTurboModule_SpecDifficultObjectA:(id)json
 {
   return facebook::react::managedPointer<JS::NativeObjectTurboModule::SpecDifficultObjectA>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -1529,55 +1375,43 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObject\\", @selector(getGenericObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectReadOnly(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObjectReadOnly\\", @selector(getGenericObjectReadOnly:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getGenericObjectWithAlias\\", @selector(getGenericObjectWithAlias:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_difficultObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"difficultObject\\", @selector(difficultObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeObjectTurboModuleSpecJSI::NativeObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getGenericObject\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObject};
         
-
         
         methodMap_[\\"getGenericObjectReadOnly\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectReadOnly};
         
-
         
         methodMap_[\\"getGenericObjectWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_getGenericObjectWithAlias};
         
-
         
         methodMap_[\\"difficultObject\\"] = MethodMetadata {1, __hostFunction_NativeObjectTurboModuleSpecJSI_difficultObject};
         setMethodArgConversionSelector(@\\"difficultObject\\", 0, @\\"JS_NativeObjectTurboModule_SpecDifficultObjectA:\\");
-
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeObjectTurboModuleSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -1585,19 +1419,15 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeOptionalObjectTurboModuleSpecJSI::NativeOptionalObjectTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeOptionalObjectTurboModuleSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -1605,43 +1435,33 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromiseWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromiseWithAlias\\", @selector(getValueWithPromiseWithAlias:resolve:reject:), args, count);
     }
 
-
     NativePromiseTurboModuleSpecJSI::NativePromiseTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromise};
         
-
         
         methodMap_[\\"getValueWithPromiseWithAlias\\"] = MethodMetadata {1, __hostFunction_NativePromiseTurboModuleSpecJSI_getValueWithPromiseWithAlias};
         
-
     }
   } // namespace react
 } // namespace facebook
-
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetObjectShapeArg:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecGetObjectShapeArg>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_Animal:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::Animal>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -1649,127 +1469,99 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:getValuegetValuegetValuegetValuegetValuey:z:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
-
         
         methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
         
-
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
         
-
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
         
-
         
         methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
         
-
         
         methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObjectShape};
         setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetObjectShapeArg:\\");
-
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getAlias};
         setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModule_Animal:\\");
-
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
         
-
         
         methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
         
-
         
         methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
         
-
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
         
-
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -1777,142 +1569,110 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeSampleTurboModuleArraysSpecJSI::NativeSampleTurboModuleArraysSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_voidFunc};
         
-
         
         methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getBool};
         
-
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getString};
         
-
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getArray};
         
-
         
         methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObject};
         
-
         
         methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getObjectShape};
         
-
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getAlias};
         
-
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getRootTag};
         
-
         
         methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValue};
         
-
         
         methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithCallback};
         
-
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getValueWithPromise};
         
-
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleArraysSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
-
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModuleNullable_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_SpecGetObjectShapeArg:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullable::SpecGetObjectShapeArg>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModuleNullable_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullable_Animal:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullable::Animal>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -1920,142 +1680,110 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeSampleTurboModuleNullableSpecJSI::NativeSampleTurboModuleNullableSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_voidFunc};
         
-
         
         methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getBool};
         
-
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getString};
         
-
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getArray};
         
-
         
         methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObject};
         
-
         
         methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getObjectShape};
         setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModuleNullable_SpecGetObjectShapeArg:\\");
-
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getAlias};
         setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullable_Animal:\\");
-
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getRootTag};
         
-
         
         methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValue};
         
-
         
         methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithCallback};
         
-
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getValueWithPromise};
         
-
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
-
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullableAndOptional::SpecGetObjectShapeArg>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModuleNullableAndOptional_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleNullableAndOptional_Animal:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModuleNullableAndOptional::Animal>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -2063,142 +1791,110 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeSampleTurboModuleNullableAndOptionalSpecJSI::NativeSampleTurboModuleNullableAndOptionalSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_voidFunc};
         
-
         
         methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getBool};
         
-
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getString};
         
-
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getArray};
         
-
         
         methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObject};
         
-
         
         methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getObjectShape};
         setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModuleNullableAndOptional_SpecGetObjectShapeArg:\\");
-
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getAlias};
         setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleNullableAndOptional_Animal:\\");
-
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getRootTag};
         
-
         
         methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValue};
         
-
         
         methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithCallback};
         
-
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getValueWithPromise};
         
-
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleNullableAndOptionalSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
-
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModuleOptional_SpecGetObjectShapeArg)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_SpecGetObjectShapeArg:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModuleOptional::SpecGetObjectShapeArg>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModuleOptional_Animal)
 + (RCTManagedPointer *)JS_NativeSampleTurboModuleOptional_Animal:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModuleOptional::Animal>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -2206,127 +1902,99 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObjectShape(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObjectShape\\", @selector(getObjectShape:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getAlias\\", @selector(getAlias:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeSampleTurboModuleOptionalSpecJSI::NativeSampleTurboModuleOptionalSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_voidFunc};
         
-
         
         methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getBool};
         
-
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getString};
         
-
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getArray};
         
-
         
         methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObject};
         
-
         
         methodMap_[\\"getObjectShape\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getObjectShape};
         setMethodArgConversionSelector(@\\"getObjectShape\\", 0, @\\"JS_NativeSampleTurboModuleOptional_SpecGetObjectShapeArg:\\");
-
         
         methodMap_[\\"getAlias\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getAlias};
         setMethodArgConversionSelector(@\\"getAlias\\", 0, @\\"JS_NativeSampleTurboModuleOptional_Animal:\\");
-
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getRootTag};
         
-
         
         methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValue};
         
-
         
         methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithCallback};
         
-
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getValueWithPromise};
         
-
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleOptionalSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -2334,25 +2002,20 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeStringTurboModuleSpecJSI_getStringWithAlias(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getStringWithAlias\\", @selector(getStringWithAlias:), args, count);
     }
 
-
     NativeStringTurboModuleSpecJSI::NativeStringTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeStringTurboModuleSpecJSI_getString};
         
-
         
         methodMap_[\\"getStringWithAlias\\"] = MethodMetadata {1, __hostFunction_NativeStringTurboModuleSpecJSI_getStringWithAlias};
         
-
     }
   } // namespace react
 } // namespace facebook
-
 "
 `;
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
index 55abfbf6ded5a8..79bde01c4e28a4 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleCpp.js
@@ -28,13 +28,11 @@ const propertyHeaderTemplate =
 const propertyCastTemplate =
   'static_cast<Native::_MODULE_NAME_::CxxSpecJSI *>(&turboModule)->::_PROPERTY_NAME_::(rt::_ARGS_::);';
 
-const nonvoidPropertyTemplate = `
-${propertyHeaderTemplate}
+const nonvoidPropertyTemplate = `${propertyHeaderTemplate}
   return ${propertyCastTemplate}
 }`.trim();
 
-const voidPropertyTemplate = `
-${propertyHeaderTemplate}
+const voidPropertyTemplate = `${propertyHeaderTemplate}
   ${propertyCastTemplate}
   return jsi::Value::undefined();
 }`;
@@ -42,16 +40,14 @@ ${propertyHeaderTemplate}
 const proprertyDefTemplate =
   '  methodMap_["::_PROPERTY_NAME_::"] = MethodMetadata {::_ARGS_COUNT_::, __hostFunction_Native::_MODULE_NAME_::CxxSpecJSI_::_PROPERTY_NAME_::};';
 
-const moduleTemplate = `
-::_MODULE_PROPERTIES_::
+const moduleTemplate = `::_MODULE_PROPERTIES_::
 
 Native::_MODULE_NAME_::CxxSpecJSI::Native::_MODULE_NAME_::CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
   : TurboModule("::_MODULE_NAME_::", jsInvoker) {
 ::_PROPERTIES_MAP_::
 }`.trim();
 
-const template = `
-/**
+const template = `/**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
index b49426b2e8e27e..7a4f472ff9f847 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleH.js
@@ -22,8 +22,7 @@ const {unwrapNullable} = require('../../parsers/flow/modules/utils');
 
 type FilesOutput = Map<string, string>;
 
-const moduleTemplate = `
-class JSI_EXPORT Native::_MODULE_NAME_::CxxSpecJSI : public TurboModule {
+const moduleTemplate = `class JSI_EXPORT Native::_MODULE_NAME_::CxxSpecJSI : public TurboModule {
 protected:
   Native::_MODULE_NAME_::CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
 
@@ -32,8 +31,7 @@ public:
 
 };`;
 
-const template = `
-/**
+const template = `/**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
index 1d3ddb9755f436..179ab9ad339158 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeConstantsStruct.js
@@ -30,8 +30,7 @@ const StructTemplate = ({
   moduleName: string,
   structName: string,
   builderInputProps: string,
-|}>) => `
-namespace JS {
+|}>) => `namespace JS {
   namespace Native${moduleName} {
     struct ${structName} {
 
@@ -67,8 +66,7 @@ const MethodTemplate = ({
   moduleName: string,
   structName: string,
   properties: string,
-|}>) => `
-inline JS::Native${moduleName}::${structName}::Builder::Builder(const Input i) : _factory(^{
+|}>) => `inline JS::Native${moduleName}::${structName}::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
 ${properties}
   return d;
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
index 76e9fa28646e5e..f932bd5c465f65 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/header/serializeRegularStruct.js
@@ -30,8 +30,7 @@ const StructTemplate = ({
   moduleName: string,
   structName: string,
   structProperties: string,
-|}>) => `
-namespace JS {
+|}>) => `namespace JS {
   namespace Native${moduleName} {
     struct ${structName} {
       ${structProperties}
@@ -45,8 +44,7 @@ namespace JS {
 
 @interface RCTCxxConvert (Native${moduleName}_${structName})
 + (RCTManagedPointer *)JS_Native${moduleName}_${structName}:(id)json;
-@end
-`;
+@end`;
 
 const MethodTemplate = ({
   returnType,
@@ -60,13 +58,11 @@ const MethodTemplate = ({
   moduleName: string,
   structName: string,
   propertyName: string,
-|}>) => `
-inline ${returnType}JS::Native${moduleName}::${structName}::${propertyName}() const
+|}>) => `inline ${returnType}JS::Native${moduleName}::${structName}::${propertyName}() const
 {
   id const p = _v[@"${propertyName}"];
   return ${returnValue};
-}
-`;
+}`;
 
 function toObjCType(
   moduleName: string,
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
index ee2d5e1e42d375..76905bbf3dff96 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/index.js
@@ -30,8 +30,7 @@ const ModuleDeclarationTemplate = ({
   moduleName: string,
   structDeclarations: string,
   protocolMethods: string,
-|}>) => `
-${structDeclarations}
+|}>) => `${structDeclarations}
 @protocol Native${moduleName}Spec <RCTBridgeModule, RCTTurboModule>
 
 ${protocolMethods}
@@ -47,8 +46,7 @@ namespace facebook {
       Native${moduleName}SpecJSI(const ObjCTurboModule::InitParams &params);
     };
   } // namespace react
-} // namespace facebook
-`;
+} // namespace facebook`;
 
 const HeaderFileTemplate = ({
   moduleDeclarations,
@@ -56,38 +54,34 @@ const HeaderFileTemplate = ({
 }: $ReadOnly<{|
   moduleDeclarations: string,
   structInlineMethods: string,
-|}>) => `
-/**
+|}>) => `/**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * ${'@'}generated by codegen project: GenerateModuleHObjCpp.js
+ * ${'@'}generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
+#import <folly/Optional.h>
+#import <vector>
 
 ${moduleDeclarations}
-
 ${structInlineMethods}
 `;
 
@@ -97,14 +91,13 @@ const SourceFileTemplate = ({
 }: $ReadOnly<{|
   headerFileName: string,
   moduleImplementations: string,
-|}>) => `
-/**
+|}>) => `/**
  * ${'C'}opyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * ${'@'}generated by an internal genrule from Flow types.
+ * ${'@'}generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
index 72013475009fbe..de22c2a2b1e3e1 100644
--- a/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
+++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleObjCpp/source/serializeModule.js
@@ -24,8 +24,7 @@ const ModuleTemplate = ({
   moduleName: string,
   structs: $ReadOnlyArray<Struct>,
   methodSerializationOutputs: $ReadOnlyArray<MethodSerializationOutput>,
-|}>) => `
-${structs
+|}>) => `${structs
   .map(struct =>
     RCTCxxConvertCategoryTemplate({moduleName, structName: struct.name}),
   )
@@ -57,8 +56,7 @@ namespace facebook {
           .join('\n' + ' '.repeat(8))}
     }
   } // namespace react
-} // namespace facebook
-`;
+} // namespace facebook`;
 
 const RCTCxxConvertCategoryTemplate = ({
   moduleName,
@@ -66,14 +64,12 @@ const RCTCxxConvertCategoryTemplate = ({
 }: $ReadOnly<{|
   moduleName: string,
   structName: string,
-|}>) => `
-@implementation RCTCxxConvert (Native${moduleName}_${structName})
+|}>) => `@implementation RCTCxxConvert (Native${moduleName}_${structName})
 + (RCTManagedPointer *)JS_Native${moduleName}_${structName}:(id)json
 {
   return facebook::react::managedPointer<JS::Native${moduleName}::${structName}>(json);
 }
-@end
-`;
+@end`;
 
 const InlineHostFunctionTemplate = ({
   moduleName,
@@ -88,8 +84,7 @@ const InlineHostFunctionTemplate = ({
 |}>) => `
     static facebook::jsi::Value __hostFunction_Native${moduleName}SpecJSI_${methodName}(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ${returnJSType}, "${methodName}", ${selector}, args, count);
-    }
-`;
+    }`;
 
 const MethodMapEntryTemplate = ({
   moduleName,
@@ -107,8 +102,7 @@ const MethodMapEntryTemplate = ({
           .map(({paramIndex, structName}) => {
             return `setMethodArgConversionSelector(@"${methodName}", ${paramIndex}, @"JS_Native${moduleName}_${structName}:");`;
           })
-          .join('\n' + ' '.repeat(8))}
-`;
+          .join('\n' + ' '.repeat(8))}`;
 
 function serializeModuleSource(
   moduleName: string,
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap
index 41d445cb0895b1..a9d6e0d5307672 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleCpp-test.js.snap
@@ -2,8 +2,7 @@
 
 exports[`GenerateModuleCpp can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "NativeModules.cpp" => "
-/**
+  "NativeModules.cpp" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -20,17 +19,14 @@ namespace react {
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_difficult(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->difficult(rt, args[0].getObject(rt));
 }
-
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionals(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->optionals(rt, args[0].getObject(rt));
   return jsi::Value::undefined();
 }
-
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_optionalMethod(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->optionalMethod(rt, args[0].getObject(rt), std::move(args[1].getObject(rt).getFunction(rt)), args[2].getObject(rt).getArray(rt));
   return jsi::Value::undefined();
 }
-
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getArrays(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getArrays(rt, args[0].getObject(rt));
   return jsi::Value::undefined();
@@ -53,8 +49,7 @@ NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared
 
 exports[`GenerateModuleCpp can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "NativeModules.cpp" => "
-/**
+  "NativeModules.cpp" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -84,8 +79,7 @@ NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared
 
 exports[`GenerateModuleCpp can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "NativeModules.cpp" => "
-/**
+  "NativeModules.cpp" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -102,7 +96,6 @@ namespace react {
 static jsi::Value __hostFunction_NativeAliasTurboModuleCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeAliasTurboModuleCxxSpecJSI *>(&turboModule)->getConstants(rt);
 }
-
 static jsi::Value __hostFunction_NativeAliasTurboModuleCxxSpecJSI_cropImage(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeAliasTurboModuleCxxSpecJSI *>(&turboModule)->cropImage(rt, args[0].getObject(rt));
   return jsi::Value::undefined();
@@ -123,8 +116,7 @@ NativeAliasTurboModuleCxxSpecJSI::NativeAliasTurboModuleCxxSpecJSI(std::shared_p
 
 exports[`GenerateModuleCpp can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "NativeModules.cpp" => "
-/**
+  "NativeModules.cpp" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -158,7 +150,6 @@ NativeCameraRollManagerCxxSpecJSI::NativeCameraRollManagerCxxSpecJSI(std::shared
   methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {2, __hostFunction_NativeCameraRollManagerCxxSpecJSI_saveToCameraRoll};
   methodMap_[\\"deletePhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerCxxSpecJSI_deletePhotos};
 }
-
 static jsi::Value __hostFunction_NativeImagePickerIOSCxxSpecJSI_openCameraDialog(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeImagePickerIOSCxxSpecJSI *>(&turboModule)->openCameraDialog(rt, args[0].getObject(rt), std::move(args[1].getObject(rt).getFunction(rt)), std::move(args[2].getObject(rt).getFunction(rt)));
   return jsi::Value::undefined();
@@ -168,27 +159,22 @@ NativeImagePickerIOSCxxSpecJSI::NativeImagePickerIOSCxxSpecJSI(std::shared_ptr<C
   : TurboModule(\\"ImagePickerIOS\\", jsInvoker) {
   methodMap_[\\"openCameraDialog\\"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSCxxSpecJSI_openCameraDialog};
 }
-
 static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportFatalException(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->reportFatalException(rt, args[0].getString(rt), args[1].getObject(rt).getArray(rt), args[2].getNumber());
   return jsi::Value::undefined();
 }
-
 static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportSoftException(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->reportSoftException(rt, args[0].getString(rt), args[1].getObject(rt).getArray(rt), args[2].getNumber());
   return jsi::Value::undefined();
 }
-
 static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_reportException(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->reportException(rt, args[0].getObject(rt));
   return jsi::Value::undefined();
 }
-
 static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_updateExceptionMessage(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->updateExceptionMessage(rt, args[0].getString(rt), args[1].getObject(rt).getArray(rt), args[2].getNumber());
   return jsi::Value::undefined();
 }
-
 static jsi::Value __hostFunction_NativeExceptionsManagerCxxSpecJSI_dismissRedbox(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeExceptionsManagerCxxSpecJSI *>(&turboModule)->dismissRedbox(rt);
   return jsi::Value::undefined();
@@ -212,8 +198,7 @@ NativeExceptionsManagerCxxSpecJSI::NativeExceptionsManagerCxxSpecJSI(std::shared
 
 exports[`GenerateModuleCpp can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "NativeModules.cpp" => "
-/**
+  "NativeModules.cpp" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -230,7 +215,6 @@ namespace react {
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getConstants(rt);
 }
-
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(rt);
   return jsi::Value::undefined();
@@ -256,7 +240,6 @@ static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getRootTag(js
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValue(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValue(rt, args[0].getNumber(), args[1].getString(rt), args[2].getObject(rt));
 }
-
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_getValueWithCallback(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->getValueWithCallback(rt, std::move(args[0].getObject(rt).getFunction(rt)));
   return jsi::Value::undefined();
@@ -289,8 +272,7 @@ NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared
 
 exports[`GenerateModuleCpp can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "NativeModules.cpp" => "
-/**
+  "NativeModules.cpp" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -304,7 +286,6 @@ Map {
 namespace facebook {
 namespace react {
 
-
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(rt);
   return jsi::Value::undefined();
@@ -317,7 +298,6 @@ NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared
 static jsi::Value __hostFunction_NativeSample2TurboModuleCxxSpecJSI_getConstants(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   return static_cast<NativeSample2TurboModuleCxxSpecJSI *>(&turboModule)->getConstants(rt);
 }
-
 static jsi::Value __hostFunction_NativeSample2TurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSample2TurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(rt);
   return jsi::Value::undefined();
@@ -338,8 +318,7 @@ NativeSample2TurboModuleCxxSpecJSI::NativeSample2TurboModuleCxxSpecJSI(std::shar
 
 exports[`GenerateModuleCpp can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "NativeModules.cpp" => "
-/**
+  "NativeModules.cpp" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -353,7 +332,6 @@ Map {
 namespace facebook {
 namespace react {
 
-
 static jsi::Value __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSampleTurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(rt);
   return jsi::Value::undefined();
@@ -363,7 +341,6 @@ NativeSampleTurboModuleCxxSpecJSI::NativeSampleTurboModuleCxxSpecJSI(std::shared
   : TurboModule(\\"SampleTurboModule\\", jsInvoker) {
   methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleCxxSpecJSI_voidFunc};
 }
-
 static jsi::Value __hostFunction_NativeSample2TurboModuleCxxSpecJSI_voidFunc(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {
   static_cast<NativeSample2TurboModuleCxxSpecJSI *>(&turboModule)->voidFunc(rt);
   return jsi::Value::undefined();
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
index 4e55a6343121fe..c4dec4401fdc23 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleH-test.js.snap
@@ -2,8 +2,7 @@
 
 exports[`GenerateModuleH can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "NativeModules.h" => "
-/**
+  "NativeModules.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -18,7 +17,6 @@ Map {
 
 namespace facebook {
 namespace react {
-
 class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -39,8 +37,7 @@ virtual void getArrays(jsi::Runtime &rt, const jsi::Object &options) = 0;
 
 exports[`GenerateModuleH can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "NativeModules.h" => "
-/**
+  "NativeModules.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -55,7 +52,6 @@ Map {
 
 namespace facebook {
 namespace react {
-
 class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -73,8 +69,7 @@ public:
 
 exports[`GenerateModuleH can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "NativeModules.h" => "
-/**
+  "NativeModules.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -89,7 +84,6 @@ Map {
 
 namespace facebook {
 namespace react {
-
 class JSI_EXPORT NativeAliasTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeAliasTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -108,8 +102,7 @@ virtual void cropImage(jsi::Runtime &rt, const jsi::Object &cropData) = 0;
 
 exports[`GenerateModuleH can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "NativeModules.h" => "
-/**
+  "NativeModules.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -124,7 +117,6 @@ Map {
 
 namespace facebook {
 namespace react {
-
 class JSI_EXPORT NativeCameraRollManagerCxxSpecJSI : public TurboModule {
 protected:
   NativeCameraRollManagerCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -136,7 +128,6 @@ virtual jsi::Value saveToCameraRoll(jsi::Runtime &rt, const jsi::String &uri, co
 virtual jsi::Value deletePhotos(jsi::Runtime &rt, const jsi::Array &assets) = 0;
 
 };
-
 class JSI_EXPORT NativeImagePickerIOSCxxSpecJSI : public TurboModule {
 protected:
   NativeImagePickerIOSCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -145,7 +136,6 @@ public:
 virtual void openCameraDialog(jsi::Runtime &rt, const jsi::Object &config, const jsi::Function &successCallback, const jsi::Function &cancelCallback) = 0;
 
 };
-
 class JSI_EXPORT NativeExceptionsManagerCxxSpecJSI : public TurboModule {
 protected:
   NativeExceptionsManagerCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -167,8 +157,7 @@ virtual void dismissRedbox(jsi::Runtime &rt) = 0;
 
 exports[`GenerateModuleH can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "NativeModules.h" => "
-/**
+  "NativeModules.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -183,7 +172,6 @@ Map {
 
 namespace facebook {
 namespace react {
-
 class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -211,8 +199,7 @@ virtual jsi::Value getValueWithPromise(jsi::Runtime &rt, bool error) = 0;
 
 exports[`GenerateModuleH can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "NativeModules.h" => "
-/**
+  "NativeModules.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -227,7 +214,6 @@ Map {
 
 namespace facebook {
 namespace react {
-
 class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -236,7 +222,6 @@ public:
 virtual void voidFunc(jsi::Runtime &rt) = 0;
 
 };
-
 class JSI_EXPORT NativeSample2TurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -255,8 +240,7 @@ virtual void voidFunc(jsi::Runtime &rt) = 0;
 
 exports[`GenerateModuleH can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "NativeModules.h" => "
-/**
+  "NativeModules.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -271,7 +255,6 @@ Map {
 
 namespace facebook {
 namespace react {
-
 class JSI_EXPORT NativeSampleTurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSampleTurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
@@ -280,7 +263,6 @@ public:
 virtual void voidFunc(jsi::Runtime &rt) = 0;
 
 };
-
 class JSI_EXPORT NativeSample2TurboModuleCxxSpecJSI : public TurboModule {
 protected:
   NativeSample2TurboModuleCxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
index 3e71d06832abc1..aee4f5f853fe00 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleHObjCpp-test.js.snap
@@ -2,37 +2,32 @@
 
 exports[`GenerateModuleHObjCpp can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
-
+#import <folly/Optional.h>
+#import <vector>
 
 namespace JS {
   namespace NativeSampleTurboModule {
@@ -52,8 +47,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_SpecDifficultAE)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultAE:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct SpecDifficultA {
@@ -71,8 +64,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_SpecDifficultA)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultA:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct SpecOptionalsAOptionalObjectProperty {
@@ -89,8 +80,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct SpecOptionalsA {
@@ -110,8 +99,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsA)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsA:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct SpecGetArraysOptionsArrayOfObjectsElement {
@@ -127,8 +114,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeSampleTurboModule {
     struct SpecGetArraysOptions {
@@ -148,7 +133,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptions)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptions:(id)json;
 @end
-
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (NSDictionary *)difficult:(JS::NativeSampleTurboModule::SpecDifficultA &)A;
@@ -170,184 +154,138 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 inline bool JS::NativeSampleTurboModule::SpecDifficultAE::D() const
 {
   id const p = _v[@\\"D\\"];
   return RCTBridgingToBool(p);
 }
-
-
 inline double JS::NativeSampleTurboModule::SpecDifficultAE::E() const
 {
   id const p = _v[@\\"E\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline NSString *JS::NativeSampleTurboModule::SpecDifficultAE::F() const
 {
   id const p = _v[@\\"F\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline double JS::NativeSampleTurboModule::SpecDifficultAE::id_() const
 {
   id const p = _v[@\\"id_\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline bool JS::NativeSampleTurboModule::SpecDifficultA::D() const
 {
   id const p = _v[@\\"D\\"];
   return RCTBridgingToBool(p);
 }
-
-
 inline JS::NativeSampleTurboModule::SpecDifficultAE JS::NativeSampleTurboModule::SpecDifficultA::E() const
 {
   id const p = _v[@\\"E\\"];
   return JS::NativeSampleTurboModule::SpecDifficultAE(p);
 }
-
-
 inline NSString *JS::NativeSampleTurboModule::SpecDifficultA::F() const
 {
   id const p = _v[@\\"F\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline double JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty::x() const
 {
   id const p = _v[@\\"x\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline double JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty::y() const
 {
   id const p = _v[@\\"y\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline folly::Optional<double> JS::NativeSampleTurboModule::SpecOptionalsA::optionalNumberProperty() const
 {
   id const p = _v[@\\"optionalNumberProperty\\"];
   return RCTBridgingToOptionalDouble(p);
 }
-
-
 inline folly::Optional<facebook::react::LazyVector<double>> JS::NativeSampleTurboModule::SpecOptionalsA::optionalArrayProperty() const
 {
   id const p = _v[@\\"optionalArrayProperty\\"];
   return RCTBridgingToOptionalVec(p, ^double(id itemValue_0) { return RCTBridgingToDouble(itemValue_0); });
 }
-
-
 inline folly::Optional<JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty> JS::NativeSampleTurboModule::SpecOptionalsA::optionalObjectProperty() const
 {
   id const p = _v[@\\"optionalObjectProperty\\"];
   return (p == nil ? folly::none : folly::make_optional(JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty(p)));
 }
-
-
 inline id<NSObject> _Nullable JS::NativeSampleTurboModule::SpecOptionalsA::optionalGenericObjectProperty() const
 {
   id const p = _v[@\\"optionalGenericObjectProperty\\"];
   return p;
 }
-
-
 inline folly::Optional<bool> JS::NativeSampleTurboModule::SpecOptionalsA::optionalBooleanTypeProperty() const
 {
   id const p = _v[@\\"optionalBooleanTypeProperty\\"];
   return RCTBridgingToOptionalBool(p);
 }
-
-
 inline double JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement::numberProperty() const
 {
   id const p = _v[@\\"numberProperty\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline facebook::react::LazyVector<double> JS::NativeSampleTurboModule::SpecGetArraysOptions::arrayOfNumbers() const
 {
   id const p = _v[@\\"arrayOfNumbers\\"];
   return RCTBridgingToVec(p, ^double(id itemValue_0) { return RCTBridgingToDouble(itemValue_0); });
 }
-
-
 inline folly::Optional<facebook::react::LazyVector<double>> JS::NativeSampleTurboModule::SpecGetArraysOptions::optionalArrayOfNumbers() const
 {
   id const p = _v[@\\"optionalArrayOfNumbers\\"];
   return RCTBridgingToOptionalVec(p, ^double(id itemValue_0) { return RCTBridgingToDouble(itemValue_0); });
 }
-
-
 inline facebook::react::LazyVector<NSString *> JS::NativeSampleTurboModule::SpecGetArraysOptions::arrayOfStrings() const
 {
   id const p = _v[@\\"arrayOfStrings\\"];
   return RCTBridgingToVec(p, ^NSString *(id itemValue_0) { return RCTBridgingToString(itemValue_0); });
 }
-
-
 inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeSampleTurboModule::SpecGetArraysOptions::optionalArrayOfStrings() const
 {
   id const p = _v[@\\"optionalArrayOfStrings\\"];
   return RCTBridgingToOptionalVec(p, ^NSString *(id itemValue_0) { return RCTBridgingToString(itemValue_0); });
 }
-
-
 inline facebook::react::LazyVector<JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement> JS::NativeSampleTurboModule::SpecGetArraysOptions::arrayOfObjects() const
 {
   id const p = _v[@\\"arrayOfObjects\\"];
   return RCTBridgingToVec(p, ^JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(id itemValue_0) { return JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement(itemValue_0); });
 }
-
 ",
 }
 `;
 
 exports[`GenerateModuleHObjCpp can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
+#import <folly/Optional.h>
+#import <vector>
 
 
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
@@ -367,45 +305,38 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 ",
 }
 `;
 
 exports[`GenerateModuleHObjCpp can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
-
+#import <folly/Optional.h>
+#import <vector>
 
 namespace JS {
   namespace NativeAliasTurboModule {
@@ -423,8 +354,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeAliasTurboModule_OptionsOffset)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsOffset:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeAliasTurboModule {
     struct OptionsSize {
@@ -441,8 +370,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeAliasTurboModule_OptionsSize)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsSize:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeAliasTurboModule {
     struct OptionsDisplaySize {
@@ -459,8 +386,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeAliasTurboModule_OptionsDisplaySize)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsDisplaySize:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeAliasTurboModule {
     struct Options {
@@ -480,7 +405,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeAliasTurboModule_Options)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_Options:(id)json;
 @end
-
 @protocol NativeAliasTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)cropImage:(JS::NativeAliasTurboModule::Options &)cropData;
@@ -497,122 +421,93 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 inline double JS::NativeAliasTurboModule::OptionsOffset::x() const
 {
   id const p = _v[@\\"x\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline double JS::NativeAliasTurboModule::OptionsOffset::y() const
 {
   id const p = _v[@\\"y\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline double JS::NativeAliasTurboModule::OptionsSize::width() const
 {
   id const p = _v[@\\"width\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline double JS::NativeAliasTurboModule::OptionsSize::height() const
 {
   id const p = _v[@\\"height\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline double JS::NativeAliasTurboModule::OptionsDisplaySize::width() const
 {
   id const p = _v[@\\"width\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline double JS::NativeAliasTurboModule::OptionsDisplaySize::height() const
 {
   id const p = _v[@\\"height\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline JS::NativeAliasTurboModule::OptionsOffset JS::NativeAliasTurboModule::Options::offset() const
 {
   id const p = _v[@\\"offset\\"];
   return JS::NativeAliasTurboModule::OptionsOffset(p);
 }
-
-
 inline JS::NativeAliasTurboModule::OptionsSize JS::NativeAliasTurboModule::Options::size() const
 {
   id const p = _v[@\\"size\\"];
   return JS::NativeAliasTurboModule::OptionsSize(p);
 }
-
-
 inline folly::Optional<JS::NativeAliasTurboModule::OptionsDisplaySize> JS::NativeAliasTurboModule::Options::displaySize() const
 {
   id const p = _v[@\\"displaySize\\"];
   return (p == nil ? folly::none : folly::make_optional(JS::NativeAliasTurboModule::OptionsDisplaySize(p)));
 }
-
-
 inline NSString *JS::NativeAliasTurboModule::Options::resizeMode() const
 {
   id const p = _v[@\\"resizeMode\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline folly::Optional<bool> JS::NativeAliasTurboModule::Options::allowExternalStorage() const
 {
   id const p = _v[@\\"allowExternalStorage\\"];
   return RCTBridgingToOptionalBool(p);
 }
-
 ",
 }
 `;
 
 exports[`GenerateModuleHObjCpp can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
-
+#import <folly/Optional.h>
+#import <vector>
 
 namespace JS {
   namespace NativeCameraRollManager {
@@ -635,7 +530,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeCameraRollManager_GetPhotosParams)
 + (RCTManagedPointer *)JS_NativeCameraRollManager_GetPhotosParams:(id)json;
 @end
-
 @protocol NativeCameraRollManagerSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getPhotos:(JS::NativeCameraRollManager::GetPhotosParams &)params
@@ -661,9 +555,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeExceptionsManager {
     struct StackFrame {
@@ -683,8 +574,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeExceptionsManager_StackFrame)
 + (RCTManagedPointer *)JS_NativeExceptionsManager_StackFrame:(id)json;
 @end
-
-
 namespace JS {
   namespace NativeExceptionsManager {
     struct ExceptionData {
@@ -707,7 +596,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeExceptionsManager_ExceptionData)
 + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json;
 @end
-
 @protocol NativeExceptionsManagerSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)reportFatalException:(NSString *)message
@@ -734,9 +622,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 namespace JS {
   namespace NativeImagePickerIOS {
     struct SpecOpenCameraDialogConfig {
@@ -753,7 +638,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
 + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json;
 @end
-
 @protocol NativeImagePickerIOSSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)openCameraDialog:(JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig &)config
@@ -772,199 +656,148 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 inline double JS::NativeCameraRollManager::GetPhotosParams::first() const
 {
   id const p = _v[@\\"first\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::after() const
 {
   id const p = _v[@\\"after\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::groupName() const
 {
   id const p = _v[@\\"groupName\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::groupTypes() const
 {
   id const p = _v[@\\"groupTypes\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline NSString *JS::NativeCameraRollManager::GetPhotosParams::assetType() const
 {
   id const p = _v[@\\"assetType\\"];
   return RCTBridgingToOptionalString(p);
 }
-
-
 inline folly::Optional<double> JS::NativeCameraRollManager::GetPhotosParams::maxSize() const
 {
   id const p = _v[@\\"maxSize\\"];
   return RCTBridgingToOptionalDouble(p);
 }
-
-
 inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeCameraRollManager::GetPhotosParams::mimeTypes() const
 {
   id const p = _v[@\\"mimeTypes\\"];
   return RCTBridgingToOptionalVec(p, ^NSString *(id itemValue_0) { return RCTBridgingToString(itemValue_0); });
 }
-
-
 inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::column() const
 {
   id const p = _v[@\\"column\\"];
   return RCTBridgingToOptionalDouble(p);
 }
-
-
 inline NSString *JS::NativeExceptionsManager::StackFrame::file() const
 {
   id const p = _v[@\\"file\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::lineNumber() const
 {
   id const p = _v[@\\"lineNumber\\"];
   return RCTBridgingToOptionalDouble(p);
 }
-
-
 inline NSString *JS::NativeExceptionsManager::StackFrame::methodName() const
 {
   id const p = _v[@\\"methodName\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline folly::Optional<bool> JS::NativeExceptionsManager::StackFrame::collapse() const
 {
   id const p = _v[@\\"collapse\\"];
   return RCTBridgingToOptionalBool(p);
 }
-
-
 inline NSString *JS::NativeExceptionsManager::ExceptionData::message() const
 {
   id const p = _v[@\\"message\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline NSString *JS::NativeExceptionsManager::ExceptionData::originalMessage() const
 {
   id const p = _v[@\\"originalMessage\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline NSString *JS::NativeExceptionsManager::ExceptionData::name() const
 {
   id const p = _v[@\\"name\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline NSString *JS::NativeExceptionsManager::ExceptionData::componentStack() const
 {
   id const p = _v[@\\"componentStack\\"];
   return RCTBridgingToString(p);
 }
-
-
 inline facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> JS::NativeExceptionsManager::ExceptionData::stack() const
 {
   id const p = _v[@\\"stack\\"];
   return RCTBridgingToVec(p, ^JS::NativeExceptionsManager::StackFrame(id itemValue_0) { return JS::NativeExceptionsManager::StackFrame(itemValue_0); });
 }
-
-
 inline double JS::NativeExceptionsManager::ExceptionData::id_() const
 {
   id const p = _v[@\\"id_\\"];
   return RCTBridgingToDouble(p);
 }
-
-
 inline bool JS::NativeExceptionsManager::ExceptionData::isFatal() const
 {
   id const p = _v[@\\"isFatal\\"];
   return RCTBridgingToBool(p);
 }
-
-
 inline id<NSObject> _Nullable JS::NativeExceptionsManager::ExceptionData::extraData() const
 {
   id const p = _v[@\\"extraData\\"];
   return p;
 }
-
-
 inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::unmirrorFrontFacingCamera() const
 {
   id const p = _v[@\\"unmirrorFrontFacingCamera\\"];
   return RCTBridgingToBool(p);
 }
-
-
 inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::videoMode() const
 {
   id const p = _v[@\\"videoMode\\"];
   return RCTBridgingToBool(p);
 }
-
 ",
 }
 `;
 
 exports[`GenerateModuleHObjCpp can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
-
+#import <folly/Optional.h>
+#import <vector>
 
 namespace JS {
   namespace NativeSampleTurboModule {
@@ -1026,9 +859,6 @@ namespace facebook {
     };
   } // namespace react
 } // namespace facebook
-
-
-
 inline JS::NativeSampleTurboModule::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto const1 = i.const1.get();
@@ -1048,36 +878,32 @@ inline JS::NativeSampleTurboModule::Constants::Builder::Builder(Constants i) : _
 
 exports[`GenerateModuleHObjCpp can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
+#import <folly/Optional.h>
+#import <vector>
 
 
 @protocol NativeSample2TurboModuleSpec <RCTBridgeModule, RCTTurboModule>
@@ -1097,8 +923,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)voidFunc;
@@ -1117,44 +941,38 @@ namespace facebook {
 } // namespace facebook
 
 
-
-
 ",
 }
 `;
 
 exports[`GenerateModuleHObjCpp can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "SampleSpec.h" => "
-/**
+  "SampleSpec.h" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by codegen project: GenerateModuleHObjCpp.js
+ * @generated by codegen project: GenerateModuleObjCpp
+ *
+ * We create an umbrella header (and corresponding implementation) here since
+ * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
+ * must have a single output. More files => more genrule()s => slower builds.
  */
 
 #ifndef __cplusplus
 #error This file must be compiled as Obj-C++. If you are importing it, you must change your file extension to .mm.
 #endif
-
-#import <vector>
-
 #import <Foundation/Foundation.h>
-
-#import <folly/Optional.h>
-
 #import <RCTRequired/RCTRequired.h>
 #import <RCTTypeSafety/RCTConvertHelpers.h>
 #import <RCTTypeSafety/RCTTypedModuleConstants.h>
-
 #import <React/RCTBridgeModule.h>
 #import <React/RCTCxxConvert.h>
 #import <React/RCTManagedPointer.h>
-
 #import <ReactCommon/RCTTurboModule.h>
-
+#import <folly/Optional.h>
+#import <vector>
 
 
 @protocol NativeSample2TurboModuleSpec <RCTBridgeModule, RCTTurboModule>
@@ -1174,8 +992,6 @@ namespace facebook {
   } // namespace react
 } // namespace facebook
 
-
-
 @protocol NativeSampleTurboModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)voidFunc;
@@ -1194,8 +1010,6 @@ namespace facebook {
 } // namespace facebook
 
 
-
-
 ",
 }
 `;
diff --git a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
index 53e98c9fdf939a..edd13e0eb44489 100644
--- a/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
+++ b/packages/react-native-codegen/src/generators/modules/__tests__/__snapshots__/GenerateModuleMm-test.js.snap
@@ -2,14 +2,13 @@
 
 exports[`GenerateModuleMm can generate fixture COMPLEX_OBJECTS 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "
-/**
+  "SampleSpec-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -18,55 +17,42 @@ Map {
 
 #import \\"SampleSpec.h\\"
 
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecDifficultAE)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultAE:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecDifficultAE>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecDifficultA)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecDifficultA:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecDifficultA>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsAOptionalObjectProperty:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecOptionalsAOptionalObjectProperty>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecOptionalsA)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecOptionalsA:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecOptionalsA>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptionsArrayOfObjectsElement:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecGetArraysOptionsArrayOfObjectsElement>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeSampleTurboModule_SpecGetArraysOptions)
 + (RCTManagedPointer *)JS_NativeSampleTurboModule_SpecGetArraysOptions:(id)json
 {
   return facebook::react::managedPointer<JS::NativeSampleTurboModule::SpecGetArraysOptions>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -74,58 +60,48 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"difficult\\", @selector(difficult:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_optionals(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"optionals\\", @selector(optionals:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"optionalMethod\\", @selector(optionalMethod:callback:extras:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArrays(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getArrays\\", @selector(getArrays:), args, count);
     }
 
-
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"difficult\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_difficult};
         setMethodArgConversionSelector(@\\"difficult\\", 0, @\\"JS_NativeSampleTurboModule_SpecDifficultA:\\");
-
         
         methodMap_[\\"optionals\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_optionals};
         setMethodArgConversionSelector(@\\"optionals\\", 0, @\\"JS_NativeSampleTurboModule_SpecOptionalsA:\\");
-
         
         methodMap_[\\"optionalMethod\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_optionalMethod};
         
-
         
         methodMap_[\\"getArrays\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArrays};
         setMethodArgConversionSelector(@\\"getArrays\\", 0, @\\"JS_NativeSampleTurboModule_SpecGetArraysOptions:\\");
-
     }
   } // namespace react
 } // namespace facebook
-
 ",
 }
 `;
 
 exports[`GenerateModuleMm can generate fixture EMPTY_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "
-/**
+  "SampleSpec-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -135,7 +111,6 @@ Map {
 #import \\"SampleSpec.h\\"
 
 
-
 namespace facebook {
   namespace react {
     
@@ -146,21 +121,19 @@ namespace facebook {
     }
   } // namespace react
 } // namespace facebook
-
 ",
 }
 `;
 
 exports[`GenerateModuleMm can generate fixture NATIVE_MODULES_WITH_TYPE_ALIASES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "
-/**
+  "SampleSpec-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -169,39 +142,30 @@ Map {
 
 #import \\"SampleSpec.h\\"
 
-
-
 @implementation RCTCxxConvert (NativeAliasTurboModule_OptionsOffset)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsOffset:(id)json
 {
   return facebook::react::managedPointer<JS::NativeAliasTurboModule::OptionsOffset>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeAliasTurboModule_OptionsSize)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsSize:(id)json
 {
   return facebook::react::managedPointer<JS::NativeAliasTurboModule::OptionsSize>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeAliasTurboModule_OptionsDisplaySize)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_OptionsDisplaySize:(id)json
 {
   return facebook::react::managedPointer<JS::NativeAliasTurboModule::OptionsDisplaySize>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeAliasTurboModule_Options)
 + (RCTManagedPointer *)JS_NativeAliasTurboModule_Options:(id)json
 {
   return facebook::react::managedPointer<JS::NativeAliasTurboModule::Options>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -209,31 +173,27 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"cropImage\\", @selector(cropImage:), args, count);
     }
 
-
     NativeAliasTurboModuleSpecJSI::NativeAliasTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"cropImage\\"] = MethodMetadata {1, __hostFunction_NativeAliasTurboModuleSpecJSI_cropImage};
         setMethodArgConversionSelector(@\\"cropImage\\", 0, @\\"JS_NativeAliasTurboModule_Options:\\");
-
     }
   } // namespace react
 } // namespace facebook
-
 ",
 }
 `;
 
 exports[`GenerateModuleMm can generate fixture REAL_MODULE_EXAMPLE 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "
-/**
+  "SampleSpec-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -242,15 +202,12 @@ Map {
 
 #import \\"SampleSpec.h\\"
 
-
-
 @implementation RCTCxxConvert (NativeCameraRollManager_GetPhotosParams)
 + (RCTManagedPointer *)JS_NativeCameraRollManager_GetPhotosParams:(id)json
 {
   return facebook::react::managedPointer<JS::NativeCameraRollManager::GetPhotosParams>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -258,52 +215,40 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getPhotos\\", @selector(getPhotos:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"saveToCameraRoll\\", @selector(saveToCameraRoll:type:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeCameraRollManagerSpecJSI_deletePhotos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"deletePhotos\\", @selector(deletePhotos:resolve:reject:), args, count);
     }
 
-
     NativeCameraRollManagerSpecJSI::NativeCameraRollManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"getPhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_getPhotos};
         setMethodArgConversionSelector(@\\"getPhotos\\", 0, @\\"JS_NativeCameraRollManager_GetPhotosParams:\\");
-
         
         methodMap_[\\"saveToCameraRoll\\"] = MethodMetadata {2, __hostFunction_NativeCameraRollManagerSpecJSI_saveToCameraRoll};
         
-
         
         methodMap_[\\"deletePhotos\\"] = MethodMetadata {1, __hostFunction_NativeCameraRollManagerSpecJSI_deletePhotos};
         
-
     }
   } // namespace react
 } // namespace facebook
-
-
-
 @implementation RCTCxxConvert (NativeExceptionsManager_StackFrame)
 + (RCTManagedPointer *)JS_NativeExceptionsManager_StackFrame:(id)json
 {
   return facebook::react::managedPointer<JS::NativeExceptionsManager::StackFrame>(json);
 }
 @end
-
-
 @implementation RCTCxxConvert (NativeExceptionsManager_ExceptionData)
 + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json
 {
   return facebook::react::managedPointer<JS::NativeExceptionsManager::ExceptionData>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -311,62 +256,48 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportFatalException\\", @selector(reportFatalException:stack:exceptionId:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportSoftException\\", @selector(reportSoftException:stack:exceptionId:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"reportException\\", @selector(reportException:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"updateExceptionMessage\\", @selector(updateExceptionMessage:stack:exceptionId:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"dismissRedbox\\", @selector(dismissRedbox), args, count);
     }
 
-
     NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"reportFatalException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException};
         
-
         
         methodMap_[\\"reportSoftException\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_reportSoftException};
         
-
         
         methodMap_[\\"reportException\\"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportException};
         setMethodArgConversionSelector(@\\"reportException\\", 0, @\\"JS_NativeExceptionsManager_ExceptionData:\\");
-
         
         methodMap_[\\"updateExceptionMessage\\"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage};
         
-
         
         methodMap_[\\"dismissRedbox\\"] = MethodMetadata {0, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
         
-
     }
   } // namespace react
 } // namespace facebook
-
-
-
 @implementation RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
 + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json
 {
   return facebook::react::managedPointer<JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig>(json);
 }
 @end
-
 namespace facebook {
   namespace react {
     
@@ -374,31 +305,27 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"openCameraDialog\\", @selector(openCameraDialog:successCallback:cancelCallback:), args, count);
     }
 
-
     NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"openCameraDialog\\"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
         setMethodArgConversionSelector(@\\"openCameraDialog\\", 0, @\\"JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:\\");
-
     }
   } // namespace react
 } // namespace facebook
-
 ",
 }
 `;
 
 exports[`GenerateModuleMm can generate fixture SIMPLE_NATIVE_MODULES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "
-/**
+  "SampleSpec-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -408,7 +335,6 @@ Map {
 #import \\"SampleSpec.h\\"
 
 
-
 namespace facebook {
   namespace react {
     
@@ -416,121 +342,97 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getBool(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getBool\\", @selector(getBool:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getNumber\\", @selector(getNumber:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, \\"getString\\", @selector(getString:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getArray(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, \\"getArray\\", @selector(getArray:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getObject(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getObject\\", @selector(getObject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, NumberKind, \\"getRootTag\\", @selector(getRootTag:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValue(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getValue\\", @selector(getValue:y:z:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"getValueWithCallback\\", @selector(getValueWithCallback:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, \\"getValueWithPromise\\", @selector(getValueWithPromise:resolve:reject:), args, count);
     }
 
-
     static facebook::jsi::Value __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, \\"getConstants\\", @selector(getConstants), args, count);
     }
 
-
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
-
         
         methodMap_[\\"getBool\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getBool};
         
-
         
         methodMap_[\\"getNumber\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getNumber};
         
-
         
         methodMap_[\\"getString\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getString};
         
-
         
         methodMap_[\\"getArray\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getArray};
         
-
         
         methodMap_[\\"getObject\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getObject};
         
-
         
         methodMap_[\\"getRootTag\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getRootTag};
         
-
         
         methodMap_[\\"getValue\\"] = MethodMetadata {3, __hostFunction_NativeSampleTurboModuleSpecJSI_getValue};
         
-
         
         methodMap_[\\"getValueWithCallback\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithCallback};
         
-
         
         methodMap_[\\"getValueWithPromise\\"] = MethodMetadata {1, __hostFunction_NativeSampleTurboModuleSpecJSI_getValueWithPromise};
         
-
         
         methodMap_[\\"getConstants\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_getConstants};
         
-
     }
   } // namespace react
 } // namespace facebook
-
 ",
 }
 `;
 
 exports[`GenerateModuleMm can generate fixture TWO_MODULES_DIFFERENT_FILES 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "
-/**
+  "SampleSpec-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -540,7 +442,6 @@ Map {
 #import \\"SampleSpec.h\\"
 
 
-
 namespace facebook {
   namespace react {
     
@@ -548,19 +449,15 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -568,31 +465,27 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
-
     }
   } // namespace react
 } // namespace facebook
-
 ",
 }
 `;
 
 exports[`GenerateModuleMm can generate fixture TWO_MODULES_SAME_FILE 1`] = `
 Map {
-  "SampleSpec-generated.mm" => "
-/**
+  "SampleSpec-generated.mm" => "/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -602,7 +495,6 @@ Map {
 #import \\"SampleSpec.h\\"
 
 
-
 namespace facebook {
   namespace react {
     
@@ -610,19 +502,15 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     NativeSample2TurboModuleSpecJSI::NativeSample2TurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSample2TurboModuleSpecJSI_voidFunc};
         
-
     }
   } // namespace react
 } // namespace facebook
 
-
-
 namespace facebook {
   namespace react {
     
@@ -630,17 +518,14 @@ namespace facebook {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, \\"voidFunc\\", @selector(voidFunc), args, count);
     }
 
-
     NativeSampleTurboModuleSpecJSI::NativeSampleTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_[\\"voidFunc\\"] = MethodMetadata {0, __hostFunction_NativeSampleTurboModuleSpecJSI_voidFunc};
         
-
     }
   } // namespace react
 } // namespace facebook
-
 ",
 }
 `;

From 291668a40c8384282f113422691f704e8c8e3533 Mon Sep 17 00:00:00 2001
From: Tim Yung <yungsters@fb.com>
Date: Tue, 6 Oct 2020 11:16:45 -0700
Subject: [PATCH 191/241] RN: Omit Unused Platform-Specific Code

Summary:
Our Babel plugin that strips irrelevant platform-specific code does not currently know how to deal with early return statements.

This minor change to a couple call sites enables the output bundle for Android to omit code specific to iOS.

Changelog:
[Internal]

Reviewed By: ejanzer

Differential Revision: D24139922

fbshipit-source-id: 467c0c38dd45679b889a8a94d85f73fd969e5b36
---
 Libraries/Components/Switch/Switch.js | 62 +++++++++++++--------------
 Libraries/Linking/Linking.js          |  3 +-
 2 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/Libraries/Components/Switch/Switch.js b/Libraries/Components/Switch/Switch.js
index 9287c60e29af8e..d2f4cf750e35ae 100644
--- a/Libraries/Components/Switch/Switch.js
+++ b/Libraries/Components/Switch/Switch.js
@@ -173,39 +173,39 @@ class Switch extends React.Component<Props> {
           ref={this._handleSwitchNativeComponentRef}
         />
       );
-    }
-
-    const platformProps = {
-      disabled,
-      onTintColor: trackColorForTrue,
-      style: StyleSheet.compose(
-        {height: 31, width: 51},
-        StyleSheet.compose(
-          style,
-          ios_backgroundColor == null
-            ? null
-            : {
-                backgroundColor: ios_backgroundColor,
-                borderRadius: 16,
-              },
+    } else {
+      const platformProps = {
+        disabled,
+        onTintColor: trackColorForTrue,
+        style: StyleSheet.compose(
+          {height: 31, width: 51},
+          StyleSheet.compose(
+            style,
+            ios_backgroundColor == null
+              ? null
+              : {
+                  backgroundColor: ios_backgroundColor,
+                  borderRadius: 16,
+                },
+          ),
         ),
-      ),
-      thumbTintColor: thumbColor,
-      tintColor: trackColorForFalse,
-      value: value === true,
-    };
+        thumbTintColor: thumbColor,
+        tintColor: trackColorForFalse,
+        value: value === true,
+      };
 
-    return (
-      <SwitchNativeComponent
-        {...props}
-        {...platformProps}
-        accessibilityRole={props.accessibilityRole ?? 'switch'}
-        onChange={this._handleChange}
-        onResponderTerminationRequest={returnsFalse}
-        onStartShouldSetResponder={returnsTrue}
-        ref={this._handleSwitchNativeComponentRef}
-      />
-    );
+      return (
+        <SwitchNativeComponent
+          {...props}
+          {...platformProps}
+          accessibilityRole={props.accessibilityRole ?? 'switch'}
+          onChange={this._handleChange}
+          onResponderTerminationRequest={returnsFalse}
+          onStartShouldSetResponder={returnsTrue}
+          ref={this._handleSwitchNativeComponentRef}
+        />
+      );
+    }
   }
 
   componentDidUpdate() {
diff --git a/Libraries/Linking/Linking.js b/Libraries/Linking/Linking.js
index 1ce5a8ae0795d0..cd77584cb879a6 100644
--- a/Libraries/Linking/Linking.js
+++ b/Libraries/Linking/Linking.js
@@ -106,8 +106,9 @@ class Linking extends NativeEventEmitter {
   ): Promise<void> {
     if (Platform.OS === 'android') {
       return NativeLinking.sendIntent(action, extras);
+    } else {
+      return new Promise((resolve, reject) => reject(new Error('Unsupported')));
     }
-    return new Promise((resolve, reject) => reject(new Error('Unsupported')));
   }
 
   _validateURL(url: string) {

From 88174991d9cf03dbbe71500ca38ba10954dfaf1a Mon Sep 17 00:00:00 2001
From: Luna Wei <luwe@fb.com>
Date: Tue, 6 Oct 2020 12:29:21 -0700
Subject: [PATCH 192/241] Close globalLogger when creating scopedLogger

Summary:
# Changelog:
[Internal][Changed] - Close the global perf logger when we create the scoped performance logger and absorb the global perf logger into the scoped logger

Reviewed By: rubennorte

Differential Revision: D23898621

fbshipit-source-id: 0d9bfd95175e660c0bd0bc74974126f92fe409b2
---
 .../__tests__/PerformanceLogger-test.js       | 74 +++++++++++++++++++
 .../Utilities/createPerformanceLogger.js      | 22 +++++-
 2 files changed, 92 insertions(+), 4 deletions(-)

diff --git a/Libraries/Utilities/__tests__/PerformanceLogger-test.js b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
index d26cbede535bef..8026eb1d299bb9 100644
--- a/Libraries/Utilities/__tests__/PerformanceLogger-test.js
+++ b/Libraries/Utilities/__tests__/PerformanceLogger-test.js
@@ -223,4 +223,78 @@ describe('PerformanceLogger', () => {
     expect(Object.keys(perfLogger.getPointExtras())).toEqual([POINT]);
     expect(perfLogger.getPointExtras()[POINT]).toEqual(POINT_ANNOTATION_1);
   });
+
+  it('should allow extended logger to stopTimespan', () => {
+    const loggerA = createPerformanceLogger();
+    loggerA.startTimespan('loggerA_timespan');
+    const loggerB = createPerformanceLogger();
+    loggerB.append(loggerA);
+    loggerB.stopTimespan('loggerA_timespan');
+    const timespan = loggerB.getTimespans().loggerA_timespan;
+    expect(timespan?.startTime).not.toBeUndefined();
+    expect(timespan?.endTime).not.toBeUndefined();
+    expect(timespan?.totalTime).not.toBeUndefined();
+    expect(loggerA.isClosed()).toBe(false);
+  });
+
+  it('should append logger', () => {
+    const loggerA = createPerformanceLogger();
+    loggerA.addTimespan('loggerA_timespan1', 0, 10);
+    loggerA.addTimespan(
+      'loggerA_timespan2',
+      2,
+      8,
+      {loggerA_timespan2_start: 100},
+      {loggerA_timespan2_end: 200},
+    );
+    loggerA.markPoint('loggerA_point', 5, {loggerA_pointExtra: true});
+    loggerA.setExtra('loggerA_extra', true);
+
+    const loggerB = createPerformanceLogger();
+    loggerB.append(loggerA);
+    loggerB.addTimespan('loggerB_timespan', 0, 10);
+    loggerB.markPoint('loggerB_point', 3);
+
+    expect(loggerA.isClosed()).toBe(false);
+
+    expect(loggerB.getTimespans()).toEqual({
+      loggerA_timespan1: {
+        endExtras: undefined,
+        endTime: 10,
+        startExtras: undefined,
+        startTime: 0,
+        totalTime: 10,
+      },
+      loggerA_timespan2: {
+        endExtras: {
+          loggerA_timespan2_end: 200,
+        },
+        endTime: 8,
+        startExtras: {
+          loggerA_timespan2_start: 100,
+        },
+        startTime: 2,
+        totalTime: 6,
+      },
+      loggerB_timespan: {
+        endExtras: undefined,
+        endTime: 10,
+        startExtras: undefined,
+        startTime: 0,
+        totalTime: 10,
+      },
+    });
+    expect(loggerB.getPoints()).toEqual({
+      loggerA_point: 5,
+      loggerB_point: 3,
+    });
+    expect(loggerB.getPointExtras()).toEqual({
+      loggerA_point: {
+        loggerA_pointExtra: true,
+      },
+    });
+    expect(loggerB.getExtras()).toEqual({
+      loggerA_extra: true,
+    });
+  });
 });
diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 2e8753f9ec0877..50c097158a7a5a 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -37,14 +37,15 @@ export interface IPerformanceLogger {
     startExtras?: Extras,
     endExtras?: Extras,
   ): void;
+  append(logger: IPerformanceLogger): void;
   clear(): void;
   clearCompleted(): void;
   close(): void;
   currentTimestamp(): number;
-  getExtras(): {[key: string]: ?ExtraValue, ...};
-  getPoints(): {[key: string]: ?number, ...};
-  getPointExtras(): {[key: string]: ?Extras, ...};
-  getTimespans(): {[key: string]: ?Timespan, ...};
+  getExtras(): $ReadOnly<{[key: string]: ?ExtraValue, ...}>;
+  getPoints(): $ReadOnly<{[key: string]: ?number, ...}>;
+  getPointExtras(): $ReadOnly<{[key: string]: ?Extras, ...}>;
+  getTimespans(): $ReadOnly<{[key: string]: ?Timespan, ...}>;
   hasTimespan(key: string): boolean;
   isClosed(): boolean;
   logEverything(): void;
@@ -98,6 +99,19 @@ class PerformanceLogger implements IPerformanceLogger {
     };
   }
 
+  append(performanceLogger: IPerformanceLogger) {
+    this._timespans = {
+      ...performanceLogger.getTimespans(),
+      ...this._timespans,
+    };
+    this._extras = {...performanceLogger.getExtras(), ...this._extras};
+    this._points = {...performanceLogger.getPoints(), ...this._points};
+    this._pointExtras = {
+      ...performanceLogger.getPointExtras(),
+      ...this._pointExtras,
+    };
+  }
+
   clear() {
     this._timespans = {};
     this._extras = {};

From dffb61dcbbd85a8a4ea0a79e0d90dd73a54c5379 Mon Sep 17 00:00:00 2001
From: Neil Dhar <neildhar@fb.com>
Date: Tue, 6 Oct 2020 17:30:49 -0700
Subject: [PATCH 193/241] Remove capture of instance_

Summary:
The captured `instance_` will result in a call to JVM code to release the reference when the lambda is destroyed. However, Hermes may destroy the lambda in a non-JVM background thread.

Since `instance_` is a member of the class, and `this` is already captured, there is no need to capture it.

Changelog: [Internal]

Reviewed By: RSNara

Differential Revision: D24141179

fbshipit-source-id: e3b268485ed229ee933281a80e5dbe2feba55719
---
 .../core/platform/android/ReactCommon/JavaTurboModule.cpp        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
index 82fbc928fb6c1a..f4b3f967e91c48 100644
--- a/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
+++ b/ReactCommon/react/nativemodule/core/platform/android/ReactCommon/JavaTurboModule.cpp
@@ -733,7 +733,6 @@ jsi::Value JavaTurboModule::invokeJavaMethod(
            &jargs,
            &globalRefs,
            argCount,
-           instance_ = instance_,
            methodID,
            moduleNameStr = name_,
            methodNameStr,

From fd9787ecc0710642c4cd4b2144e57b8fdbd2f74a Mon Sep 17 00:00:00 2001
From: Christoph Nakazawa <cpojer@fb.com>
Date: Tue, 6 Oct 2020 18:20:40 -0700
Subject: [PATCH 194/241] Remove `fbjs-scripts` in favor of
 `@jest/create-cache-key-function`

Summary: Changelog: [Internal]

Reviewed By: GijsWeterings

Differential Revision: D24129817

fbshipit-source-id: fe1c4a8abdb1cc73b031120b1f8f9722d04ba620
---
 jest/assetFileTransformer.js |   5 +-
 jest/preprocessor.js         |   3 +-
 package.json                 |   2 +-
 yarn.lock                    | 133 +++--------------------------------
 4 files changed, 16 insertions(+), 127 deletions(-)

diff --git a/jest/assetFileTransformer.js b/jest/assetFileTransformer.js
index cdc477c7d37dbd..03b018ffb7c053 100644
--- a/jest/assetFileTransformer.js
+++ b/jest/assetFileTransformer.js
@@ -12,7 +12,8 @@
 /* eslint-env node */
 
 const path = require('path');
-const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
+const createCacheKeyFunction = require('@jest/create-cache-key-function')
+  .default;
 
 module.exports = {
   // Mocks asset requires to return the filename. Makes it possible to test that
@@ -21,7 +22,7 @@ module.exports = {
   // the Jest snapshot.
   process: (_, filename) =>
     `module.exports = {
-      testUri: 
+      testUri:
         ${JSON.stringify(
           path.relative(__dirname, filename).replace(/\\/g, '/'),
         )}
diff --git a/jest/preprocessor.js b/jest/preprocessor.js
index b08da26a396822..7e8ed8de0eaa0b 100644
--- a/jest/preprocessor.js
+++ b/jest/preprocessor.js
@@ -13,7 +13,8 @@
 'use strict';
 
 const babelRegisterOnly = require('metro-babel-register');
-const createCacheKeyFunction = require('fbjs-scripts/jest/createCacheKeyFunction');
+const createCacheKeyFunction = require('@jest/create-cache-key-function')
+  .default;
 
 const {transformSync: babelTransformSync} = require('@babel/core');
 const generate = require('@babel/generator').default;
diff --git a/package.json b/package.json
index c6555adda1c658..e0427a249e6f06 100644
--- a/package.json
+++ b/package.json
@@ -84,6 +84,7 @@
     "react": "16.13.1"
   },
   "dependencies": {
+    "@jest/create-cache-key-function": "^26.5.0",
     "@react-native-community/cli": "^4.13.0",
     "@react-native-community/cli-platform-android": "^4.13.0",
     "@react-native-community/cli-platform-ios": "^4.13.0",
@@ -94,7 +95,6 @@
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
     "event-target-shim": "^5.0.1",
-    "fbjs-scripts": "^1.1.0",
     "hermes-engine": "~0.7.0",
     "invariant": "^2.2.4",
     "jsc-android": "^245459.0.0",
diff --git a/yarn.lock b/yarn.lock
index 4e0587ef2b1cdd..f5778154ecaee0 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -848,6 +848,11 @@
     slash "^3.0.0"
     strip-ansi "^6.0.0"
 
+"@jest/create-cache-key-function@^26.5.0":
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-26.5.0.tgz#1d07947adc51ea17766d9f0ccf5a8d6ea94c47dc"
+  integrity sha512-DJ+pEBUIqarrbv1W/C39f9YH0rJ4wsXZ/VC6JafJPlHW2HOucKceeaqTOQj9MEDQZjySxMLkOq5mfXZXNZcmWw==
+
 "@jest/environment@^26.3.0":
   version "26.3.0"
   resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
@@ -1346,20 +1351,6 @@ anser@^1.4.9:
   resolved "https://registry.yarnpkg.com/anser/-/anser-1.4.9.tgz#1f85423a5dcf8da4631a341665ff675b96845760"
   integrity sha512-AI+BjTeGt2+WFk4eWcqbQ7snZpDBt8SaLlj0RT2h5xfdWaiy51OjYvqwMrNzJLGy8iOAL6nKDITWO+rd4MkYEA==
 
-ansi-colors@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-1.1.0.tgz#6374b4dd5d4718ff3ce27a671a3b1cad077132a9"
-  integrity sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==
-  dependencies:
-    ansi-wrap "^0.1.0"
-
-ansi-cyan@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-cyan/-/ansi-cyan-0.1.1.tgz#538ae528af8982f28ae30d86f2f17456d2609873"
-  integrity sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-escapes@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
@@ -1381,20 +1372,6 @@ ansi-fragments@^0.2.1:
     slice-ansi "^2.0.0"
     strip-ansi "^5.0.0"
 
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
-ansi-red@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
-  integrity sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-regex@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
@@ -1430,11 +1407,6 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
     "@types/color-name" "^1.1.1"
     color-convert "^2.0.1"
 
-ansi-wrap@0.1.0, ansi-wrap@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
-  integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -1479,29 +1451,16 @@ aria-query@^3.0.0:
     ast-types-flow "0.0.7"
     commander "^2.11.0"
 
-arr-diff@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
-  integrity sha1-aHwydYFjWI/vfeezb6vklesaOZo=
-  dependencies:
-    arr-flatten "^1.0.1"
-    array-slice "^0.2.3"
-
 arr-diff@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
   integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
-arr-union@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-2.1.0.tgz#20f9eab5ec70f5c7d215b1077b1c39161d292c7d"
-  integrity sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=
-
 arr-union@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
@@ -1530,11 +1489,6 @@ array-reduce@~0.0.0:
   resolved "https://registry.yarnpkg.com/array-reduce/-/array-reduce-0.0.0.tgz#173899d3ffd1c7d9383e4479525dbe278cab5f2b"
   integrity sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=
 
-array-slice@^0.2.3:
-  version "0.2.3"
-  resolved "https://registry.yarnpkg.com/array-slice/-/array-slice-0.2.3.tgz#dd3cfb80ed7973a75117cdac69b0b99ec86186f5"
-  integrity sha1-3Tz7gO15c6dRF82sabC5nshhhvU=
-
 array-unique@^0.3.2:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
@@ -1704,7 +1658,7 @@ babel-preset-current-node-syntax@^0.1.3:
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-babel-preset-fbjs@^3.0.0, babel-preset-fbjs@^3.3.0:
+babel-preset-fbjs@^3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/babel-preset-fbjs/-/babel-preset-fbjs-3.3.0.tgz#a6024764ea86c8e06a22d794ca8b69534d263541"
   integrity sha512-7QTLTCd2gwB2qGoi5epSULMHugSVgpcVt5YAeiFO9ABLrutDQzKfGwzxgZHLpugq8qMdg/DhRZDZ5CLKxBkEbw==
@@ -2117,11 +2071,6 @@ color-name@~1.1.4:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
 colorette@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.0.7.tgz#7adf43c445ee63a541b4a4aef7d13f03df1e0cc0"
@@ -2266,15 +2215,6 @@ cross-spawn@^4.0.2:
     lru-cache "^4.0.1"
     which "^1.2.9"
 
-cross-spawn@^5.1.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-5.1.0.tgz#e8bd0efee58fcff6f8f94510a0a554bbfa235449"
-  integrity sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=
-  dependencies:
-    lru-cache "^4.0.1"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2934,13 +2874,6 @@ expect@^26.4.2:
     jest-message-util "^26.3.0"
     jest-regex-util "^26.0.0"
 
-extend-shallow@^1.1.2:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
-  integrity sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=
-  dependencies:
-    kind-of "^1.1.0"
-
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2998,15 +2931,6 @@ extsprintf@1.3.0, extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.3.0.tgz#96918440e3041a7a414f8c52e3c574eb3c3e1e05"
   integrity sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=
 
-fancy-log@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.2.tgz#f41125e3d84f2e7d89a43d06d958c8f78be16be1"
-  integrity sha1-9BEl49hPLn2JpD0G2VjI94vha+E=
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    time-stamp "^1.0.0"
-
 fast-deep-equal@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4"
@@ -3039,22 +2963,6 @@ fbjs-css-vars@^1.0.0:
   resolved "https://registry.yarnpkg.com/fbjs-css-vars/-/fbjs-css-vars-1.0.1.tgz#836d876e887d702f45610f5ebd2fbeef649527fc"
   integrity sha512-IM+v/C40MNZWqsLErc32e0TyIk/NhkkQZL0QmjBh6zi1eXv0/GeVKmKmueQX7nn9SXQBQbTUcB8zuexIF3/88w==
 
-fbjs-scripts@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/fbjs-scripts/-/fbjs-scripts-1.1.0.tgz#d9e855aed19b572be9dfe39da70d8aece724eed9"
-  integrity sha512-VMCpHJd76YI2nYOfVM/d9LDAIFTH4uw4/7sAIGEgxk6kaNmirgTY9bLgpla9DTu+DvV2+ufvDxehGbl2U9bYCA==
-  dependencies:
-    "@babel/core" "^7.0.0"
-    ansi-colors "^1.0.1"
-    babel-preset-fbjs "^3.0.0"
-    core-js "^2.4.1"
-    cross-spawn "^5.1.0"
-    fancy-log "^1.3.2"
-    object-assign "^4.0.1"
-    plugin-error "^0.1.2"
-    semver "^5.1.0"
-    through2 "^2.0.0"
-
 fbjs@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-1.0.0.tgz#52c215e0883a3c86af2a7a776ed51525ae8e0a5a"
@@ -4588,11 +4496,6 @@ jsx-ast-utils@^2.0.1:
   dependencies:
     array-includes "^3.0.3"
 
-kind-of@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-1.1.0.tgz#140a3d2d41a36d2efcfa9377b62c24f8495a5c44"
-  integrity sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=
-
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
@@ -5488,7 +5391,7 @@ ob1@0.63.0:
   resolved "https://registry.yarnpkg.com/ob1/-/ob1-0.63.0.tgz#2f34b178b5918028a0d76072a7b155b91f9cb6bd"
   integrity sha512-y7AtRIuISHuA5sc0Alcw/Cj2azU1ruuAmJIKSKk//IryxmHtmyA/M5DFcmpDAisaIB255bBt/P9aqc8jr1ocsg==
 
-object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -5810,17 +5713,6 @@ plist@^3.0.1:
     xmlbuilder "^9.0.7"
     xmldom "0.1.x"
 
-plugin-error@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/plugin-error/-/plugin-error-0.1.2.tgz#3b9bb3335ccf00f425e07437e19276967da47ace"
-  integrity sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=
-  dependencies:
-    ansi-cyan "^0.1.1"
-    ansi-red "^0.1.1"
-    arr-diff "^1.0.1"
-    arr-union "^2.0.1"
-    extend-shallow "^1.1.2"
-
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -6383,7 +6275,7 @@ scheduler@0.19.1, scheduler@^0.19.1:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-"semver@2 || 3 || 4 || 5", semver@^5.1.0, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -6977,7 +6869,7 @@ throat@^5.0.0:
   resolved "https://registry.yarnpkg.com/throat/-/throat-5.0.0.tgz#c5199235803aad18754a667d659b5e72ce16764b"
   integrity sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==
 
-through2@^2.0.0, through2@^2.0.1:
+through2@^2.0.1:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -6990,11 +6882,6 @@ through@^2.3.6:
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"

From 5535031ba4ea9b50bd3a1e130e3872d2a5e4e07a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Tue, 6 Oct 2020 18:38:13 -0700
Subject: [PATCH 195/241] Gate TurboModule block copy behind an MC

Summary: Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24145506

fbshipit-source-id: 7e374c3bd2378cc1dcd9372d7cbb10ae445a2582
---
 React/Base/RCTBridge.h                            |  4 ++++
 React/Base/RCTBridge.m                            | 11 +++++++++++
 .../core/platform/ios/RCTTurboModule.mm           | 15 ++++++++++++---
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 5981e1faa0ae0a..55265010e0945d 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -161,6 +161,10 @@ RCT_EXTERN void RCTEnableTurboModuleEagerInit(BOOL enabled);
 RCT_EXTERN BOOL RCTTurboModuleSharedMutexInitEnabled(void);
 RCT_EXTERN void RCTEnableTurboModuleSharedMutexInit(BOOL enabled);
 
+// Turn on TurboModule block copy
+RCT_EXTERN BOOL RCTTurboModuleBlockCopyEnabled(void);
+RCT_EXTERN void RCTEnableTurboModuleBlockCopy(BOOL enabled);
+
 /**
  * Async batched bridge used to communicate with the JavaScript application.
  */
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 8cca1a00b9d749..7d5c9cd414b151 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -136,6 +136,17 @@ void RCTEnableTurboModuleSharedMutexInit(BOOL enabled)
   turboModuleSharedMutexInitEnabled = enabled;
 }
 
+static BOOL turboModuleBlockCopyEnabled = NO;
+BOOL RCTTurboModuleBlockCopyEnabled(void)
+{
+  return turboModuleBlockCopyEnabled;
+}
+
+void RCTEnableTurboModuleBlockCopy(BOOL enabled)
+{
+  turboModuleBlockCopyEnabled = enabled;
+}
+
 @interface RCTBridge () <RCTReloadListener>
 @end
 
diff --git a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
index c8950c5718fe6a..4c7d3031bfb442 100644
--- a/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
+++ b/ReactCommon/react/nativemodule/core/platform/ios/RCTTurboModule.mm
@@ -195,7 +195,11 @@ static int32_t getUniqueId()
     wrapperWasCalled = YES;
   };
 
-  return [callback copy];
+  if (RCTTurboModuleBlockCopyEnabled()) {
+    return [callback copy];
+  }
+
+  return callback;
 }
 
 namespace facebook {
@@ -636,8 +640,13 @@ static int32_t getUniqueId()
             runtime,
             jsInvoker_,
             ^(RCTPromiseResolveBlock resolveBlock, RCTPromiseRejectBlock rejectBlock) {
-              RCTPromiseResolveBlock resolveCopy = [resolveBlock copy];
-              RCTPromiseRejectBlock rejectCopy = [rejectBlock copy];
+              RCTPromiseResolveBlock resolveCopy = resolveBlock;
+              RCTPromiseRejectBlock rejectCopy = rejectBlock;
+
+              if (RCTTurboModuleBlockCopyEnabled()) {
+                resolveCopy = [resolveBlock copy];
+                rejectCopy = [rejectBlock copy];
+              }
 
               [inv setArgument:(void *)&resolveCopy atIndex:count + 2];
               [inv setArgument:(void *)&rejectCopy atIndex:count + 3];

From 4d4992c790fe4b66af223e0a02db4596e4086e12 Mon Sep 17 00:00:00 2001
From: Christoph Nakazawa <cpojer@fb.com>
Date: Wed, 7 Oct 2020 02:12:30 -0700
Subject: [PATCH 196/241] Upgrade to Jest 26.5.2.

Summary: Changelog: [Internal]

Reviewed By: kacieb

Differential Revision: D24154865

fbshipit-source-id: 04d637a3944b6f030fee342c4e8a181eb4b14458
---
 .eslintignore            |   5 +-
 package.json             |   2 +-
 repo-config/package.json |   2 +-
 yarn.lock                | 704 +++++++++++++++++++++------------------
 4 files changed, 375 insertions(+), 338 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index a00ba35784f0a1..c390d085ae4073 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,3 @@
-# node_modules ignored by default
-
 **/main.js
 **/staticBundle.js
 bots/node_modules
@@ -7,7 +5,8 @@ docs/generatedComponentApiDocs.js
 flow/
 Libraries/Renderer/*
 Libraries/vendor/**/*
+node_modules/
 packages/*/node_modules
+packages/react-native-codegen/lib
 pr-inactivity-bookmarklet.js
 question-bookmarklet.js
-packages/react-native-codegen/lib
diff --git a/package.json b/package.json
index e0427a249e6f06..bb823b64658bd9 100644
--- a/package.json
+++ b/package.json
@@ -103,7 +103,7 @@
     "metro-runtime": "0.63.0",
     "metro-source-map": "0.63.0",
     "nullthrows": "^1.1.1",
-    "pretty-format": "^26.4.2",
+    "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "prop-types": "^15.7.2",
     "qs": "^6.5.1",
diff --git a/repo-config/package.json b/repo-config/package.json
index 38e9caaa3a11da..785bcfbb1578d5 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -34,7 +34,7 @@
     "eslint-plugin-react-native": "3.8.1",
     "eslint-plugin-relay": "1.7.1",
     "flow-bin": "^0.135.0",
-    "jest": "^26.4.2",
+    "jest": "^26.5.2",
     "jest-junit": "^10.0.0",
     "jscodeshift": "^0.11.0",
     "mkdirp": "^0.5.1",
diff --git a/yarn.lock b/yarn.lock
index f5778154ecaee0..6d4650544c234f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -802,46 +802,46 @@
     chalk "^2.0.1"
     slash "^2.0.0"
 
-"@jest/console@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856"
-  integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w==
+"@jest/console@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.5.2.tgz#94fc4865b1abed7c352b5e21e6c57be4b95604a6"
+  integrity sha512-lJELzKINpF1v74DXHbCRIkQ/+nUV1M+ntj+X1J8LxCgpmJZjfLmhFejiMSbjjD66fayxl5Z06tbs3HMyuik6rw==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
-    jest-message-util "^26.3.0"
-    jest-util "^26.3.0"
+    jest-message-util "^26.5.2"
+    jest-util "^26.5.2"
     slash "^3.0.0"
 
-"@jest/core@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc"
-  integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg==
+"@jest/core@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.5.2.tgz#e39f14676f4ba4632ecabfdc374071ab22131f22"
+  integrity sha512-LLTo1LQMg7eJjG/+P1NYqFof2B25EV1EqzD5FonklihG4UJKiK2JBIvWonunws6W7e+DhNLoFD+g05tCY03eyA==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/reporters" "^26.4.1"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/reporters" "^26.5.2"
+    "@jest/test-result" "^26.5.2"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-changed-files "^26.3.0"
-    jest-config "^26.4.2"
-    jest-haste-map "^26.3.0"
-    jest-message-util "^26.3.0"
+    jest-changed-files "^26.5.2"
+    jest-config "^26.5.2"
+    jest-haste-map "^26.5.2"
+    jest-message-util "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-resolve-dependencies "^26.4.2"
-    jest-runner "^26.4.2"
-    jest-runtime "^26.4.2"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
-    jest-watcher "^26.3.0"
+    jest-resolve "^26.5.2"
+    jest-resolve-dependencies "^26.5.2"
+    jest-runner "^26.5.2"
+    jest-runtime "^26.5.2"
+    jest-snapshot "^26.5.2"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.2"
+    jest-watcher "^26.5.2"
     micromatch "^4.0.2"
     p-each-series "^2.1.0"
     rimraf "^3.0.0"
@@ -853,15 +853,15 @@
   resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-26.5.0.tgz#1d07947adc51ea17766d9f0ccf5a8d6ea94c47dc"
   integrity sha512-DJ+pEBUIqarrbv1W/C39f9YH0rJ4wsXZ/VC6JafJPlHW2HOucKceeaqTOQj9MEDQZjySxMLkOq5mfXZXNZcmWw==
 
-"@jest/environment@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0"
-  integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA==
+"@jest/environment@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.5.2.tgz#eba3cfc698f6e03739628f699c28e8a07f5e65fe"
+  integrity sha512-YjhCD/Zhkz0/1vdlS/QN6QmuUdDkpgBdK4SdiVg4Y19e29g4VQYN5Xg8+YuHjdoWGY7wJHMxc79uDTeTOy9Ngw==
   dependencies:
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
+    jest-mock "^26.5.2"
 
 "@jest/fake-timers@^24.8.0":
   version "24.8.0"
@@ -872,37 +872,37 @@
     jest-message-util "^24.8.0"
     jest-mock "^24.8.0"
 
-"@jest/fake-timers@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a"
-  integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A==
+"@jest/fake-timers@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.5.2.tgz#1291ac81680ceb0dc7daa1f92c059307eea6400a"
+  integrity sha512-09Hn5Oraqt36V1akxQeWMVL0fR9c6PnEhpgLaYvREXZJAh2H2Y+QLCsl0g7uMoJeoWJAuz4tozk1prbR1Fc1sw==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@sinonjs/fake-timers" "^6.0.1"
     "@types/node" "*"
-    jest-message-util "^26.3.0"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
+    jest-message-util "^26.5.2"
+    jest-mock "^26.5.2"
+    jest-util "^26.5.2"
 
-"@jest/globals@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a"
-  integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow==
+"@jest/globals@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.5.2.tgz#c333f82c29e19ecb609a75d1a532915a5c956c59"
+  integrity sha512-9PmnFsAUJxpPt1s/stq02acS1YHliVBDNfAWMe1bwdRr1iTCfhbNt3ERQXrO/ZfZSweftoA26Q/2yhSVSWQ3sw==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/types" "^26.3.0"
-    expect "^26.4.2"
+    "@jest/environment" "^26.5.2"
+    "@jest/types" "^26.5.2"
+    expect "^26.5.2"
 
-"@jest/reporters@^26.4.1":
-  version "26.4.1"
-  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795"
-  integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ==
+"@jest/reporters@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.5.2.tgz#0f1c900c6af712b46853d9d486c9c0382e4050f6"
+  integrity sha512-zvq6Wvy6MmJq/0QY0YfOPb49CXKSf42wkJbrBPkeypVa8I+XDxijvFuywo6TJBX/ILPrdrlE/FW9vJZh6Rf9vA==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@jest/console" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/test-result" "^26.5.2"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
@@ -913,10 +913,10 @@
     istanbul-lib-report "^3.0.0"
     istanbul-lib-source-maps "^4.0.0"
     istanbul-reports "^3.0.2"
-    jest-haste-map "^26.3.0"
-    jest-resolve "^26.4.0"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-haste-map "^26.5.2"
+    jest-resolve "^26.5.2"
+    jest-util "^26.5.2"
+    jest-worker "^26.5.0"
     slash "^3.0.0"
     source-map "^0.6.0"
     string-length "^4.0.1"
@@ -934,10 +934,10 @@
     graceful-fs "^4.1.15"
     source-map "^0.6.0"
 
-"@jest/source-map@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9"
-  integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ==
+"@jest/source-map@^26.5.0":
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.5.0.tgz#98792457c85bdd902365cd2847b58fff05d96367"
+  integrity sha512-jWAw9ZwYHJMe9eZq/WrsHlwF8E3hM9gynlcDpOyCb9bR8wEd9ZNBZCi7/jZyzHxC7t3thZ10gO2IDhu0bPKS5g==
   dependencies:
     callsites "^3.0.0"
     graceful-fs "^4.2.4"
@@ -952,42 +952,42 @@
     "@jest/types" "^24.8.0"
     "@types/istanbul-lib-coverage" "^2.0.0"
 
-"@jest/test-result@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb"
-  integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg==
+"@jest/test-result@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.5.2.tgz#cc1a44cfd4db2ecee3fb0bc4e9fe087aa54b5230"
+  integrity sha512-E/Zp6LURJEGSCWpoMGmCFuuEI1OWuI3hmZwmULV0GsgJBh7u0rwqioxhRU95euUuviqBDN8ruX/vP/4bwYolXw==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/istanbul-lib-coverage" "^2.0.0"
     collect-v8-coverage "^1.0.0"
 
-"@jest/test-sequencer@^26.4.2":
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba"
-  integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog==
+"@jest/test-sequencer@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.5.2.tgz#c4559c7e134b27b020317303ee5399bf62917a4b"
+  integrity sha512-XmGEh7hh07H2B8mHLFCIgr7gA5Y6Hw1ZATIsbz2fOhpnQ5AnQtZk0gmP0Q5/+mVB2xygO64tVFQxOajzoptkNA==
   dependencies:
-    "@jest/test-result" "^26.3.0"
+    "@jest/test-result" "^26.5.2"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.3.0"
-    jest-runner "^26.4.2"
-    jest-runtime "^26.4.2"
+    jest-haste-map "^26.5.2"
+    jest-runner "^26.5.2"
+    jest-runtime "^26.5.2"
 
-"@jest/transform@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55"
-  integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A==
+"@jest/transform@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.5.2.tgz#6a0033a1d24316a1c75184d010d864f2c681bef5"
+  integrity sha512-AUNjvexh+APhhmS8S+KboPz+D3pCxPvEAGduffaAJYxIFxGi/ytZQkrqcKDUU0ERBAo5R7087fyOYr2oms1seg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     babel-plugin-istanbul "^6.0.0"
     chalk "^4.0.0"
     convert-source-map "^1.4.0"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.2.4"
-    jest-haste-map "^26.3.0"
+    jest-haste-map "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-util "^26.3.0"
+    jest-util "^26.5.2"
     micromatch "^4.0.2"
     pirates "^4.0.1"
     slash "^3.0.0"
@@ -1013,10 +1013,10 @@
     "@types/yargs" "^15.0.0"
     chalk "^3.0.0"
 
-"@jest/types@^26.3.0":
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71"
-  integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ==
+"@jest/types@^26.5.2":
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.5.2.tgz#44c24f30c8ee6c7f492ead9ec3f3c62a5289756d"
+  integrity sha512-QDs5d0gYiyetI8q+2xWdkixVQMklReZr4ltw7GFDtb4fuJIBCE6mzj2LnitGqCuAlLap6wPyb8fpoHgwZz5fdg==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.0"
     "@types/istanbul-reports" "^3.0.0"
@@ -1205,6 +1205,13 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/babel__traverse@^7.0.4":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
+  integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
+  dependencies:
+    "@babel/types" "^7.3.0"
+
 "@types/color-name@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"
@@ -1264,6 +1271,11 @@
   resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e"
   integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==
 
+"@types/stack-utils@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff"
+  integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==
+
 "@types/yargs-parser@*":
   version "15.0.0"
   resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d"
@@ -1594,16 +1606,16 @@ babel-eslint@^10.1.0:
     eslint-visitor-keys "^1.0.0"
     resolve "^1.12.0"
 
-babel-jest@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463"
-  integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g==
+babel-jest@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.5.2.tgz#164f367a35946c6cf54eaccde8762dec50422250"
+  integrity sha512-U3KvymF3SczA3vOL/cgiUFOznfMET+XDIXiWnoJV45siAp2pLMG8i2+/MGZlAC3f/F6Q40LR4M4qDrWZ9wkK8A==
   dependencies:
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/babel__core" "^7.1.7"
     babel-plugin-istanbul "^6.0.0"
-    babel-preset-jest "^26.3.0"
+    babel-preset-jest "^26.5.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     slash "^3.0.0"
@@ -1626,10 +1638,10 @@ babel-plugin-istanbul@^6.0.0:
     istanbul-lib-instrument "^4.0.0"
     test-exclude "^6.0.0"
 
-babel-plugin-jest-hoist@^26.2.0:
-  version "26.2.0"
-  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd"
-  integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA==
+babel-plugin-jest-hoist@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.5.0.tgz#3916b3a28129c29528de91e5784a44680db46385"
+  integrity sha512-ck17uZFD3CDfuwCLATWZxkkuGGFhMij8quP8CNhwj8ek1mqFgbFzRJ30xwC04LLscj/aKsVFfRST+b5PT7rSuw==
   dependencies:
     "@babel/template" "^7.3.3"
     "@babel/types" "^7.3.3"
@@ -1691,12 +1703,12 @@ babel-preset-fbjs@^3.3.0:
     "@babel/plugin-transform-template-literals" "^7.0.0"
     babel-plugin-syntax-trailing-function-commas "^7.0.0-beta.0"
 
-babel-preset-jest@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776"
-  integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw==
+babel-preset-jest@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.5.0.tgz#f1b166045cd21437d1188d29f7fba470d5bdb0e7"
+  integrity sha512-F2vTluljhqkiGSJGBg/jOruA8vIIIL11YrxRcO7nviNTMbbofPSHwnm8mgP7d/wS7wRSexRoI6X1A6T74d4LQA==
   dependencies:
-    babel-plugin-jest-hoist "^26.2.0"
+    babel-plugin-jest-hoist "^26.5.0"
     babel-preset-current-node-syntax "^0.1.3"
 
 balanced-match@^1.0.0:
@@ -2425,10 +2437,10 @@ detox@15.4.4:
     yargs "^13.0.0"
     yargs-parser "^13.0.0"
 
-diff-sequences@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2"
-  integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig==
+diff-sequences@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.5.0.tgz#ef766cf09d43ed40406611f11c6d8d9dd8b2fefd"
+  integrity sha512-ZXx86srb/iYy6jG71k++wBN9P9J05UNQ5hQHQd9MtMPvcqXPx/vKU69jfHV637D00Q2gSgPk2D+jSx3l1lDW/Q==
 
 doctrine@^2.1.0:
   version "2.1.0"
@@ -2862,16 +2874,16 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expect@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1"
-  integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA==
+expect@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-26.5.2.tgz#3e0631c4a657a83dbec769ad246a2998953a55a6"
+  integrity sha512-ccTGrXZd8DZCcvCz4htGXTkd/LOoy6OEtiDS38x3/VVf6E4AQL0QoeksBiw7BtGR5xDNiRYPB8GN6pfbuTOi7w==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     ansi-styles "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
+    jest-matcher-utils "^26.5.2"
+    jest-message-util "^26.5.2"
     jest-regex-util "^26.0.0"
 
 extend-shallow@^2.0.1:
@@ -3852,67 +3864,67 @@ istanbul-reports@^3.0.2:
     html-escaper "^2.0.0"
     istanbul-lib-report "^3.0.0"
 
-jest-changed-files@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1"
-  integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g==
+jest-changed-files@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.5.2.tgz#330232c6a5c09a7f040a5870e8f0a9c6abcdbed5"
+  integrity sha512-qSmssmiIdvM5BWVtyK/nqVpN3spR5YyvkvPqz1x3BR1bwIxsWmU/MGwLoCrPNLbkG2ASAKfvmJpOduEApBPh2w==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     execa "^4.0.0"
     throat "^5.0.0"
 
-jest-cli@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da"
-  integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw==
+jest-cli@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.5.2.tgz#0df114399b4036a3f046f0a9f25c50372c76b3a2"
+  integrity sha512-usm48COuUvRp8YEG5OWOaxbSM0my7eHn3QeBWxiGUuFhvkGVBvl1fic4UjC02EAEQtDv8KrNQUXdQTV6ZZBsoA==
   dependencies:
-    "@jest/core" "^26.4.2"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/core" "^26.5.2"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
     import-local "^3.0.2"
     is-ci "^2.0.0"
-    jest-config "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-config "^26.5.2"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.2"
     prompts "^2.0.1"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
-jest-config@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558"
-  integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A==
+jest-config@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.5.2.tgz#6e828e25f10124433dd008fbd83348636de0972a"
+  integrity sha512-dqJOnSegNdE5yDiuGHsjTM5gec7Z4AcAMHiW+YscbOYJAlb3LEtDSobXCq0or9EmGQI5SFmKy4T7P1FxetJOfg==
   dependencies:
     "@babel/core" "^7.1.0"
-    "@jest/test-sequencer" "^26.4.2"
-    "@jest/types" "^26.3.0"
-    babel-jest "^26.3.0"
+    "@jest/test-sequencer" "^26.5.2"
+    "@jest/types" "^26.5.2"
+    babel-jest "^26.5.2"
     chalk "^4.0.0"
     deepmerge "^4.2.2"
     glob "^7.1.1"
     graceful-fs "^4.2.4"
-    jest-environment-jsdom "^26.3.0"
-    jest-environment-node "^26.3.0"
+    jest-environment-jsdom "^26.5.2"
+    jest-environment-node "^26.5.2"
     jest-get-type "^26.3.0"
-    jest-jasmine2 "^26.4.2"
+    jest-jasmine2 "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-resolve "^26.5.2"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.2"
     micromatch "^4.0.2"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
-jest-diff@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa"
-  integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ==
+jest-diff@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.5.2.tgz#8e26cb32dc598e8b8a1b9deff55316f8313c8053"
+  integrity sha512-HCSWDUGwsov5oTlGzrRM+UPJI/Dpqi9jzeV0fdRNi3Ch5bnoXhnyJMmVg2juv9081zLIy3HGPI5mcuGgXM2xRA==
   dependencies:
     chalk "^4.0.0"
-    diff-sequences "^26.3.0"
+    diff-sequences "^26.5.0"
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
 jest-docblock@^21.0.0:
   version "21.2.0"
@@ -3926,41 +3938,41 @@ jest-docblock@^26.0.0:
   dependencies:
     detect-newline "^3.0.0"
 
-jest-each@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae"
-  integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA==
+jest-each@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.5.2.tgz#35e68d6906a7f826d3ca5803cfe91d17a5a34c31"
+  integrity sha512-w7D9FNe0m2D3yZ0Drj9CLkyF/mGhmBSULMQTypzAKR746xXnjUrK8GUJdlLTWUF6dd0ks3MtvGP7/xNFr9Aphg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
-    jest-util "^26.3.0"
-    pretty-format "^26.4.2"
+    jest-util "^26.5.2"
+    pretty-format "^26.5.2"
 
-jest-environment-jsdom@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c"
-  integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA==
+jest-environment-jsdom@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.5.2.tgz#5feab05b828fd3e4b96bee5e0493464ddd2bb4bc"
+  integrity sha512-fWZPx0bluJaTQ36+PmRpvUtUlUFlGGBNyGX1SN3dLUHHMcQ4WseNEzcGGKOw4U5towXgxI4qDoI3vwR18H0RTw==
   dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.5.2"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
-    jsdom "^16.2.2"
-
-jest-environment-node@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849"
-  integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw==
-  dependencies:
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    jest-mock "^26.5.2"
+    jest-util "^26.5.2"
+    jsdom "^16.4.0"
+
+jest-environment-node@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.5.2.tgz#275a0f01b5e47447056f1541a15ed4da14acca03"
+  integrity sha512-YHjnDsf/GKFCYMGF1V+6HF7jhY1fcLfLNBDjhAOvFGvt6d8vXvNdJGVM7uTZ2VO/TuIyEFhPGaXMX5j3h7fsrA==
+  dependencies:
+    "@jest/environment" "^26.5.2"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
-    jest-mock "^26.3.0"
-    jest-util "^26.3.0"
+    jest-mock "^26.5.2"
+    jest-util "^26.5.2"
 
 jest-get-type@^24.9.0:
   version "24.9.0"
@@ -3991,49 +4003,49 @@ jest-haste-map@^24.7.1:
   optionalDependencies:
     fsevents "^1.2.7"
 
-jest-haste-map@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726"
-  integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA==
+jest-haste-map@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.5.2.tgz#a15008abfc502c18aa56e4919ed8c96304ceb23d"
+  integrity sha512-lJIAVJN3gtO3k4xy+7i2Xjtwh8CfPcH08WYjZpe9xzveDaqGw9fVNCpkYu6M525wKFVkLmyi7ku+DxCAP1lyMA==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/graceful-fs" "^4.1.2"
     "@types/node" "*"
     anymatch "^3.0.3"
     fb-watchman "^2.0.0"
     graceful-fs "^4.2.4"
     jest-regex-util "^26.0.0"
-    jest-serializer "^26.3.0"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-serializer "^26.5.0"
+    jest-util "^26.5.2"
+    jest-worker "^26.5.0"
     micromatch "^4.0.2"
     sane "^4.0.3"
     walker "^1.0.7"
   optionalDependencies:
     fsevents "^2.1.2"
 
-jest-jasmine2@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257"
-  integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA==
+jest-jasmine2@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.5.2.tgz#0e33819d31b1f2aab5efd1e02ce502209c0e64a2"
+  integrity sha512-2J+GYcgLVPTkpmvHEj0/IDTIAuyblGNGlyGe4fLfDT2aktEPBYvoxUwFiOmDDxxzuuEAD2uxcYXr0+1Yw4tjFA==
   dependencies:
     "@babel/traverse" "^7.1.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/source-map" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/environment" "^26.5.2"
+    "@jest/source-map" "^26.5.0"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
     co "^4.6.0"
-    expect "^26.4.2"
+    expect "^26.5.2"
     is-generator-fn "^2.0.0"
-    jest-each "^26.4.2"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-runtime "^26.4.2"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    pretty-format "^26.4.2"
+    jest-each "^26.5.2"
+    jest-matcher-utils "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-runtime "^26.5.2"
+    jest-snapshot "^26.5.2"
+    jest-util "^26.5.2"
+    pretty-format "^26.5.2"
     throat "^5.0.0"
 
 jest-junit@^10.0.0:
@@ -4047,23 +4059,23 @@ jest-junit@^10.0.0:
     uuid "^3.3.3"
     xml "^1.0.1"
 
-jest-leak-detector@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f"
-  integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA==
+jest-leak-detector@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.5.2.tgz#83fcf9a4a6ef157549552cb4f32ca1d6221eea69"
+  integrity sha512-h7ia3dLzBFItmYERaLPEtEKxy3YlcbcRSjj0XRNJgBEyODuu+3DM2o62kvIFvs3PsaYoIIv+e+nLRI61Dj1CNw==
   dependencies:
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
-jest-matcher-utils@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06"
-  integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q==
+jest-matcher-utils@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.5.2.tgz#6aa2c76ce8b9c33e66f8856ff3a52bab59e6c85a"
+  integrity sha512-W9GO9KBIC4gIArsNqDUKsLnhivaqf8MSs6ujO/JDcPIQrmY+aasewweXVET8KdrJ6ADQaUne5UzysvF/RR7JYA==
   dependencies:
     chalk "^4.0.0"
-    jest-diff "^26.4.2"
+    jest-diff "^26.5.2"
     jest-get-type "^26.3.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
 jest-message-util@^24.8.0:
   version "24.8.0"
@@ -4079,14 +4091,14 @@ jest-message-util@^24.8.0:
     slash "^2.0.0"
     stack-utils "^1.0.1"
 
-jest-message-util@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a"
-  integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA==
+jest-message-util@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.5.2.tgz#6c4c4c46dcfbabb47cd1ba2f6351559729bc11bb"
+  integrity sha512-Ocp9UYZ5Jl15C5PNsoDiGEk14A4NG0zZKknpWdZGoMzJuGAkVt10e97tnEVMYpk7LnQHZOfuK2j/izLBMcuCZw==
   dependencies:
     "@babel/code-frame" "^7.0.0"
-    "@jest/types" "^26.3.0"
-    "@types/stack-utils" "^1.0.1"
+    "@jest/types" "^26.5.2"
+    "@types/stack-utils" "^2.0.0"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     micromatch "^4.0.2"
@@ -4100,12 +4112,12 @@ jest-mock@^24.8.0:
   dependencies:
     "@jest/types" "^24.8.0"
 
-jest-mock@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba"
-  integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q==
+jest-mock@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.5.2.tgz#c9302e8ef807f2bfc749ee52e65ad11166a1b6a1"
+  integrity sha512-9SiU4b5PtO51v0MtJwVRqeGEroH66Bnwtq4ARdNP7jNXbpT7+ByeWNAk4NeT/uHfNSVDXEXgQo1XRuwEqS6Rdw==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
 
 jest-pnp-resolver@^1.2.2:
@@ -4118,119 +4130,120 @@ jest-regex-util@^26.0.0:
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28"
   integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==
 
-jest-resolve-dependencies@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5"
-  integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ==
+jest-resolve-dependencies@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.5.2.tgz#ee30b7cfea81c81bf5e195a9287d7ec07f893170"
+  integrity sha512-LLkc8LuRtxqOx0AtX/Npa2C4I23WcIrwUgNtHYXg4owYF/ZDQShcwBAHjYZIFR06+HpQcZ43+kCTMlQ3aDCYTg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-snapshot "^26.4.2"
+    jest-snapshot "^26.5.2"
 
-jest-resolve@^26.4.0:
-  version "26.4.0"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7"
-  integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg==
+jest-resolve@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.5.2.tgz#0d719144f61944a428657b755a0e5c6af4fc8602"
+  integrity sha512-XsPxojXGRA0CoDD7Vis59ucz2p3cQFU5C+19tz3tLEAlhYKkK77IL0cjYjikY9wXnOaBeEdm1rOgSJjbZWpcZg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
     jest-pnp-resolver "^1.2.2"
-    jest-util "^26.3.0"
+    jest-util "^26.5.2"
     read-pkg-up "^7.0.1"
     resolve "^1.17.0"
     slash "^3.0.0"
 
-jest-runner@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853"
-  integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g==
+jest-runner@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.5.2.tgz#4f9e6b0bb7eb4710c209a9e145b8a10894f4c19f"
+  integrity sha512-GKhYxtSX5+tXZsd2QwfkDqPIj5C2HqOdXLRc2x2qYqWE26OJh17xo58/fN/mLhRkO4y6o60ZVloan7Kk5YA6hg==
   dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/console" "^26.5.2"
+    "@jest/environment" "^26.5.2"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
     emittery "^0.7.1"
     exit "^0.1.2"
     graceful-fs "^4.2.4"
-    jest-config "^26.4.2"
+    jest-config "^26.5.2"
     jest-docblock "^26.0.0"
-    jest-haste-map "^26.3.0"
-    jest-leak-detector "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-resolve "^26.4.0"
-    jest-runtime "^26.4.2"
-    jest-util "^26.3.0"
-    jest-worker "^26.3.0"
+    jest-haste-map "^26.5.2"
+    jest-leak-detector "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-resolve "^26.5.2"
+    jest-runtime "^26.5.2"
+    jest-util "^26.5.2"
+    jest-worker "^26.5.0"
     source-map-support "^0.5.6"
     throat "^5.0.0"
 
-jest-runtime@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42"
-  integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ==
-  dependencies:
-    "@jest/console" "^26.3.0"
-    "@jest/environment" "^26.3.0"
-    "@jest/fake-timers" "^26.3.0"
-    "@jest/globals" "^26.4.2"
-    "@jest/source-map" "^26.3.0"
-    "@jest/test-result" "^26.3.0"
-    "@jest/transform" "^26.3.0"
-    "@jest/types" "^26.3.0"
+jest-runtime@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.5.2.tgz#b72f5f79eb2fe0c46bfef4cdb9c1e01d1c69ba41"
+  integrity sha512-zArr4DatX/Sn0wswX/AnAuJgmwgAR5rNtrUz36HR8BfMuysHYNq5sDbYHuLC4ICyRdy5ae/KQ+sczxyS9G6Qvw==
+  dependencies:
+    "@jest/console" "^26.5.2"
+    "@jest/environment" "^26.5.2"
+    "@jest/fake-timers" "^26.5.2"
+    "@jest/globals" "^26.5.2"
+    "@jest/source-map" "^26.5.0"
+    "@jest/test-result" "^26.5.2"
+    "@jest/transform" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/yargs" "^15.0.0"
     chalk "^4.0.0"
     collect-v8-coverage "^1.0.0"
     exit "^0.1.2"
     glob "^7.1.3"
     graceful-fs "^4.2.4"
-    jest-config "^26.4.2"
-    jest-haste-map "^26.3.0"
-    jest-message-util "^26.3.0"
-    jest-mock "^26.3.0"
+    jest-config "^26.5.2"
+    jest-haste-map "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-mock "^26.5.2"
     jest-regex-util "^26.0.0"
-    jest-resolve "^26.4.0"
-    jest-snapshot "^26.4.2"
-    jest-util "^26.3.0"
-    jest-validate "^26.4.2"
+    jest-resolve "^26.5.2"
+    jest-snapshot "^26.5.2"
+    jest-util "^26.5.2"
+    jest-validate "^26.5.2"
     slash "^3.0.0"
     strip-bom "^4.0.0"
-    yargs "^15.3.1"
+    yargs "^15.4.1"
 
 jest-serializer@^24.4.0:
   version "24.4.0"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-24.4.0.tgz#f70c5918c8ea9235ccb1276d232e459080588db3"
   integrity sha512-k//0DtglVstc1fv+GY/VHDIjrtNjdYvYjMlbLUed4kxrE92sIUewOi5Hj3vrpB8CXfkJntRPDRjCrCvUhBdL8Q==
 
-jest-serializer@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef"
-  integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow==
+jest-serializer@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.5.0.tgz#f5425cc4c5f6b4b355f854b5f0f23ec6b962bc13"
+  integrity sha512-+h3Gf5CDRlSLdgTv7y0vPIAoLgX/SI7T4v6hy+TEXMgYbv+ztzbg5PSN6mUXAT/hXYHvZRWm+MaObVfqkhCGxA==
   dependencies:
     "@types/node" "*"
     graceful-fs "^4.2.4"
 
-jest-snapshot@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6"
-  integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg==
+jest-snapshot@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.5.2.tgz#0cf7642eaf8e8d2736bd443f619959bf237f9ccf"
+  integrity sha512-MkXIDvEefzDubI/WaDVSRH4xnkuirP/Pz8LhAIDXcVQTmcEfwxywj5LGwBmhz+kAAIldA7XM4l96vbpzltSjqg==
   dependencies:
     "@babel/types" "^7.0.0"
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
+    "@types/babel__traverse" "^7.0.4"
     "@types/prettier" "^2.0.0"
     chalk "^4.0.0"
-    expect "^26.4.2"
+    expect "^26.5.2"
     graceful-fs "^4.2.4"
-    jest-diff "^26.4.2"
+    jest-diff "^26.5.2"
     jest-get-type "^26.3.0"
-    jest-haste-map "^26.3.0"
-    jest-matcher-utils "^26.4.2"
-    jest-message-util "^26.3.0"
-    jest-resolve "^26.4.0"
+    jest-haste-map "^26.5.2"
+    jest-matcher-utils "^26.5.2"
+    jest-message-util "^26.5.2"
+    jest-resolve "^26.5.2"
     natural-compare "^1.4.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
     semver "^7.3.2"
 
 jest-util@^24.8.0:
@@ -4251,12 +4264,12 @@ jest-util@^24.8.0:
     slash "^2.0.0"
     source-map "^0.6.0"
 
-jest-util@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e"
-  integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw==
+jest-util@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.5.2.tgz#8403f75677902cc52a1b2140f568e91f8ed4f4d7"
+  integrity sha512-WTL675bK+GSSAYgS8z9FWdCT2nccO1yTIplNLPlP0OD8tUk/H5IrWKMMRudIQQ0qp8bb4k+1Qa8CxGKq9qnYdg==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     chalk "^4.0.0"
     graceful-fs "^4.2.4"
@@ -4275,29 +4288,29 @@ jest-validate@^24.7.0, jest-validate@^24.9.0:
     leven "^3.1.0"
     pretty-format "^24.9.0"
 
-jest-validate@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c"
-  integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ==
+jest-validate@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.5.2.tgz#7ea266700b64234cd1c0cee982490c5a80e9b0f0"
+  integrity sha512-FmJks0zY36mp6Af/5sqO6CTL9bNMU45yKCJk3hrz8d2aIqQIlN1pr9HPIwZE8blLaewOla134nt5+xAmWsx3SQ==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     camelcase "^6.0.0"
     chalk "^4.0.0"
     jest-get-type "^26.3.0"
     leven "^3.1.0"
-    pretty-format "^26.4.2"
+    pretty-format "^26.5.2"
 
-jest-watcher@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08"
-  integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ==
+jest-watcher@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.5.2.tgz#2957f4461007e0769d74b537379ecf6b7c696916"
+  integrity sha512-i3m1NtWzF+FXfJ3ljLBB/WQEp4uaNhX7QcQUWMokcifFTUQBDFyUMEwk0JkJ1kopHbx7Een3KX0Q7+9koGM/Pw==
   dependencies:
-    "@jest/test-result" "^26.3.0"
-    "@jest/types" "^26.3.0"
+    "@jest/test-result" "^26.5.2"
+    "@jest/types" "^26.5.2"
     "@types/node" "*"
     ansi-escapes "^4.2.1"
     chalk "^4.0.0"
-    jest-util "^26.3.0"
+    jest-util "^26.5.2"
     string-length "^4.0.1"
 
 jest-worker@^24.6.0:
@@ -4308,23 +4321,23 @@ jest-worker@^24.6.0:
     merge-stream "^1.0.1"
     supports-color "^6.1.0"
 
-jest-worker@^26.3.0:
-  version "26.3.0"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f"
-  integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw==
+jest-worker@^26.5.0:
+  version "26.5.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.5.0.tgz#87deee86dbbc5f98d9919e0dadf2c40e3152fa30"
+  integrity sha512-kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
     supports-color "^7.0.0"
 
-jest@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312"
-  integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw==
+jest@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-26.5.2.tgz#c6791642b331fe7abd2f993b0a74aa546f7be0fb"
+  integrity sha512-4HFabJVwsgDwul/7rhXJ3yFAF/aUkVIXiJWmgFxb+WMdZG39fVvOwYAs8/3r4AlFPc4m/n5sTMtuMbOL3kNtrQ==
   dependencies:
-    "@jest/core" "^26.4.2"
+    "@jest/core" "^26.5.2"
     import-local "^3.0.2"
-    jest-cli "^26.4.2"
+    jest-cli "^26.5.2"
 
 jetifier@^1.6.2:
   version "1.6.4"
@@ -4379,10 +4392,10 @@ jscodeshift@^0.11.0:
     temp "^0.8.1"
     write-file-atomic "^2.3.0"
 
-jsdom@^16.2.2:
-  version "16.2.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.2.2.tgz#76f2f7541646beb46a938f5dc476b88705bedf2b"
-  integrity sha512-pDFQbcYtKBHxRaP55zGXCJWgFHkDAYbKcsXEK/3Icu9nKYZkutUXfLBwbD+09XDutkYSHcgfQLZ0qvpAAm9mvg==
+jsdom@^16.4.0:
+  version "16.4.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb"
+  integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==
   dependencies:
     abab "^2.0.3"
     acorn "^7.1.1"
@@ -4404,7 +4417,7 @@ jsdom@^16.2.2:
     tough-cookie "^3.0.1"
     w3c-hr-time "^1.0.2"
     w3c-xmlserializer "^2.0.0"
-    webidl-conversions "^6.0.0"
+    webidl-conversions "^6.1.0"
     whatwg-encoding "^1.0.5"
     whatwg-mimetype "^2.3.0"
     whatwg-url "^8.0.0"
@@ -5748,12 +5761,12 @@ pretty-format@^25.1.0, pretty-format@^25.2.0:
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
 
-pretty-format@^26.4.2:
-  version "26.4.2"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237"
-  integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA==
+pretty-format@^26.5.2:
+  version "26.5.2"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.5.2.tgz#5d896acfdaa09210683d34b6dc0e6e21423cd3e1"
+  integrity sha512-VizyV669eqESlkOikKJI8Ryxl/kPpbdLwNdPs2GrbQs18MpySB5S0Yo0N7zkg2xTRiFq4CFw8ct5Vg4a0xP0og==
   dependencies:
-    "@jest/types" "^26.3.0"
+    "@jest/types" "^26.5.2"
     ansi-regex "^5.0.0"
     ansi-styles "^4.0.0"
     react-is "^16.12.0"
@@ -7218,7 +7231,7 @@ webidl-conversions@^5.0.0:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff"
   integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==
 
-webidl-conversions@^6.0.0:
+webidl-conversions@^6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz#9111b4d7ea80acd40f5270d666621afa78b69514"
   integrity sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==
@@ -7469,6 +7482,14 @@ yargs-parser@^18.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^18.1.2:
+  version "18.1.3"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
+  integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs@^13.0.0:
   version "13.2.2"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.2.tgz#0c101f580ae95cea7f39d927e7770e3fdc97f993"
@@ -7519,3 +7540,20 @@ yargs@^15.1.0, yargs@^15.3.1:
     which-module "^2.0.0"
     y18n "^4.0.0"
     yargs-parser "^18.1.1"
+
+yargs@^15.4.1:
+  version "15.4.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
+  integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==
+  dependencies:
+    cliui "^6.0.0"
+    decamelize "^1.2.0"
+    find-up "^4.1.0"
+    get-caller-file "^2.0.1"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^4.2.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^18.1.2"

From d76556543f96f4d739be3a708b8f6314bb32cc87 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 7 Oct 2020 11:26:08 -0700
Subject: [PATCH 197/241] fix ReadableArray annotations (#30122)

Summary:
Fix ReadableArray annotations, because these methods throw ArrayIndexOutOfBoundsException instead of null if index is not found.

## Changelog

[Android] [Changed] - fix ReadableArray null annotations. Possibly breaking change for Kotlin apps.

Pull Request resolved: https://github.com/facebook/react-native/pull/30122

Test Plan: RNTester app builds and runs as expected, and show correct type in when used with Kotlin code.

Reviewed By: JoshuaGross

Differential Revision: D24164326

Pulled By: fkgozali

fbshipit-source-id: 0c3f8fa9accbd32cc71c50befe9330e5201643f6
---
 .../main/java/com/facebook/react/bridge/ReadableArray.java | 7 +++----
 .../com/facebook/react/bridge/ReadableNativeArray.java     | 6 +++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
index 5c3ac667e0e828..82ffb0e8ab3ad5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableArray.java
@@ -8,7 +8,6 @@
 package com.facebook.react.bridge;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
 import java.util.ArrayList;
 
 /**
@@ -27,13 +26,13 @@ public interface ReadableArray {
 
   int getInt(int index);
 
-  @Nullable
+  @NonNull
   String getString(int index);
 
-  @Nullable
+  @NonNull
   ReadableArray getArray(int index);
 
-  @Nullable
+  @NonNull
   ReadableMap getMap(int index);
 
   @NonNull
diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
index 361457dbadd067..cc80051b4954e4 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeArray.java
@@ -98,17 +98,17 @@ public int getInt(int index) {
   }
 
   @Override
-  public @Nullable String getString(int index) {
+  public @NonNull String getString(int index) {
     return (String) getLocalArray()[index];
   }
 
   @Override
-  public @Nullable ReadableNativeArray getArray(int index) {
+  public @NonNull ReadableNativeArray getArray(int index) {
     return (ReadableNativeArray) getLocalArray()[index];
   }
 
   @Override
-  public @Nullable ReadableNativeMap getMap(int index) {
+  public @NonNull ReadableNativeMap getMap(int index) {
     return (ReadableNativeMap) getLocalArray()[index];
   }
 

From 1015194ba1a81eab99000d589914100e4b9ea037 Mon Sep 17 00:00:00 2001
From: Dulmandakh <dulmandakh@gmail.com>
Date: Wed, 7 Oct 2020 13:17:31 -0700
Subject: [PATCH 198/241] fix ReadableNativeMap.getNullableValue to match
 signature (#30121)

Summary:
This PR changes ReadableNativeMap.getNullableValue to return null if key not found, instead of throwing exception. This matches method signature and nullable annotation.

## Changelog

[Android] [Changed] - fix ReadableNativeMap.getNullableValue to match signature

Pull Request resolved: https://github.com/facebook/react-native/pull/30121

Test Plan: RNTester app builds and runs as expected, and getNullableValue will return null instead of throwing exception.

Reviewed By: JoshuaGross

Differential Revision: D24164302

Pulled By: fkgozali

fbshipit-source-id: 572c1d4ae5fd493aa0018c2df1dfc7fc91cb4b6b
---
 .../main/java/com/facebook/react/bridge/ReadableNativeMap.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
index e8609d8ead5348..ae471c2a8c4384 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/bridge/ReadableNativeMap.java
@@ -120,7 +120,7 @@ private <T> T getValue(String name, Class<T> type) {
     if (hasKey(name)) {
       return getLocalMap().get(name);
     }
-    throw new NoSuchKeyException(name);
+    return null;
   }
 
   private @Nullable <T> T getNullableValue(String name, Class<T> type) {

From 8e943d8f5a0d4f9cd0e046215a90f57d85244353 Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Wed, 7 Oct 2020 14:25:51 -0700
Subject: [PATCH 199/241] Remove reliance on util.inspect in snapshot tests

Summary:
According to Node's documentation: https://nodejs.org/api/util.html#util_util_inspect_object_showhidden_depth_colors

> The util.inspect() method returns a string representation of object that is intended for debugging. **The output of util.inspect may change at any time and should not be depended upon programmatically.**

Therefore, this diff switches over our RN Codegen snapshot tests to use a `JSON.stringify` call, followed by a replace of `"` with `'`. This gets the job done without compromising readability.

**Question:** Why do we not use `"`? A: Jest escapes all `"` in the snapshots, which makes reading the snapshots/using them in the console harder.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24157056

fbshipit-source-id: 2f1aa2df28ac3ed4aa17bcdbcd23846ddbf804cf
---
 .../component-parser-test.js.snap             | 9378 +++++++++--------
 .../__tests__/component-parser-test.js        |    9 +-
 .../module-parser-snapshot-test.js.snap       | 1298 ++-
 .../__tests__/module-parser-snapshot-test.js  |    9 +-
 4 files changed, 5832 insertions(+), 4862 deletions(-)

diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
index abfd9047f17acc..b8db619b9bb53e 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/__snapshots__/component-parser-test.js.snap
@@ -36,415 +36,523 @@ exports[`RN Codegen Flow Parser Fails with error message PROPS_SPREAD_CONFLICTS_
 
 exports[`RN Codegen Flow Parser can generate fixture ALL_PROP_TYPES_NO_EVENTS 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [],
-          props: [
+          'events': [],
+          'props': [
             {
-              name: 'boolean_required',
-              optional: false,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+              'name': 'boolean_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': false
+              }
             },
             {
-              name: 'boolean_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+              'name': 'boolean_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': true
+              }
             },
             {
-              name: 'boolean_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+              'name': 'boolean_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': true
+              }
             },
             {
-              name: 'boolean_null_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: null }
+              'name': 'boolean_null_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'boolean_null_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: null }
+              'name': 'boolean_null_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'string_required',
-              optional: false,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'string_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'string_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+              'name': 'string_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': ''
+              }
             },
             {
-              name: 'string_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+              'name': 'string_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': ''
+              }
             },
             {
-              name: 'string_null_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'string_null_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'string_null_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'string_null_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'stringish_required',
-              optional: false,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'stringish_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'stringish_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+              'name': 'stringish_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': ''
+              }
             },
             {
-              name: 'stringish_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+              'name': 'stringish_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': ''
+              }
             },
             {
-              name: 'stringish_null_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'stringish_null_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'stringish_null_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'stringish_null_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'double_required',
-              optional: false,
-              typeAnnotation: { type: 'DoubleTypeAnnotation', default: 0 }
+              'name': 'double_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'DoubleTypeAnnotation',
+                'default': 0
+              }
             },
             {
-              name: 'double_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'DoubleTypeAnnotation', default: 1.1 }
+              'name': 'double_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'DoubleTypeAnnotation',
+                'default': 1.1
+              }
             },
             {
-              name: 'double_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'DoubleTypeAnnotation', default: 1.1 }
+              'name': 'double_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'DoubleTypeAnnotation',
+                'default': 1.1
+              }
             },
             {
-              name: 'float_required',
-              optional: false,
-              typeAnnotation: { type: 'FloatTypeAnnotation', default: 0 }
+              'name': 'float_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FloatTypeAnnotation',
+                'default': 0
+              }
             },
             {
-              name: 'float_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'FloatTypeAnnotation', default: 1.1 }
+              'name': 'float_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'FloatTypeAnnotation',
+                'default': 1.1
+              }
             },
             {
-              name: 'float_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'FloatTypeAnnotation', default: 1.1 }
+              'name': 'float_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'FloatTypeAnnotation',
+                'default': 1.1
+              }
             },
             {
-              name: 'float_null_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'FloatTypeAnnotation', default: null }
+              'name': 'float_null_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'FloatTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'float_null_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'FloatTypeAnnotation', default: null }
+              'name': 'float_null_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'FloatTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'int32_required',
-              optional: false,
-              typeAnnotation: { type: 'Int32TypeAnnotation', default: 0 }
+              'name': 'int32_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'Int32TypeAnnotation',
+                'default': 0
+              }
             },
             {
-              name: 'int32_optional_key',
-              optional: true,
-              typeAnnotation: { type: 'Int32TypeAnnotation', default: 1 }
+              'name': 'int32_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'Int32TypeAnnotation',
+                'default': 1
+              }
             },
             {
-              name: 'int32_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'Int32TypeAnnotation', default: 1 }
+              'name': 'int32_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'Int32TypeAnnotation',
+                'default': 1
+              }
             },
             {
-              name: 'enum_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'StringEnumTypeAnnotation',
-                default: 'small',
-                options: [ { name: 'small' }, { name: 'large' } ]
+              'name': 'enum_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringEnumTypeAnnotation',
+                'default': 'small',
+                'options': [
+                  {
+                    'name': 'small'
+                  },
+                  {
+                    'name': 'large'
+                  }
+                ]
               }
             },
             {
-              name: 'enum_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'StringEnumTypeAnnotation',
-                default: 'small',
-                options: [ { name: 'small' }, { name: 'large' } ]
+              'name': 'enum_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'StringEnumTypeAnnotation',
+                'default': 'small',
+                'options': [
+                  {
+                    'name': 'small'
+                  },
+                  {
+                    'name': 'large'
+                  }
+                ]
               }
             },
             {
-              name: 'int_enum_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'Int32EnumTypeAnnotation',
-                default: 0,
-                options: [ { value: 0 }, { value: 1 } ]
+              'name': 'int_enum_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'Int32EnumTypeAnnotation',
+                'default': 0,
+                'options': [
+                  {
+                    'value': 0
+                  },
+                  {
+                    'value': 1
+                  }
+                ]
               }
             },
             {
-              name: 'object_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'object_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'object_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'object_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'object_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'object_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'image_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ImageSourcePrimitive'
+              'name': 'image_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ImageSourcePrimitive'
               }
             },
             {
-              name: 'image_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ImageSourcePrimitive'
+              'name': 'image_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ImageSourcePrimitive'
               }
             },
             {
-              name: 'image_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ImageSourcePrimitive'
+              'name': 'image_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ImageSourcePrimitive'
               }
             },
             {
-              name: 'color_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'color_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'color_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'color_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'color_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'color_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'color_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'color_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'color_array_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'color_array_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'color_array_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'color_array_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'color_array_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'color_array_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'color_array_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'color_array_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'processed_color_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'processed_color_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'processed_color_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'processed_color_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'processed_color_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'processed_color_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'processed_color_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'ColorPrimitive'
+              'name': 'processed_color_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'ColorPrimitive'
               }
             },
             {
-              name: 'point_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'PointPrimitive'
+              'name': 'point_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'PointPrimitive'
               }
             },
             {
-              name: 'point_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'PointPrimitive'
+              'name': 'point_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'PointPrimitive'
               }
             },
             {
-              name: 'point_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'PointPrimitive'
+              'name': 'point_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'PointPrimitive'
               }
             },
             {
-              name: 'point_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'PointPrimitive'
+              'name': 'point_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'PointPrimitive'
               }
             },
             {
-              name: 'insets_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'EdgeInsetsPrimitive'
+              'name': 'insets_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'EdgeInsetsPrimitive'
               }
             },
             {
-              name: 'insets_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'EdgeInsetsPrimitive'
+              'name': 'insets_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'EdgeInsetsPrimitive'
               }
             },
             {
-              name: 'insets_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'EdgeInsetsPrimitive'
+              'name': 'insets_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'EdgeInsetsPrimitive'
               }
             },
             {
-              name: 'insets_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ReservedPropTypeAnnotation',
-                name: 'EdgeInsetsPrimitive'
+              'name': 'insets_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ReservedPropTypeAnnotation',
+                'name': 'EdgeInsetsPrimitive'
               }
             }
           ],
-          commands: []
+          'commands': []
         }
       }
     }
@@ -454,468 +562,534 @@ exports[`RN Codegen Flow Parser can generate fixture ALL_PROP_TYPES_NO_EVENTS 1`
 
 exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [],
-          props: [
-            {
-              name: 'array_boolean_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'BooleanTypeAnnotation' }
+          'events': [],
+          'props': [
+            {
+              'name': 'array_boolean_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_boolean_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'BooleanTypeAnnotation' }
+              'name': 'array_boolean_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_boolean_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'BooleanTypeAnnotation' }
+              'name': 'array_boolean_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_boolean_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'BooleanTypeAnnotation' }
+              'name': 'array_boolean_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'BooleanTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_string_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'StringTypeAnnotation' }
+              'name': 'array_string_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_string_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'StringTypeAnnotation' }
+              'name': 'array_string_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_string_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'StringTypeAnnotation' }
+              'name': 'array_string_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_string_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'StringTypeAnnotation' }
+              'name': 'array_string_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_double_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'DoubleTypeAnnotation' }
+              'name': 'array_double_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_double_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'DoubleTypeAnnotation' }
+              'name': 'array_double_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_double_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'DoubleTypeAnnotation' }
+              'name': 'array_double_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_double_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'DoubleTypeAnnotation' }
+              'name': 'array_double_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'DoubleTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_float_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'FloatTypeAnnotation' }
+              'name': 'array_float_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_float_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'FloatTypeAnnotation' }
+              'name': 'array_float_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_float_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'FloatTypeAnnotation' }
+              'name': 'array_float_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_float_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'FloatTypeAnnotation' }
+              'name': 'array_float_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'FloatTypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_int32_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'Int32TypeAnnotation' }
+              'name': 'array_int32_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_int32_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'Int32TypeAnnotation' }
+              'name': 'array_int32_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_int32_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'Int32TypeAnnotation' }
+              'name': 'array_int32_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_int32_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'Int32TypeAnnotation' }
+              'name': 'array_int32_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'Int32TypeAnnotation'
+                }
               }
             },
             {
-              name: 'array_enum_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'StringEnumTypeAnnotation',
-                  default: 'small',
-                  options: [ { name: 'small' }, { name: 'large' } ]
+              'name': 'array_enum_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringEnumTypeAnnotation',
+                  'default': 'small',
+                  'options': [
+                    {
+                      'name': 'small'
+                    },
+                    {
+                      'name': 'large'
+                    }
+                  ]
                 }
               }
             },
             {
-              name: 'array_enum_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'StringEnumTypeAnnotation',
-                  default: 'small',
-                  options: [ { name: 'small' }, { name: 'large' } ]
+              'name': 'array_enum_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringEnumTypeAnnotation',
+                  'default': 'small',
+                  'options': [
+                    {
+                      'name': 'small'
+                    },
+                    {
+                      'name': 'large'
+                    }
+                  ]
                 }
               }
             },
             {
-              name: 'array_image_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ImageSourcePrimitive'
+              'name': 'array_image_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
                 }
               }
             },
             {
-              name: 'array_image_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ImageSourcePrimitive'
+              'name': 'array_image_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
                 }
               }
             },
             {
-              name: 'array_image_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ImageSourcePrimitive'
+              'name': 'array_image_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
                 }
               }
             },
             {
-              name: 'array_image_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ImageSourcePrimitive'
+              'name': 'array_image_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ImageSourcePrimitive'
                 }
               }
             },
             {
-              name: 'array_color_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'array_color_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'array_color_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'array_color_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'array_color_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'array_color_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'array_color_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'ColorPrimitive'
+              'name': 'array_color_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'ColorPrimitive'
                 }
               }
             },
             {
-              name: 'array_point_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'PointPrimitive'
+              'name': 'array_point_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
                 }
               }
             },
             {
-              name: 'array_point_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'PointPrimitive'
+              'name': 'array_point_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
                 }
               }
             },
             {
-              name: 'array_point_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'PointPrimitive'
+              'name': 'array_point_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
                 }
               }
             },
             {
-              name: 'array_point_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'PointPrimitive'
+              'name': 'array_point_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'PointPrimitive'
                 }
               }
             },
             {
-              name: 'array_insets_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'EdgeInsetsPrimitive'
+              'name': 'array_insets_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
                 }
               }
             },
             {
-              name: 'array_insets_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'EdgeInsetsPrimitive'
+              'name': 'array_insets_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
                 }
               }
             },
             {
-              name: 'array_insets_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'EdgeInsetsPrimitive'
+              'name': 'array_insets_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
                 }
               }
             },
             {
-              name: 'array_insets_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ReservedPropTypeAnnotation',
-                  name: 'EdgeInsetsPrimitive'
+              'name': 'array_insets_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ReservedPropTypeAnnotation',
+                  'name': 'EdgeInsetsPrimitive'
                 }
               }
             },
             {
-              name: 'array_object_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_object_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'prop',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
                     }
                   ]
                 }
               }
             },
             {
-              name: 'array_object_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_object_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'prop',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
                     }
                   ]
                 }
               }
             },
             {
-              name: 'array_object_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_object_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'prop',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
                     }
                   ]
                 }
               }
             },
             {
-              name: 'array_object_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_object_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'prop',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      'name': 'prop',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
                     }
                   ]
                 }
               }
             },
             {
-              name: 'array_of_array_object_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_of_array_object_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'array_object_required',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ArrayTypeAnnotation',
-                        elementType: {
-                          type: 'ObjectTypeAnnotation',
-                          properties: [
+                      'name': 'array_object_required',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
                             {
-                              name: 'prop',
-                              optional: false,
-                              typeAnnotation: {
-                                type: 'StringTypeAnnotation',
-                                default: null
+                              'name': 'prop',
+                              'optional': false,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
                               }
                             }
                           ]
@@ -927,27 +1101,27 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'array_of_array_object_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_of_array_object_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'array_object_optional_key',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ArrayTypeAnnotation',
-                        elementType: {
-                          type: 'ObjectTypeAnnotation',
-                          properties: [
+                      'name': 'array_object_optional_key',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
                             {
-                              name: 'prop',
-                              optional: true,
-                              typeAnnotation: {
-                                type: 'StringTypeAnnotation',
-                                default: null
+                              'name': 'prop',
+                              'optional': true,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
                               }
                             }
                           ]
@@ -959,27 +1133,27 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'array_of_array_object_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_of_array_object_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'array_object_optional_value',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ArrayTypeAnnotation',
-                        elementType: {
-                          type: 'ObjectTypeAnnotation',
-                          properties: [
+                      'name': 'array_object_optional_value',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
                             {
-                              name: 'prop',
-                              optional: true,
-                              typeAnnotation: {
-                                type: 'StringTypeAnnotation',
-                                default: null
+                              'name': 'prop',
+                              'optional': true,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
                               }
                             }
                           ]
@@ -991,27 +1165,27 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'array_of_array_object_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'array_of_array_object_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'array_object_optional_both',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ArrayTypeAnnotation',
-                        elementType: {
-                          type: 'ObjectTypeAnnotation',
-                          properties: [
+                      'name': 'array_object_optional_both',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
                             {
-                              name: 'prop',
-                              optional: true,
-                              typeAnnotation: {
-                                type: 'StringTypeAnnotation',
-                                default: null
+                              'name': 'prop',
+                              'optional': true,
+                              'typeAnnotation': {
+                                'type': 'StringTypeAnnotation',
+                                'default': null
                               }
                             }
                           ]
@@ -1023,19 +1197,22 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'array_of_array_of_object_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: {
-                    type: 'ObjectTypeAnnotation',
-                    properties: [
+              'name': 'array_of_array_of_object_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
                       {
-                        name: 'prop',
-                        optional: false,
-                        typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                        'name': 'prop',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'StringTypeAnnotation',
+                          'default': null
+                        }
                       }
                     ]
                   }
@@ -1043,19 +1220,22 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'array_of_array_of_object_required_in_file',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: {
-                    type: 'ObjectTypeAnnotation',
-                    properties: [
+              'name': 'array_of_array_of_object_required_in_file',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
                       {
-                        name: 'prop',
-                        optional: false,
-                        typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                        'name': 'prop',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'StringTypeAnnotation',
+                          'default': null
+                        }
                       }
                     ]
                   }
@@ -1063,19 +1243,22 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'array_of_array_of_object_required_with_spread',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: {
-                    type: 'ObjectTypeAnnotation',
-                    properties: [
+              'name': 'array_of_array_of_object_required_with_spread',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
                       {
-                        name: 'prop',
-                        optional: false,
-                        typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                        'name': 'prop',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'StringTypeAnnotation',
+                          'default': null
+                        }
                       }
                     ]
                   }
@@ -1083,7 +1266,7 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
               }
             }
           ],
-          commands: []
+          'commands': []
         }
       }
     }
@@ -1093,282 +1276,310 @@ exports[`RN Codegen Flow Parser can generate fixture ARRAY_PROP_TYPES_NO_EVENTS
 
 exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_EXPORTED 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [
+          'events': [
             {
-              name: 'onBubblingEventDefinedInline',
-              optional: false,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInline',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -1377,271 +1588,299 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineWithPaperName',
-              optional: false,
-              bubblingType: 'bubble',
-              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInlineWithPaperName',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'paperTopLevelNameDeprecated': 'paperBubblingEventDefinedInlineWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -1650,270 +1889,298 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
               }
             },
             {
-              name: 'onDirectEventDefinedInline',
-              optional: false,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInline',
+              'optional': false,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -1922,271 +2189,299 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
               }
             },
             {
-              name: 'onDirectEventDefinedInlineWithPaperName',
-              optional: false,
-              bubblingType: 'direct',
-              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInlineWithPaperName',
+              'optional': false,
+              'bubblingType': 'direct',
+              'paperTopLevelNameDeprecated': 'paperDirectEventDefinedInlineWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -2195,21 +2490,25 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
               }
             }
           ],
-          props: [],
-          commands: [
-            {
-              name: 'scrollTo',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                params: [
+          'props': [],
+          'commands': [
+            {
+              'name': 'scrollTo',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
                   {
-                    name: 'y',
-                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
                   },
                   {
-                    name: 'animated',
-                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                    'name': 'animated',
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation'
+                    }
                   }
                 ]
               }
@@ -2224,73 +2523,85 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_AND_EVENTS_TYPES_E
 
 exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_TYPES 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [],
-          props: [],
-          commands: [
-            {
-              name: 'handleRootTag',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                params: [
+          'events': [],
+          'props': [],
+          'commands': [
+            {
+              'name': 'handleRootTag',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
                   {
-                    name: 'rootTag',
-                    typeAnnotation: {
-                      type: 'ReservedFunctionValueTypeAnnotation',
-                      name: 'RootTag'
+                    'name': 'rootTag',
+                    'typeAnnotation': {
+                      'type': 'ReservedFunctionValueTypeAnnotation',
+                      'name': 'RootTag'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'hotspotUpdate',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                params: [
+              'name': 'hotspotUpdate',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
                   {
-                    name: 'x',
-                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                    'name': 'x',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
                   },
                   {
-                    name: 'y',
-                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'scrollTo',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                params: [
+              'name': 'scrollTo',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
                   {
-                    name: 'x',
-                    typeAnnotation: { type: 'FloatTypeAnnotation' }
+                    'name': 'x',
+                    'typeAnnotation': {
+                      'type': 'FloatTypeAnnotation'
+                    }
                   },
                   {
-                    name: 'y',
-                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
                   },
                   {
-                    name: 'z',
-                    typeAnnotation: { type: 'DoubleTypeAnnotation' }
+                    'name': 'z',
+                    'typeAnnotation': {
+                      'type': 'DoubleTypeAnnotation'
+                    }
                   },
                   {
-                    name: 'animated',
-                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                    'name': 'animated',
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation'
+                    }
                   }
                 ]
               }
@@ -2305,32 +2616,36 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_DEFINED_WITH_ALL_T
 
 exports[`RN Codegen Flow Parser can generate fixture COMMANDS_WITH_EXTERNAL_TYPES 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [],
-          props: [],
-          commands: [
-            {
-              name: 'scrollTo',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                params: [
+          'events': [],
+          'props': [],
+          'commands': [
+            {
+              'name': 'scrollTo',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'params': [
                   {
-                    name: 'y',
-                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                    'name': 'y',
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
                   },
                   {
-                    name: 'animated',
-                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                    'name': 'animated',
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation'
+                    }
                   }
                 ]
               }
@@ -2345,112 +2660,142 @@ exports[`RN Codegen Flow Parser can generate fixture COMMANDS_WITH_EXTERNAL_TYPE
 
 exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_AS_NULL_INLINE 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [
-            {
-              name: 'onDirectEventDefinedInlineNull',
-              optional: false,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+          'events': [
+            {
+              'name': 'onDirectEventDefinedInlineNull',
+              'optional': false,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onDirectEventDefinedInlineNullOptionalKey',
-              optional: true,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onDirectEventDefinedInlineNullOptionalKey',
+              'optional': true,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onDirectEventDefinedInlineNullOptionalValue',
-              optional: true,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onDirectEventDefinedInlineNullOptionalValue',
+              'optional': true,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onDirectEventDefinedInlineNullOptionalBoth',
-              optional: true,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onDirectEventDefinedInlineNullOptionalBoth',
+              'optional': true,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onDirectEventDefinedInlineNullWithPaperName',
-              optional: true,
-              bubblingType: 'direct',
-              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineNullWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onDirectEventDefinedInlineNullWithPaperName',
+              'optional': true,
+              'bubblingType': 'direct',
+              'paperTopLevelNameDeprecated': 'paperDirectEventDefinedInlineNullWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineNull',
-              optional: false,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onBubblingEventDefinedInlineNull',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineNullOptionalKey',
-              optional: true,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onBubblingEventDefinedInlineNullOptionalKey',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineNullOptionalValue',
-              optional: true,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onBubblingEventDefinedInlineNullOptionalValue',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineNullOptionalBoth',
-              optional: true,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onBubblingEventDefinedInlineNullOptionalBoth',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineNullWithPaperName',
-              optional: true,
-              bubblingType: 'bubble',
-              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineNullWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onBubblingEventDefinedInlineNullWithPaperName',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'paperTopLevelNameDeprecated': 'paperBubblingEventDefinedInlineNullWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             }
           ],
-          props: [],
-          commands: []
+          'props': [],
+          'commands': []
         }
       }
     }
@@ -2460,282 +2805,310 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_AS_NULL_INLI
 
 exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_ALL_TYPES 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [
+          'events': [
             {
-              name: 'onDirectEventDefinedInline',
-              optional: false,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInline',
+              'optional': false,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -2744,270 +3117,298 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onDirectEventDefinedInlineOptionalKey',
-              optional: true,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInlineOptionalKey',
+              'optional': true,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -3016,270 +3417,298 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onDirectEventDefinedInlineOptionalValue',
-              optional: true,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInlineOptionalValue',
+              'optional': true,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -3288,270 +3717,298 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onDirectEventDefinedInlineOptionalBoth',
-              optional: true,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInlineOptionalBoth',
+              'optional': true,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -3560,271 +4017,299 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onDirectEventDefinedInlineWithPaperName',
-              optional: true,
-              bubblingType: 'direct',
-              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInlineWithPaperName',
+              'optional': true,
+              'bubblingType': 'direct',
+              'paperTopLevelNameDeprecated': 'paperDirectEventDefinedInlineWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -3833,270 +4318,298 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onBubblingEventDefinedInline',
-              optional: false,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInline',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -4105,270 +4618,298 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineOptionalKey',
-              optional: true,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInlineOptionalKey',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -4377,270 +4918,298 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineOptionalValue',
-              optional: true,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInlineOptionalValue',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -4649,270 +5218,298 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineOptionalBoth',
-              optional: true,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInlineOptionalBoth',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -4921,271 +5518,299 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineWithPaperName',
-              optional: true,
-              bubblingType: 'bubble',
-              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInlineWithPaperName',
+              'optional': true,
+              'bubblingType': 'bubble',
+              'paperTopLevelNameDeprecated': 'paperBubblingEventDefinedInlineWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -5194,8 +5819,8 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
               }
             }
           ],
-          props: [],
-          commands: []
+          'props': [],
+          'commands': []
         }
       }
     }
@@ -5205,20 +5830,20 @@ exports[`RN Codegen Flow Parser can generate fixture EVENTS_DEFINED_INLINE_WITH_
 
 exports[`RN Codegen Flow Parser can generate fixture NO_PROPS_EVENTS_ONLY_DEPRECATED_VIEW_CONFIG_NAME_OPTION 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          deprecatedViewConfigName: 'DeprecateModuleName',
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'deprecatedViewConfigName': 'DeprecateModuleName',
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [],
-          props: [],
-          commands: []
+          'events': [],
+          'props': [],
+          'commands': []
         }
       }
     }
@@ -5228,173 +5853,210 @@ exports[`RN Codegen Flow Parser can generate fixture NO_PROPS_EVENTS_ONLY_DEPREC
 
 exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [],
-          props: [
-            {
-              name: 'boolean_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+          'events': [],
+          'props': [
+            {
+              'name': 'boolean_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation',
+                      'default': false
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'boolean_optional',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'boolean_optional',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation',
+                      'default': false
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'string_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'string_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'string_optional',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'string_optional',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: { type: 'StringTypeAnnotation', default: '' }
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': ''
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'double_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'double_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'DoubleTypeAnnotation', default: 0 }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'DoubleTypeAnnotation',
+                      'default': 0
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'double_optional',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'double_optional',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: { type: 'DoubleTypeAnnotation', default: 0 }
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'DoubleTypeAnnotation',
+                      'default': 0
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'float_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'float_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'FloatTypeAnnotation', default: 0 }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'FloatTypeAnnotation',
+                      'default': 0
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'float_optional',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'float_optional',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: { type: 'FloatTypeAnnotation', default: 0 }
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'FloatTypeAnnotation',
+                      'default': 0
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'int_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'int_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: { type: 'Int32TypeAnnotation', default: 0 }
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation',
+                      'default': 0
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'int_optional',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'int_optional',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: { type: 'Int32TypeAnnotation', default: 0 }
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation',
+                      'default': 0
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'enum_optional',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'enum_optional',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ArrayTypeAnnotation',
-                      elementType: {
-                        type: 'StringEnumTypeAnnotation',
-                        default: 'small',
-                        options: [ { name: 'small' }, { name: 'large' } ]
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ArrayTypeAnnotation',
+                      'elementType': {
+                        'type': 'StringEnumTypeAnnotation',
+                        'default': 'small',
+                        'options': [
+                          {
+                            'name': 'small'
+                          },
+                          {
+                            'name': 'large'
+                          }
+                        ]
                       }
                     }
                   }
@@ -5402,363 +6064,363 @@ exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'image_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'image_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ImageSourcePrimitive'
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ImageSourcePrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'image_optional_key',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'image_optional_key',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ImageSourcePrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ImageSourcePrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'image_optional_value',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'image_optional_value',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ImageSourcePrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ImageSourcePrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'image_optional_both',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'image_optional_both',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ImageSourcePrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ImageSourcePrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'color_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'color_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'color_optional_key',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'color_optional_key',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'color_optional_value',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'color_optional_value',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'color_optional_both',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'color_optional_both',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'processed_color_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'processed_color_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'processed_color_optional_key',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'processed_color_optional_key',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'processed_color_optional_value',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'processed_color_optional_value',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'processed_color_optional_both',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'processed_color_optional_both',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'ColorPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'ColorPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'point_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'point_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'PointPrimitive'
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'PointPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'point_optional_key',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'point_optional_key',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'PointPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'PointPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'point_optional_value',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'point_optional_value',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'PointPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'PointPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'point_optional_both',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'point_optional_both',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'PointPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'PointPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'insets_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'insets_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'EdgeInsetsPrimitive'
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'EdgeInsetsPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'insets_optional_key',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'insets_optional_key',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'EdgeInsetsPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'EdgeInsetsPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'insets_optional_value',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'insets_optional_value',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'EdgeInsetsPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'EdgeInsetsPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'insets_optional_both',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'insets_optional_both',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: true,
-                    typeAnnotation: {
-                      type: 'ReservedPropTypeAnnotation',
-                      name: 'EdgeInsetsPrimitive'
+                    'name': 'prop',
+                    'optional': true,
+                    'typeAnnotation': {
+                      'type': 'ReservedPropTypeAnnotation',
+                      'name': 'EdgeInsetsPrimitive'
                     }
                   }
                 ]
               }
             },
             {
-              name: 'object_required',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'object_required',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
-                        {
-                          name: 'nestedProp',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'StringTypeAnnotation',
-                            default: null
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
+                        {
+                          'name': 'nestedProp',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'StringTypeAnnotation',
+                            'default': null
                           }
                         }
                       ]
@@ -5768,23 +6430,23 @@ exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'object_optional_key',
-              optional: true,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'object_optional_key',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
-                        {
-                          name: 'nestedProp',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'StringTypeAnnotation',
-                            default: null
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
+                        {
+                          'name': 'nestedProp',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'StringTypeAnnotation',
+                            'default': null
                           }
                         }
                       ]
@@ -5794,23 +6456,23 @@ exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'object_optional_value',
-              optional: true,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'object_optional_value',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
-                        {
-                          name: 'nestedProp',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'StringTypeAnnotation',
-                            default: null
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
+                        {
+                          'name': 'nestedProp',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'StringTypeAnnotation',
+                            'default': null
                           }
                         }
                       ]
@@ -5820,23 +6482,23 @@ exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS
               }
             },
             {
-              name: 'object_optional_both',
-              optional: true,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'object_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'prop',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
-                        {
-                          name: 'nestedProp',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'StringTypeAnnotation',
-                            default: null
+                    'name': 'prop',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
+                        {
+                          'name': 'nestedProp',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'StringTypeAnnotation',
+                            'default': null
                           }
                         }
                       ]
@@ -5846,7 +6508,7 @@ exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS
               }
             }
           ],
-          commands: []
+          'commands': []
         }
       }
     }
@@ -5856,46 +6518,55 @@ exports[`RN Codegen Flow Parser can generate fixture OBJECT_PROP_TYPES_NO_EVENTS
 
 exports[`RN Codegen Flow Parser can generate fixture ONE_OF_EACH_PROP_EVENT_DEFAULT_AND_OPTIONS 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          interfaceOnly: true,
-          paperComponentName: 'RCTModule',
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'interfaceOnly': true,
+          'paperComponentName': 'RCTModule',
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [
-            {
-              name: 'onDirectEventDefinedInlineNull',
-              optional: false,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+          'events': [
+            {
+              'name': 'onDirectEventDefinedInlineNull',
+              'optional': false,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineNull',
-              optional: false,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onBubblingEventDefinedInlineNull',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             }
           ],
-          props: [
+          'props': [
             {
-              name: 'boolean_default_true_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+              'name': 'boolean_default_true_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': true
+              }
             }
           ],
-          commands: []
+          'commands': []
         }
       }
     }
@@ -5905,47 +6576,58 @@ exports[`RN Codegen Flow Parser can generate fixture ONE_OF_EACH_PROP_EVENT_DEFA
 
 exports[`RN Codegen Flow Parser can generate fixture ONE_OF_EACH_PROP_EVENT_DEFAULT_AND_OPTIONS_NO_CAST 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          interfaceOnly: true,
-          excludedPlatforms: [ 'android' ],
-          paperComponentName: 'RCTModule',
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
-            }
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'interfaceOnly': true,
+          'excludedPlatforms': [
+            'android'
           ],
-          events: [
+          'paperComponentName': 'RCTModule',
+          'extendsProps': [
             {
-              name: 'onDirectEventDefinedInlineNull',
-              optional: false,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
+            }
+          ],
+          'events': [
+            {
+              'name': 'onDirectEventDefinedInlineNull',
+              'optional': false,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineNull',
-              optional: false,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: { type: 'ObjectTypeAnnotation', properties: [] }
+              'name': 'onBubblingEventDefinedInlineNull',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': []
+                }
               }
             }
           ],
-          props: [
+          'props': [
             {
-              name: 'boolean_default_true_optional_both',
-              optional: true,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: true }
+              'name': 'boolean_default_true_optional_both',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': true
+              }
             }
           ],
-          commands: []
+          'commands': []
         }
       }
     }
@@ -5955,86 +6637,113 @@ exports[`RN Codegen Flow Parser can generate fixture ONE_OF_EACH_PROP_EVENT_DEFA
 
 exports[`RN Codegen Flow Parser can generate fixture PROPS_ALIASED_LOCALLY 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [],
-          props: [
+          'events': [],
+          'props': [
             {
-              name: 'otherStringProp',
-              optional: false,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'otherStringProp',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'isEnabled',
-              optional: false,
-              typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+              'name': 'isEnabled',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'BooleanTypeAnnotation',
+                'default': false
+              }
             },
             {
-              name: 'label',
-              optional: false,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+              'name': 'label',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
             },
             {
-              name: 'localType',
-              optional: false,
-              typeAnnotation: {
-                type: 'ObjectTypeAnnotation',
-                properties: [
+              'name': 'localType',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ObjectTypeAnnotation',
+                'properties': [
                   {
-                    name: 'otherStringProp',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    'name': 'otherStringProp',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
                   },
                   {
-                    name: 'isEnabled',
-                    optional: false,
-                    typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+                    'name': 'isEnabled',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation',
+                      'default': false
+                    }
                   },
                   {
-                    name: 'label',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                    'name': 'label',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation',
+                      'default': null
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'localArr',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'localArr',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'otherStringProp',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      'name': 'otherStringProp',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
                     },
                     {
-                      name: 'isEnabled',
-                      optional: false,
-                      typeAnnotation: { type: 'BooleanTypeAnnotation', default: false }
+                      'name': 'isEnabled',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation',
+                        'default': false
+                      }
                     },
                     {
-                      name: 'label',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation', default: null }
+                      'name': 'label',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation',
+                        'default': null
+                      }
                     }
                   ]
                 }
               }
             }
           ],
-          commands: []
+          'commands': []
         }
       }
     }
@@ -6044,282 +6753,310 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_ALIASED_LOCALLY 1`] =
 
 exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPORTED 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [
-            {
-              type: 'ReactNativeBuiltInType',
-              knownTypeName: 'ReactNativeCoreViewProps'
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [
+            {
+              'type': 'ReactNativeBuiltInType',
+              'knownTypeName': 'ReactNativeCoreViewProps'
             }
           ],
-          events: [
+          'events': [
             {
-              name: 'onBubblingEventDefinedInline',
-              optional: false,
-              bubblingType: 'bubble',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInline',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -6328,271 +7065,299 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
               }
             },
             {
-              name: 'onBubblingEventDefinedInlineWithPaperName',
-              optional: false,
-              bubblingType: 'bubble',
-              paperTopLevelNameDeprecated: 'paperBubblingEventDefinedInlineWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onBubblingEventDefinedInlineWithPaperName',
+              'optional': false,
+              'bubblingType': 'bubble',
+              'paperTopLevelNameDeprecated': 'paperBubblingEventDefinedInlineWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -6601,270 +7366,298 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
               }
             },
             {
-              name: 'onDirectEventDefinedInline',
-              optional: false,
-              bubblingType: 'direct',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInline',
+              'optional': false,
+              'bubblingType': 'direct',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -6873,271 +7666,299 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
               }
             },
             {
-              name: 'onDirectEventDefinedInlineWithPaperName',
-              optional: false,
-              bubblingType: 'direct',
-              paperTopLevelNameDeprecated: 'paperDirectEventDefinedInlineWithPaperName',
-              typeAnnotation: {
-                type: 'EventTypeAnnotation',
-                argument: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'onDirectEventDefinedInlineWithPaperName',
+              'optional': false,
+              'bubblingType': 'direct',
+              'paperTopLevelNameDeprecated': 'paperDirectEventDefinedInlineWithPaperName',
+              'typeAnnotation': {
+                'type': 'EventTypeAnnotation',
+                'argument': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_required',
-                      optional: false
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_required',
+                      'optional': false
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_key',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_value',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'BooleanTypeAnnotation',
-                      name: 'boolean_optional_both',
-                      optional: true
+                      'type': 'BooleanTypeAnnotation',
+                      'name': 'boolean_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_required',
-                      optional: false
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_required',
+                      'optional': false
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_key',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_value',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'StringTypeAnnotation',
-                      name: 'string_optional_both',
-                      optional: true
+                      'type': 'StringTypeAnnotation',
+                      'name': 'string_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_required',
-                      optional: false
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_required',
+                      'optional': false
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_key',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_value',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'DoubleTypeAnnotation',
-                      name: 'double_optional_both',
-                      optional: true
+                      'type': 'DoubleTypeAnnotation',
+                      'name': 'double_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_required',
-                      optional: false
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_required',
+                      'optional': false
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_key',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_value',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'FloatTypeAnnotation',
-                      name: 'float_optional_both',
-                      optional: true
+                      'type': 'FloatTypeAnnotation',
+                      'name': 'float_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_required',
-                      optional: false
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_required',
+                      'optional': false
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_key',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_key',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_value',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_value',
+                      'optional': true
                     },
                     {
-                      type: 'Int32TypeAnnotation',
-                      name: 'int32_optional_both',
-                      optional: true
+                      'type': 'Int32TypeAnnotation',
+                      'name': 'int32_optional_both',
+                      'optional': true
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_required',
-                      optional: false,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_required',
+                      'optional': false,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_key',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_key',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_value',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_value',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'StringEnumTypeAnnotation',
-                      name: 'enum_optional_both',
-                      optional: true,
-                      options: [ { name: 'small' }, { name: 'large' } ]
+                      'type': 'StringEnumTypeAnnotation',
+                      'name': 'enum_optional_both',
+                      'optional': true,
+                      'options': [
+                        {
+                          'name': 'small'
+                        },
+                        {
+                          'name': 'large'
+                        }
+                      ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_required_nested_2_layers',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_required_nested_2_layers',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'ObjectTypeAnnotation',
-                          name: 'object_optional_nested_1_layer',
-                          optional: true,
-                          properties: [
+                          'type': 'ObjectTypeAnnotation',
+                          'name': 'object_optional_nested_1_layer',
+                          'optional': true,
+                          'properties': [
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'boolean_required',
-                              optional: false
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'boolean_required',
+                              'optional': false
                             },
                             {
-                              type: 'StringTypeAnnotation',
-                              name: 'string_optional_key',
-                              optional: true
+                              'type': 'StringTypeAnnotation',
+                              'name': 'string_optional_key',
+                              'optional': true
                             },
                             {
-                              type: 'DoubleTypeAnnotation',
-                              name: 'double_optional_value',
-                              optional: true
+                              'type': 'DoubleTypeAnnotation',
+                              'name': 'double_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'FloatTypeAnnotation',
-                              name: 'float_optional_value',
-                              optional: true
+                              'type': 'FloatTypeAnnotation',
+                              'name': 'float_optional_value',
+                              'optional': true
                             },
                             {
-                              type: 'Int32TypeAnnotation',
-                              name: 'int32_optional_both',
-                              optional: true
+                              'type': 'Int32TypeAnnotation',
+                              'name': 'int32_optional_both',
+                              'optional': true
                             }
                           ]
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_required',
-                      optional: false,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_required',
+                      'optional': false,
+                      'properties': [
                         {
-                          type: 'BooleanTypeAnnotation',
-                          name: 'boolean_required',
-                          optional: false
+                          'type': 'BooleanTypeAnnotation',
+                          'name': 'boolean_required',
+                          'optional': false
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_key',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_key',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'StringTypeAnnotation',
-                          name: 'string_optional_key',
-                          optional: true
+                          'type': 'StringTypeAnnotation',
+                          'name': 'string_optional_key',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_value',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_value',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'FloatTypeAnnotation',
-                          name: 'float_optional_value',
-                          optional: true
+                          'type': 'FloatTypeAnnotation',
+                          'name': 'float_optional_value',
+                          'optional': true
                         }
                       ]
                     },
                     {
-                      type: 'ObjectTypeAnnotation',
-                      name: 'object_readonly_optional_both',
-                      optional: true,
-                      properties: [
+                      'type': 'ObjectTypeAnnotation',
+                      'name': 'object_readonly_optional_both',
+                      'optional': true,
+                      'properties': [
                         {
-                          type: 'Int32TypeAnnotation',
-                          name: 'int32_optional_both',
-                          optional: true
+                          'type': 'Int32TypeAnnotation',
+                          'name': 'int32_optional_both',
+                          'optional': true
                         }
                       ]
                     }
@@ -7146,8 +7967,8 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
               }
             }
           ],
-          props: [],
-          commands: []
+          'props': [],
+          'commands': []
         }
       }
     }
@@ -7157,28 +7978,33 @@ exports[`RN Codegen Flow Parser can generate fixture PROPS_AND_EVENTS_TYPES_EXPO
 
 exports[`RN Codegen Flow Parser can generate fixture PROPS_AS_EXTERNAL_TYPES 1`] = `
 "{
-  modules: {
-    Module: {
-      components: {
-        Module: {
-          extendsProps: [],
-          events: [],
-          props: [
-            {
-              name: 'disable',
-              optional: false,
-              typeAnnotation: { type: 'StringTypeAnnotation', default: null }
-            },
-            {
-              name: 'array',
-              optional: false,
-              typeAnnotation: {
-                type: 'ArrayTypeAnnotation',
-                elementType: { type: 'StringTypeAnnotation' }
+  'modules': {
+    'Module': {
+      'components': {
+        'Module': {
+          'extendsProps': [],
+          'events': [],
+          'props': [
+            {
+              'name': 'disable',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'StringTypeAnnotation',
+                'default': null
+              }
+            },
+            {
+              'name': 'array',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'ArrayTypeAnnotation',
+                'elementType': {
+                  'type': 'StringTypeAnnotation'
+                }
               }
             }
           ],
-          commands: []
+          'commands': []
         }
       }
     }
diff --git a/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js b/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
index 84b196f13cfc4a..9c93fe7f7c85ac 100644
--- a/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/components/__tests__/component-parser-test.js
@@ -14,7 +14,6 @@
 const FlowParser = require('../../index.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
-const util = require('util');
 jest.mock('fs', () => ({
   readFileSync: filename => fixtures[filename] || failureFixtures[filename],
 }));
@@ -25,10 +24,10 @@ describe('RN Codegen Flow Parser', () => {
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
         const schema = FlowParser.parseFile(fixtureName);
-        const serializedSchema = util.inspect(schema, {
-          showHidden: false,
-          depth: null,
-        });
+        const serializedSchema = JSON.stringify(schema, null, 2).replace(
+          /"/g,
+          "'",
+        );
         expect(serializedSchema).toMatchSnapshot();
       });
     });
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
index f5ec83220a0d10..b66e72f7be4173 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap
@@ -18,9 +18,14 @@ exports[`RN Codegen Flow Parser Fails with error message TWO_NATIVE_MODULES_EXPO
 
 exports[`RN Codegen Flow Parser can generate fixture EMPTY_NATIVE_MODULE 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: { SampleTurboModule: { aliases: {}, properties: [] } }
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': []
+        }
+      }
     }
   }
 }"
@@ -28,102 +33,122 @@ exports[`RN Codegen Flow Parser can generate fixture EMPTY_NATIVE_MODULE 1`] = `
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {
-            ObjectAlias: {
-              type: 'ObjectTypeAnnotation',
-              properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {
+            'ObjectAlias': {
+              'type': 'ObjectTypeAnnotation',
+              'properties': [
                 {
-                  name: 'x',
-                  optional: false,
-                  typeAnnotation: { type: 'NumberTypeAnnotation' }
+                  'name': 'x',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'NumberTypeAnnotation'
+                  }
                 },
                 {
-                  name: 'y',
-                  optional: false,
-                  typeAnnotation: { type: 'NumberTypeAnnotation' }
+                  'name': 'y',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'NumberTypeAnnotation'
+                  }
                 },
                 {
-                  name: 'label',
-                  optional: false,
-                  typeAnnotation: { type: 'StringTypeAnnotation' }
+                  'name': 'label',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'StringTypeAnnotation'
+                  }
                 },
                 {
-                  name: 'truthy',
-                  optional: false,
-                  typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                  'name': 'truthy',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'BooleanTypeAnnotation'
+                  }
                 }
               ]
             }
           },
-          properties: [
+          'properties': [
             {
-              name: 'getNumber',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'getNumber',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'NumberTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'NumberTypeAnnotation'
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'getVoid',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: []
+              'name': 'getVoid',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': []
               }
             },
             {
-              name: 'getArray',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'getArray',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'a',
-                      optional: false,
-                      typeAnnotation: { type: 'NumberTypeAnnotation' }
+                      'name': 'a',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'NumberTypeAnnotation'
+                      }
                     }
                   ]
                 },
-                params: [
+                'params': [
                   {
-                    name: 'a',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ArrayTypeAnnotation',
-                      elementType: { type: 'NumberTypeAnnotation' }
+                    'name': 'a',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ArrayTypeAnnotation',
+                      'elementType': {
+                        'type': 'NumberTypeAnnotation'
+                      }
                     }
                   }
                 ]
               }
             },
             {
-              name: 'getStringFromAlias',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'StringTypeAnnotation' },
-                params: [
+              'name': 'getStringFromAlias',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'StringTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'a',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'TypeAliasTypeAnnotation',
-                      name: 'ObjectAlias'
+                    'name': 'a',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'TypeAliasTypeAnnotation',
+                      'name': 'ObjectAlias'
                     }
                   }
                 ]
@@ -139,28 +164,32 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ALIASES
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WITH_ALIAS 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getArray',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: { type: 'StringTypeAnnotation' }
+              'name': 'getArray',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'StringTypeAnnotation'
+                  }
                 },
-                params: [
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ArrayTypeAnnotation',
-                      elementType: { type: 'StringTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ArrayTypeAnnotation',
+                      'elementType': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     }
                   }
                 ]
@@ -176,23 +205,27 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WI
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WITH_UNION_AND_TOUPLE 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getArray',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'ArrayTypeAnnotation' },
-                params: [
+              'name': 'getArray',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ArrayTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'ArrayTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ArrayTypeAnnotation'
+                    }
                   }
                 ]
               }
@@ -207,49 +240,57 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ARRAY_WI
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_ARRAY 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getArray',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: { type: 'StringTypeAnnotation' }
+              'name': 'getArray',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'StringTypeAnnotation'
+                  }
                 },
-                params: [
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ArrayTypeAnnotation',
-                      elementType: { type: 'StringTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ArrayTypeAnnotation',
+                      'elementType': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     }
                   }
                 ]
               }
             },
             {
-              name: 'getArray',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: { type: 'StringTypeAnnotation' }
+              'name': 'getArray',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'StringTypeAnnotation'
+                  }
                 },
-                params: [
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ArrayTypeAnnotation',
-                      elementType: { type: 'StringTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ArrayTypeAnnotation',
+                      'elementType': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     }
                   }
                 ]
@@ -265,68 +306,84 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_AR
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_PARAM_TYPES 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'passBool',
-              optional: true,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'passBool',
+              'optional': true,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'BooleanTypeAnnotation'
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'passNumber',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'passNumber',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'NumberTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'NumberTypeAnnotation'
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'passString',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'passString',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation'
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'passStringish',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'passStringish',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'StringTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'StringTypeAnnotation'
+                    }
                   }
                 ]
               }
@@ -341,39 +398,47 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_BASIC_PA
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_CALLBACK 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getValueWithCallback',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'getValueWithCallback',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'callback',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'FunctionTypeAnnotation',
-                      returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                      params: [
+                    'name': 'callback',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'FunctionTypeAnnotation',
+                      'returnTypeAnnotation': {
+                        'type': 'VoidTypeAnnotation'
+                      },
+                      'params': [
                         {
-                          name: 'value',
-                          optional: false,
-                          typeAnnotation: { type: 'StringTypeAnnotation' }
+                          'name': 'value',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'StringTypeAnnotation'
+                          }
                         },
                         {
-                          name: 'arr',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'ArrayTypeAnnotation',
-                            elementType: {
-                              type: 'ArrayTypeAnnotation',
-                              elementType: { type: 'StringTypeAnnotation' }
+                          'name': 'arr',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'ArrayTypeAnnotation',
+                            'elementType': {
+                              'type': 'ArrayTypeAnnotation',
+                              'elementType': {
+                                'type': 'StringTypeAnnotation'
+                              }
                             }
                           }
                         }
@@ -393,42 +458,46 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_CALLBACK
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_ARRAY 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getArray',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: {
-                    type: 'ArrayTypeAnnotation',
-                    elementType: {
-                      type: 'ArrayTypeAnnotation',
-                      elementType: { type: 'StringTypeAnnotation' }
+              'name': 'getArray',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ArrayTypeAnnotation',
+                    'elementType': {
+                      'type': 'ArrayTypeAnnotation',
+                      'elementType': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     }
                   }
                 },
-                params: [
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ArrayTypeAnnotation',
-                      elementType: {
-                        type: 'ArrayTypeAnnotation',
-                        elementType: {
-                          type: 'ArrayTypeAnnotation',
-                          elementType: {
-                            type: 'ArrayTypeAnnotation',
-                            elementType: {
-                              type: 'ArrayTypeAnnotation',
-                              elementType: { type: 'StringTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ArrayTypeAnnotation',
+                      'elementType': {
+                        'type': 'ArrayTypeAnnotation',
+                        'elementType': {
+                          'type': 'ArrayTypeAnnotation',
+                          'elementType': {
+                            'type': 'ArrayTypeAnnotation',
+                            'elementType': {
+                              'type': 'ArrayTypeAnnotation',
+                              'elementType': {
+                                'type': 'StringTypeAnnotation'
+                              }
                             }
                           }
                         }
@@ -448,53 +517,57 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_OBJECTS 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getObject',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'getObject',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'const1',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ObjectTypeAnnotation',
-                        properties: [
+                      'name': 'const1',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
                           {
-                            name: 'const1',
-                            optional: false,
-                            typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                            'name': 'const1',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
                           }
                         ]
                       }
                     }
                   ]
                 },
-                params: [
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
                         {
-                          name: 'const1',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'ObjectTypeAnnotation',
-                            properties: [
+                          'name': 'const1',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'ObjectTypeAnnotation',
+                            'properties': [
                               {
-                                name: 'const1',
-                                optional: false,
-                                typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                                'name': 'const1',
+                                'optional': false,
+                                'typeAnnotation': {
+                                  'type': 'BooleanTypeAnnotation'
+                                }
                               }
                             ]
                           }
@@ -506,46 +579,50 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               }
             },
             {
-              name: 'getReadOnlyObject',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'getReadOnlyObject',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'const1',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ObjectTypeAnnotation',
-                        properties: [
+                      'name': 'const1',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
                           {
-                            name: 'const1',
-                            optional: false,
-                            typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                            'name': 'const1',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'BooleanTypeAnnotation'
+                            }
                           }
                         ]
                       }
                     }
                   ]
                 },
-                params: [
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
                         {
-                          name: 'const1',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'ObjectTypeAnnotation',
-                            properties: [
+                          'name': 'const1',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'ObjectTypeAnnotation',
+                            'properties': [
                               {
-                                name: 'const1',
-                                optional: false,
-                                typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                                'name': 'const1',
+                                'optional': false,
+                                'typeAnnotation': {
+                                  'type': 'BooleanTypeAnnotation'
+                                }
                               }
                             ]
                           }
@@ -557,22 +634,26 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               }
             },
             {
-              name: 'getObject2',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'GenericObjectTypeAnnotation' },
-                params: [
+              'name': 'getObject2',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'GenericObjectTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
                         {
-                          name: 'a',
-                          optional: false,
-                          typeAnnotation: { type: 'StringTypeAnnotation' }
+                          'name': 'a',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'StringTypeAnnotation'
+                          }
                         }
                       ]
                     }
@@ -581,25 +662,27 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
               }
             },
             {
-              name: 'getObjectInArray',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ArrayTypeAnnotation',
-                  elementType: {
-                    type: 'ObjectTypeAnnotation',
-                    properties: [
+              'name': 'getObjectInArray',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ArrayTypeAnnotation',
+                  'elementType': {
+                    'type': 'ObjectTypeAnnotation',
+                    'properties': [
                       {
-                        name: 'const1',
-                        optional: false,
-                        typeAnnotation: {
-                          type: 'ObjectTypeAnnotation',
-                          properties: [
+                        'name': 'const1',
+                        'optional': false,
+                        'typeAnnotation': {
+                          'type': 'ObjectTypeAnnotation',
+                          'properties': [
                             {
-                              name: 'const1',
-                              optional: false,
-                              typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                              'name': 'const1',
+                              'optional': false,
+                              'typeAnnotation': {
+                                'type': 'BooleanTypeAnnotation'
+                              }
                             }
                           ]
                         }
@@ -607,23 +690,25 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
                     ]
                   }
                 },
-                params: [
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ObjectTypeAnnotation',
-                      properties: [
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ObjectTypeAnnotation',
+                      'properties': [
                         {
-                          name: 'const1',
-                          optional: false,
-                          typeAnnotation: {
-                            type: 'ObjectTypeAnnotation',
-                            properties: [
+                          'name': 'const1',
+                          'optional': false,
+                          'typeAnnotation': {
+                            'type': 'ObjectTypeAnnotation',
+                            'properties': [
                               {
-                                name: 'const1',
-                                optional: false,
-                                typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                                'name': 'const1',
+                                'optional': false,
+                                'typeAnnotation': {
+                                  'type': 'BooleanTypeAnnotation'
+                                }
                               }
                             ]
                           }
@@ -644,80 +729,98 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_OBJECTS_WITH_NULLABLE_KEY 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getConstants',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'getConstants',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'isTesting',
-                      optional: false,
-                      typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                      'name': 'isTesting',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      name: 'reactNativeVersion',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ObjectTypeAnnotation',
-                        properties: [
+                      'name': 'reactNativeVersion',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
                           {
-                            name: 'major',
-                            optional: false,
-                            typeAnnotation: { type: 'NumberTypeAnnotation' }
+                            'name': 'major',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'NumberTypeAnnotation'
+                            }
                           },
                           {
-                            name: 'minor',
-                            optional: false,
-                            typeAnnotation: { type: 'NumberTypeAnnotation' }
+                            'name': 'minor',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'NumberTypeAnnotation'
+                            }
                           },
                           {
-                            name: 'patch',
-                            optional: true,
-                            typeAnnotation: { type: 'NumberTypeAnnotation' }
+                            'name': 'patch',
+                            'optional': true,
+                            'typeAnnotation': {
+                              'type': 'NumberTypeAnnotation'
+                            }
                           },
                           {
-                            name: 'prerelease',
-                            optional: false,
-                            typeAnnotation: {
-                              type: 'NullableTypeAnnotation',
-                              typeAnnotation: { type: 'NumberTypeAnnotation' }
+                            'name': 'prerelease',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'NullableTypeAnnotation',
+                              'typeAnnotation': {
+                                'type': 'NumberTypeAnnotation'
+                              }
                             }
                           }
                         ]
                       }
                     },
                     {
-                      name: 'forceTouchAvailable',
-                      optional: false,
-                      typeAnnotation: { type: 'BooleanTypeAnnotation' }
+                      'name': 'forceTouchAvailable',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'BooleanTypeAnnotation'
+                      }
                     },
                     {
-                      name: 'osVersion',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation' }
+                      'name': 'osVersion',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      name: 'systemName',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation' }
+                      'name': 'systemName',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     },
                     {
-                      name: 'interfaceIdiom',
-                      optional: false,
-                      typeAnnotation: { type: 'StringTypeAnnotation' }
+                      'name': 'interfaceIdiom',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     }
                   ]
                 },
-                params: []
+                'params': []
               }
             }
           ]
@@ -730,38 +833,46 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_COMPLEX_
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_FLOAT_AND_INT32 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getInt',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'Int32TypeAnnotation' },
-                params: [
+              'name': 'getInt',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'Int32TypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'Int32TypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'Int32TypeAnnotation'
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'getFloat',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'FloatTypeAnnotation' },
-                params: [
+              'name': 'getFloat',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'FloatTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: { type: 'FloatTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'FloatTypeAnnotation'
+                    }
                   }
                 ]
               }
@@ -776,64 +887,83 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_FLOAT_AN
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NESTED_ALIASES 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {
-            Bar: {
-              type: 'ObjectTypeAnnotation',
-              properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {
+            'Bar': {
+              'type': 'ObjectTypeAnnotation',
+              'properties': [
                 {
-                  name: 'z',
-                  optional: false,
-                  typeAnnotation: { type: 'NumberTypeAnnotation' }
+                  'name': 'z',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'NumberTypeAnnotation'
+                  }
                 }
               ]
             },
-            Foo: {
-              type: 'ObjectTypeAnnotation',
-              properties: [
+            'Foo': {
+              'type': 'ObjectTypeAnnotation',
+              'properties': [
                 {
-                  name: 'bar1',
-                  optional: false,
-                  typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Bar' }
+                  'name': 'bar1',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'TypeAliasTypeAnnotation',
+                    'name': 'Bar'
+                  }
                 },
                 {
-                  name: 'bar2',
-                  optional: false,
-                  typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Bar' }
+                  'name': 'bar2',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'TypeAliasTypeAnnotation',
+                    'name': 'Bar'
+                  }
                 }
               ]
             }
           },
-          properties: [
+          'properties': [
             {
-              name: 'foo1',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Foo' },
-                params: [
+              'name': 'foo1',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'TypeAliasTypeAnnotation',
+                  'name': 'Foo'
+                },
+                'params': [
                   {
-                    name: 'x',
-                    optional: false,
-                    typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Foo' }
+                    'name': 'x',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'TypeAliasTypeAnnotation',
+                      'name': 'Foo'
+                    }
                   }
                 ]
               }
             },
             {
-              name: 'foo2',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'foo2',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'x',
-                    optional: false,
-                    typeAnnotation: { type: 'TypeAliasTypeAnnotation', name: 'Foo' }
+                    'name': 'x',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'TypeAliasTypeAnnotation',
+                      'name': 'Foo'
+                    }
                   }
                 ]
               }
@@ -848,25 +978,29 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NESTED_A
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NULLABLE_PARAM 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'voidFunc',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'VoidTypeAnnotation' },
-                params: [
+              'name': 'voidFunc',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'VoidTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'arg',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'NullableTypeAnnotation',
-                      typeAnnotation: { type: 'StringTypeAnnotation' }
+                    'name': 'arg',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'NullableTypeAnnotation',
+                      'typeAnnotation': {
+                        'type': 'StringTypeAnnotation'
+                      }
                     }
                   }
                 ]
@@ -882,43 +1016,45 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_NULLABLE
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_WITH_OBJECT_DEFINED_IN_FILE_AS_PROPERTY 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {
-            DisplayMetricsAndroid: {
-              type: 'ObjectTypeAnnotation',
-              properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {
+            'DisplayMetricsAndroid': {
+              'type': 'ObjectTypeAnnotation',
+              'properties': [
                 {
-                  name: 'width',
-                  optional: false,
-                  typeAnnotation: { type: 'NumberTypeAnnotation' }
+                  'name': 'width',
+                  'optional': false,
+                  'typeAnnotation': {
+                    'type': 'NumberTypeAnnotation'
+                  }
                 }
               ]
             }
           },
-          properties: [
+          'properties': [
             {
-              name: 'getConstants',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'getConstants',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'Dimensions',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ObjectTypeAnnotation',
-                        properties: [
+                      'name': 'Dimensions',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
                           {
-                            name: 'windowPhysicalPixels',
-                            optional: false,
-                            typeAnnotation: {
-                              type: 'TypeAliasTypeAnnotation',
-                              name: 'DisplayMetricsAndroid'
+                            'name': 'windowPhysicalPixels',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'TypeAliasTypeAnnotation',
+                              'name': 'DisplayMetricsAndroid'
                             }
                           }
                         ]
@@ -926,29 +1062,29 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
                     }
                   ]
                 },
-                params: []
+                'params': []
               }
             },
             {
-              name: 'getConstants2',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ObjectTypeAnnotation',
-                  properties: [
+              'name': 'getConstants2',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ObjectTypeAnnotation',
+                  'properties': [
                     {
-                      name: 'Dimensions',
-                      optional: false,
-                      typeAnnotation: {
-                        type: 'ObjectTypeAnnotation',
-                        properties: [
+                      'name': 'Dimensions',
+                      'optional': false,
+                      'typeAnnotation': {
+                        'type': 'ObjectTypeAnnotation',
+                        'properties': [
                           {
-                            name: 'windowPhysicalPixels',
-                            optional: false,
-                            typeAnnotation: {
-                              type: 'TypeAliasTypeAnnotation',
-                              name: 'DisplayMetricsAndroid'
+                            'name': 'windowPhysicalPixels',
+                            'optional': false,
+                            'typeAnnotation': {
+                              'type': 'TypeAliasTypeAnnotation',
+                              'name': 'DisplayMetricsAndroid'
                             }
                           }
                         ]
@@ -956,7 +1092,7 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
                     }
                   ]
                 },
-                params: []
+                'params': []
               }
             }
           ]
@@ -969,37 +1105,43 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_OBJECT_W
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_PROMISE 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getValueWithPromise',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'PromiseTypeAnnotation' },
-                params: []
+              'name': 'getValueWithPromise',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'PromiseTypeAnnotation'
+                },
+                'params': []
               }
             },
             {
-              name: 'getValueWithPromiseDefinedSomewhereElse',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'PromiseTypeAnnotation' },
-                params: []
+              'name': 'getValueWithPromiseDefinedSomewhereElse',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'PromiseTypeAnnotation'
+                },
+                'params': []
               }
             },
             {
-              name: 'getValueWithPromiseObjDefinedSomewhereElse',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'PromiseTypeAnnotation' },
-                params: []
+              'name': 'getValueWithPromiseObjDefinedSomewhereElse',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'PromiseTypeAnnotation'
+                },
+                'params': []
               }
             }
           ]
@@ -1012,28 +1154,28 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_PROMISE
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ROOT_TAG 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getRootTag',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: {
-                  type: 'ReservedFunctionValueTypeAnnotation',
-                  name: 'RootTag'
+              'name': 'getRootTag',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'ReservedFunctionValueTypeAnnotation',
+                  'name': 'RootTag'
                 },
-                params: [
+                'params': [
                   {
-                    name: 'rootTag',
-                    optional: false,
-                    typeAnnotation: {
-                      type: 'ReservedFunctionValueTypeAnnotation',
-                      name: 'RootTag'
+                    'name': 'rootTag',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'ReservedFunctionValueTypeAnnotation',
+                      'name': 'RootTag'
                     }
                   }
                 ]
@@ -1049,23 +1191,27 @@ exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_ROOT_TAG
 
 exports[`RN Codegen Flow Parser can generate fixture NATIVE_MODULE_WITH_SIMPLE_OBJECT 1`] = `
 "{
-  modules: {
-    NativeSampleTurboModule: {
-      nativeModules: {
-        SampleTurboModule: {
-          aliases: {},
-          properties: [
+  'modules': {
+    'NativeSampleTurboModule': {
+      'nativeModules': {
+        'SampleTurboModule': {
+          'aliases': {},
+          'properties': [
             {
-              name: 'getObject',
-              optional: false,
-              typeAnnotation: {
-                type: 'FunctionTypeAnnotation',
-                returnTypeAnnotation: { type: 'GenericObjectTypeAnnotation' },
-                params: [
+              'name': 'getObject',
+              'optional': false,
+              'typeAnnotation': {
+                'type': 'FunctionTypeAnnotation',
+                'returnTypeAnnotation': {
+                  'type': 'GenericObjectTypeAnnotation'
+                },
+                'params': [
                   {
-                    name: 'o',
-                    optional: false,
-                    typeAnnotation: { type: 'GenericObjectTypeAnnotation' }
+                    'name': 'o',
+                    'optional': false,
+                    'typeAnnotation': {
+                      'type': 'GenericObjectTypeAnnotation'
+                    }
                   }
                 ]
               }
diff --git a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
index 4cd509405487f5..cd32e108ef379e 100644
--- a/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
+++ b/packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-snapshot-test.js
@@ -14,7 +14,6 @@
 const FlowParser = require('../../index.js');
 const fixtures = require('../__test_fixtures__/fixtures.js');
 const failureFixtures = require('../__test_fixtures__/failures.js');
-const util = require('util');
 jest.mock('fs', () => ({
   readFileSync: filename => fixtures[filename] || failureFixtures[filename],
 }));
@@ -25,10 +24,10 @@ describe('RN Codegen Flow Parser', () => {
     .forEach(fixtureName => {
       it(`can generate fixture ${fixtureName}`, () => {
         const schema = FlowParser.parseModuleFixture(fixtureName);
-        const serializedSchema = util.inspect(schema, {
-          showHidden: false,
-          depth: null,
-        });
+        const serializedSchema = JSON.stringify(schema, null, 2).replace(
+          /"/g,
+          "'",
+        );
 
         expect(serializedSchema).toMatchSnapshot();
       });

From 7c2f46ce3fa5b9fd1e4663c37f70806f9cd48558 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Wed, 7 Oct 2020 23:10:48 -0700
Subject: [PATCH 200/241] Collect extra logging if ReactViewGroup.dispatchDraw
 crashes

Summary:
dispatchDraw,  dispatchGetDisplayList, updateDisplayListIfDirty, recreateChildDisplayList, etc, can all crash internally for a variety of reasons and it can be very tricky to track down the root cause. This isn't a fix, this just adds extra logging to hopefully make debugging easier.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24166149

fbshipit-source-id: 1bbaf34a92a9bcac5a594a25522c66e6e0cc80ca
---
 .../react/views/view/ReactViewGroup.java      | 38 +++++++++++++++++--
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
index f8fc85cf5826c8..7d26307e2491cc 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/views/view/ReactViewGroup.java
@@ -23,6 +23,7 @@
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.ViewParent;
 import android.view.ViewStructure;
 import android.view.animation.Animation;
 import androidx.annotation.Nullable;
@@ -674,9 +675,40 @@ protected void dispatchDraw(Canvas canvas) {
     try {
       dispatchOverflowDraw(canvas);
       super.dispatchDraw(canvas);
-    } catch (NullPointerException e) {
-      FLog.e(TAG, "NullPointerException when executing ViewGroup.dispatchDraw method", e);
-    } catch (StackOverflowError e) {
+    } catch (NullPointerException | StackOverflowError e) {
+      // Catch errors and log additional diagnostics to logcat for debugging
+      FLog.e(
+          TAG,
+          "Exception thrown when executing ReactViewGroup.dispatchDraw method on ReactViewGroup["
+              + getId()
+              + "]",
+          e);
+
+      // Log all children of view, if any
+      FLog.e(TAG, "Child List:");
+      for (int i = 0; i < getChildCount(); i++) {
+        View child = getChildAt(i);
+        FLog.e(
+            TAG,
+            "Child #"
+                + i
+                + ": "
+                + (child != null ? child.getId() : -1337)
+                + " - "
+                + (child != null ? child.toString() : "<null>"));
+      }
+
+      // Log all ancestors of view
+      ViewParent viewParent = getParent();
+      FLog.e(TAG, "Ancestor List:");
+      while (viewParent != null) {
+        ViewGroup parentViewGroup =
+            (viewParent instanceof ViewGroup ? (ViewGroup) viewParent : null);
+        int parentViewGroupId = (parentViewGroup != null ? parentViewGroup.getId() : -1337);
+        FLog.e(TAG, "Ancestor[" + parentViewGroupId + "]: " + viewParent.toString());
+        viewParent = viewParent.getParent();
+      }
+
       // Adding special exception management for StackOverflowError for logging purposes.
       // This will be removed in the future.
       RootView rootView = RootViewUtil.getRootView(ReactViewGroup.this);

From c54775791353e37aa621cf5dd6cf7d82c2762799 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Wed, 7 Oct 2020 23:10:48 -0700
Subject: [PATCH 201/241] Perf improvement: don't call
 uiManager.updateRootLayoutSpecs on every ReactRootView.onLayout

Summary:
In D23640968 (https://github.com/facebook/react-native/commit/78b42d7fb7180102c1e8ec917dcccd2d9d4076db) I introduced a mechanism to update offsetX/offsetY whenever onMeasure/onLayout were called, to ensure that `measureInWindow` had the correct metrics and would work properly.

However, now `uiManager.updateRootLayoutSpecs` gets spammed and is called too often. For example, whenever a TextInput is focused/blurred, `uiManager.updateRootLayoutSpecs` may be called 5+ times even though
the measure specs/offsets may only change once.

Thus, we just compare with previous values before calling into the UIManager. This should give us a very small perf improvement.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24176867

fbshipit-source-id: f0dcc816e651a843607e9e5d40d8f3489894d4ba
---
 .../com/facebook/react/ReactRootView.java     | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index c21bffc720a519..30b322a68a3e8d 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -95,6 +95,8 @@ public interface ReactRootViewEventListener {
   private int mHeightMeasureSpec = MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED);
   private int mLastWidth = 0;
   private int mLastHeight = 0;
+  private int mLastOffsetX = Integer.MIN_VALUE;
+  private int mLastOffsetY = Integer.MIN_VALUE;
   private @UIManagerType int mUIManagerType = DEFAULT;
 
   public ReactRootView(Context context) {
@@ -162,7 +164,7 @@ protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
       if (mReactInstanceManager != null && !mIsAttachedToInstance) {
         attachToReactInstanceManager();
       } else if (measureSpecsUpdated || mLastWidth != width || mLastHeight != height) {
-        updateRootLayoutSpecs(mWidthMeasureSpec, mHeightMeasureSpec);
+        updateRootLayoutSpecs(true, mWidthMeasureSpec, mHeightMeasureSpec);
       }
       mLastWidth = width;
       mLastHeight = height;
@@ -296,7 +298,7 @@ protected void onLayout(boolean changed, int left, int top, int right, int botto
 
     // In Fabric, update LayoutSpecs just so we update the offsetX and offsetY.
     if (mWasMeasured && getUIManagerType() == FABRIC) {
-      updateRootLayoutSpecs(mWidthMeasureSpec, mHeightMeasureSpec);
+      updateRootLayoutSpecs(false, mWidthMeasureSpec, mHeightMeasureSpec);
     }
   }
 
@@ -423,7 +425,17 @@ public static Point getViewportOffset(View v) {
     return new Point(locationInWindow[0], locationInWindow[1]);
   }
 
-  private void updateRootLayoutSpecs(final int widthMeasureSpec, final int heightMeasureSpec) {
+  /**
+   * Call whenever measure specs change, or if you want to force an update of offsetX/offsetY. If
+   * measureSpecsChanged is false and the offsetX/offsetY don't change, updateRootLayoutSpecs will
+   * not be called on the UIManager as a perf optimization.
+   *
+   * @param measureSpecsChanged
+   * @param widthMeasureSpec
+   * @param heightMeasureSpec
+   */
+  private void updateRootLayoutSpecs(
+      boolean measureSpecsChanged, final int widthMeasureSpec, final int heightMeasureSpec) {
     if (mReactInstanceManager == null) {
       FLog.w(TAG, "Unable to update root layout specs for uninitialized ReactInstanceManager");
       return;
@@ -445,8 +457,12 @@ private void updateRootLayoutSpecs(final int widthMeasureSpec, final int heightM
           offsetY = viewportOffset.y;
         }
 
-        uiManager.updateRootLayoutSpecs(
-            getRootViewTag(), widthMeasureSpec, heightMeasureSpec, offsetX, offsetY);
+        if (measureSpecsChanged || offsetX != mLastOffsetX || offsetY != mLastOffsetY) {
+          uiManager.updateRootLayoutSpecs(
+              getRootViewTag(), widthMeasureSpec, heightMeasureSpec, offsetX, offsetY);
+        }
+        mLastOffsetX = offsetX;
+        mLastOffsetY = offsetY;
       }
     }
   }
@@ -558,7 +574,7 @@ public void runApplication() {
       String jsAppModuleName = getJSModuleName();
 
       if (mWasMeasured) {
-        updateRootLayoutSpecs(mWidthMeasureSpec, mHeightMeasureSpec);
+        updateRootLayoutSpecs(true, mWidthMeasureSpec, mHeightMeasureSpec);
       }
 
       WritableNativeMap appParams = new WritableNativeMap();

From 38bc5dff361fbba78478a5d276f1b094d1326d23 Mon Sep 17 00:00:00 2001
From: simek <gosimek@gmail.com>
Date: Thu, 8 Oct 2020 01:26:06 -0700
Subject: [PATCH 202/241] Remove 'qs' dependency, update yarn lock (#30125)

Summary:
This PR removes unused `qs` package (query string parser) from the main `package.json` file.

I was not able to find any explicit usage of this package in the repository. Looking at the commit which introduced this package it is not clear why it has been added, query string is not processed in any way.

I have also run ` yarn update-lock` to clean up lock after latest dependencies bumps. There are no `qs` package entry removal in yarn lock, because it is already required by `request` package.

Refs: https://github.com/facebook/react-native/commit/b4785e514430dc3ba45ed6d136ec63574be88e26

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Removed] - remove unused `qs` dependency

Pull Request resolved: https://github.com/facebook/react-native/pull/30125

Test Plan: This change should not affect the code base.

Reviewed By: appden

Differential Revision: D24184372

Pulled By: cpojer

fbshipit-source-id: 4f159f3c554c48ed21839370c8370848df181046
---
 package.json |  1 -
 yarn.lock    | 82 +++++-----------------------------------------------
 2 files changed, 8 insertions(+), 75 deletions(-)

diff --git a/package.json b/package.json
index bb823b64658bd9..3b72b9cf318389 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,6 @@
     "pretty-format": "^26.5.2",
     "promise": "^8.0.3",
     "prop-types": "^15.7.2",
-    "qs": "^6.5.1",
     "react-devtools-core": "^4.6.0",
     "react-refresh": "^0.4.0",
     "regenerator-runtime": "^0.13.2",
diff --git a/yarn.lock b/yarn.lock
index 6d4650544c234f..a6ac71b916bf86 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -161,12 +161,7 @@
   dependencies:
     "@babel/types" "^7.10.0"
 
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz#9ea293be19babc0f52ff8ca88b34c3611b208670"
-  integrity sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==
-
-"@babel/helper-plugin-utils@^7.10.4":
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
   version "7.10.4"
   resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz#2f75a831269d4f677de49986dff59927533cf375"
   integrity sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==
@@ -247,7 +242,7 @@
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.10.0", "@babel/parser@^7.7.0", "@babel/parser@^7.7.5":
+"@babel/parser@^7.0.0", "@babel/parser@^7.1.0", "@babel/parser@^7.1.6", "@babel/parser@^7.10.0", "@babel/parser@^7.7.0":
   version "7.10.0"
   resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.10.0.tgz#8eca3e71a73dd562c5222376b08253436bb4995b"
   integrity sha512-fnDUl1Uy2gThM4IFVW4ISNHqr3cJrCsRkSCasFgx0XDO9JcttDS5ytyBc4Cu4X1+fjoo3IVvFbRD6TeFlHJlEQ==
@@ -695,7 +690,7 @@
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/template@^7.0.0", "@babel/template@^7.10.0", "@babel/template@^7.3.3", "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
+"@babel/template@^7.0.0", "@babel/template@^7.10.0", "@babel/template@^7.3.3", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.10.0"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.0.tgz#f15d852ce16cd5fb3e219097a75f662710b249b1"
   integrity sha512-aMLEQn5tcG49LEWrsEwxiRTdaJmvLem3+JMCMSeCy2TILau0IDVyWdm/18ACx7XOCady64FLt6KkHy28tkDQHQ==
@@ -704,7 +699,7 @@
     "@babel/parser" "^7.10.0"
     "@babel/types" "^7.10.0"
 
-"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.7.4", "@babel/traverse@^7.8.3":
+"@babel/traverse@^7.0.0", "@babel/traverse@^7.1.0", "@babel/traverse@^7.10.0", "@babel/traverse@^7.7.0", "@babel/traverse@^7.8.3":
   version "7.10.0"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.10.0.tgz#290935529881baf619398d94fd453838bef36740"
   integrity sha512-NZsFleMaLF1zX3NxbtXI/JCs2RPOdpGru6UBdGsfhdsDsP+kFF+h2QQJnMJglxk0kc69YmMFs4A44OJY0tKo5g==
@@ -1161,7 +1156,7 @@
   dependencies:
     "@sinonjs/commons" "^1.7.0"
 
-"@types/babel__core@^7.0.0":
+"@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7":
   version "7.1.10"
   resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz#ca58fc195dd9734e77e57c6f2df565623636ab40"
   integrity sha512-x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw==
@@ -1172,17 +1167,6 @@
     "@types/babel__template" "*"
     "@types/babel__traverse" "*"
 
-"@types/babel__core@^7.1.7":
-  version "7.1.7"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.7.tgz#1dacad8840364a57c98d0dd4855c6dd3752c6b89"
-  integrity sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==
-  dependencies:
-    "@babel/parser" "^7.1.0"
-    "@babel/types" "^7.0.0"
-    "@types/babel__generator" "*"
-    "@types/babel__template" "*"
-    "@types/babel__traverse" "*"
-
 "@types/babel__generator@*":
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.0.2.tgz#d2112a6b21fad600d7674274293c85dce0cb47fc"
@@ -1198,14 +1182,7 @@
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
-"@types/babel__traverse@*", "@types/babel__traverse@^7.0.6":
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.6.tgz#328dd1a8fc4cfe3c8458be9477b219ea158fd7b2"
-  integrity sha512-XYVgHF2sQ0YblLRMLNPB3CkFMewzFmlDsH/TneZFHUXDlABQgh88uOxuez7ZcXxayLFrqLwtDH1t+FmlFwNZxw==
-  dependencies:
-    "@babel/types" "^7.3.0"
-
-"@types/babel__traverse@^7.0.4":
+"@types/babel__traverse@*", "@types/babel__traverse@^7.0.4", "@types/babel__traverse@^7.0.6":
   version "7.0.15"
   resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03"
   integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==
@@ -3815,20 +3792,7 @@ istanbul-lib-coverage@^3.0.0:
   resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz#f5944a37c70b550b02a78a5c3b2055b280cec8ec"
   integrity sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==
 
-istanbul-lib-instrument@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz#61f13ac2c96cfefb076fe7131156cc05907874e6"
-  integrity sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==
-  dependencies:
-    "@babel/core" "^7.7.5"
-    "@babel/parser" "^7.7.5"
-    "@babel/template" "^7.7.4"
-    "@babel/traverse" "^7.7.4"
-    "@istanbuljs/schema" "^0.1.2"
-    istanbul-lib-coverage "^3.0.0"
-    semver "^6.3.0"
-
-istanbul-lib-instrument@^4.0.3:
+istanbul-lib-instrument@^4.0.0, istanbul-lib-instrument@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz#873c6fff897450118222774696a3f28902d77c1d"
   integrity sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==
@@ -5853,11 +5817,6 @@ punycode@^2.1.0, punycode@^2.1.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
-qs@^6.5.1:
-  version "6.9.4"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.4.tgz#9090b290d1f91728d3c22e54843ca44aea5ab687"
-  integrity sha512-A1kFqHekCTM7cz0udomYUoYNWjBebHm/5wzU/XqrBRBNWectVH0QIiN+NEcZ0Dte5hvzHwbr8+XQmguPhJ6WdQ==
-
 qs@~6.5.2:
   version "6.5.2"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
@@ -7474,14 +7433,6 @@ yargs-parser@^15.0.0:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^18.1.1:
-  version "18.1.2"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.2.tgz#2f482bea2136dbde0861683abea7756d30b504f1"
-  integrity sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==
-  dependencies:
-    camelcase "^5.0.0"
-    decamelize "^1.2.0"
-
 yargs-parser@^18.1.2:
   version "18.1.3"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0"
@@ -7524,24 +7475,7 @@ yargs@^14.2.0:
     y18n "^4.0.0"
     yargs-parser "^15.0.0"
 
-yargs@^15.1.0, yargs@^15.3.1:
-  version "15.3.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.3.1.tgz#9505b472763963e54afe60148ad27a330818e98b"
-  integrity sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==
-  dependencies:
-    cliui "^6.0.0"
-    decamelize "^1.2.0"
-    find-up "^4.1.0"
-    get-caller-file "^2.0.1"
-    require-directory "^2.1.1"
-    require-main-filename "^2.0.0"
-    set-blocking "^2.0.0"
-    string-width "^4.2.0"
-    which-module "^2.0.0"
-    y18n "^4.0.0"
-    yargs-parser "^18.1.1"
-
-yargs@^15.4.1:
+yargs@^15.1.0, yargs@^15.3.1, yargs@^15.4.1:
   version "15.4.1"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8"
   integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==

From 7ebb71a32f211a449b40c74f270ed1549254a876 Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 8 Oct 2020 16:05:44 -0700
Subject: [PATCH 203/241] Back out "Align multi-line TextInput onSubmitEditing
 behavior"

Summary:
This is a revert of D22488870 (https://github.com/facebook/react-native/commit/521b16730dd07d80261086c2f33eed2a766d404e). (https://github.com/facebook/react-native/pull/29177)
We have to revert it because we realized that it's a breaking change without a very good reason. We have to figure out a better way to unify platform behaviors.

Changelog:
[iOS][Fixed] - Reverted recent change in TextInput (#29177)

Reviewed By: fkgozali

Differential Revision: D24200517

fbshipit-source-id: af0e561a6b8d9ade487be6b197a5d79d326442b6
---
 Libraries/Text/TextInput/RCTBaseTextInputView.m | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index e8b87f333ddcec..01ab7f19d12267 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -365,13 +365,11 @@ - (BOOL)textInputShouldReturn
   // `onSubmitEditing` is called when "Submit" button
   // (the blue key on onscreen keyboard) did pressed
   // (no connection to any specific "submitting" process).
-  if (_blurOnSubmit) {
-    [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
-                                   reactTag:self.reactTag
-                                       text:[self.backedTextInputView.attributedText.string copy]
-                                        key:nil
-                                 eventCount:_nativeEventCount];
-  }
+  [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
+                                 reactTag:self.reactTag
+                                     text:[self.backedTextInputView.attributedText.string copy]
+                                      key:nil
+                               eventCount:_nativeEventCount];
 
   return _blurOnSubmit;
 }

From b581bcaae0fbc6a245856d8bb7631311253f10fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Ramos?= <hramos@fb.com>
Date: Fri, 9 Oct 2020 00:12:55 -0700
Subject: [PATCH 204/241] TurboModule iOS: Use react-native-codegen
 FBReactNativeSpec output

Summary:
Use the ObjC++ native modules files generated by `react-native-codegen` for the FBReactNativeSpec library.

People working with the core native modules may now re-generate these ObjC++ files using `USE_CODEGEN=1 pod install` or `scripts/generate-native-modules-specs.sh`.

Changelog: [Internal]

Reviewed By: RSNara

Differential Revision: D22249978

fbshipit-source-id: a12db23defacdba36099a24ce0b8475c8973bd6d
---
 .../FBReactNativeSpec-generated.mm            | 666 +--------------
 .../FBReactNativeSpec/FBReactNativeSpec.h     | 789 +++---------------
 2 files changed, 145 insertions(+), 1310 deletions(-)

diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
index 5ca05feb84cd38..152c9f7ae7dff5 100644
--- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
+++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec-generated.mm
@@ -4,20 +4,18 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
  * must have a single output. More files => more genrule()s => slower builds.
  */
-#import "FBReactNativeSpec.h"
 
-#import <folly/Optional.h>
+#import "FBReactNativeSpec.h"
 
 
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAccessibilityInfoSpecJSI_isReduceMotionEnabled(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "isReduceMotionEnabled", @selector(isReduceMotionEnabled:), args, count);
@@ -35,7 +33,6 @@
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "announceForAccessibility", @selector(announceForAccessibility:), args, count);
     }
 
-
     NativeAccessibilityInfoSpecJSI::NativeAccessibilityInfoSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -50,10 +47,7 @@
         
         methodMap_["announceForAccessibility"] = MethodMetadata {1, __hostFunction_NativeAccessibilityInfoSpecJSI_announceForAccessibility};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeAccessibilityManager_SpecSetAccessibilityContentSizeMultipliersJSMultipliers)
@@ -64,7 +58,6 @@ + (RCTManagedPointer *)JS_NativeAccessibilityManager_SpecSetAccessibilityContent
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAccessibilityManagerSpecJSI_getCurrentBoldTextState(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getCurrentBoldTextState", @selector(getCurrentBoldTextState:onError:), args, count);
@@ -102,7 +95,6 @@ + (RCTManagedPointer *)JS_NativeAccessibilityManager_SpecSetAccessibilityContent
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "announceForAccessibility", @selector(announceForAccessibility:), args, count);
     }
 
-
     NativeAccessibilityManagerSpecJSI::NativeAccessibilityManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -125,7 +117,6 @@ + (RCTManagedPointer *)JS_NativeAccessibilityManager_SpecSetAccessibilityContent
         
         
         methodMap_["setAccessibilityContentSizeMultipliers"] = MethodMetadata {1, __hostFunction_NativeAccessibilityManagerSpecJSI_setAccessibilityContentSizeMultipliers};
-        
         setMethodArgConversionSelector(@"setAccessibilityContentSizeMultipliers", 0, @"JS_NativeAccessibilityManager_SpecSetAccessibilityContentSizeMultipliersJSMultipliers:");
         
         methodMap_["setAccessibilityFocus"] = MethodMetadata {1, __hostFunction_NativeAccessibilityManagerSpecJSI_setAccessibilityFocus};
@@ -133,10 +124,7 @@ + (RCTManagedPointer *)JS_NativeAccessibilityManager_SpecSetAccessibilityContent
         
         methodMap_["announceForAccessibility"] = MethodMetadata {1, __hostFunction_NativeAccessibilityManagerSpecJSI_announceForAccessibility};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeActionSheetManager_SpecShowActionSheetWithOptionsOptions)
@@ -151,15 +139,8 @@ + (RCTManagedPointer *)JS_NativeActionSheetManager_SpecShowShareActionSheetWithO
   return facebook::react::managedPointer<JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions>(json);
 }
 @end
-@implementation RCTCxxConvert (NativeActionSheetManager_SpecShowShareActionSheetWithOptionsFailureCallbackError)
-+ (RCTManagedPointer *)JS_NativeActionSheetManager_SpecShowShareActionSheetWithOptionsFailureCallbackError:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsFailureCallbackError>(json);
-}
-@end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeActionSheetManagerSpecJSI_showActionSheetWithOptions(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "showActionSheetWithOptions", @selector(showActionSheetWithOptions:callback:), args, count);
@@ -169,21 +150,15 @@ + (RCTManagedPointer *)JS_NativeActionSheetManager_SpecShowShareActionSheetWithO
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "showShareActionSheetWithOptions", @selector(showShareActionSheetWithOptions:failureCallback:successCallback:), args, count);
     }
 
-
     NativeActionSheetManagerSpecJSI::NativeActionSheetManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["showActionSheetWithOptions"] = MethodMetadata {2, __hostFunction_NativeActionSheetManagerSpecJSI_showActionSheetWithOptions};
-        
         setMethodArgConversionSelector(@"showActionSheetWithOptions", 0, @"JS_NativeActionSheetManager_SpecShowActionSheetWithOptionsOptions:");
         
         methodMap_["showShareActionSheetWithOptions"] = MethodMetadata {3, __hostFunction_NativeActionSheetManagerSpecJSI_showShareActionSheetWithOptions};
-        
         setMethodArgConversionSelector(@"showShareActionSheetWithOptions", 0, @"JS_NativeActionSheetManager_SpecShowShareActionSheetWithOptionsOptions:");
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeAlertManager_Args)
@@ -194,31 +169,19 @@ + (RCTManagedPointer *)JS_NativeAlertManager_Args:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAlertManagerSpecJSI_alertWithArgs(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "alertWithArgs", @selector(alertWithArgs:callback:), args, count);
     }
 
-
     NativeAlertManagerSpecJSI::NativeAlertManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["alertWithArgs"] = MethodMetadata {2, __hostFunction_NativeAlertManagerSpecJSI_alertWithArgs};
-        
         setMethodArgConversionSelector(@"alertWithArgs", 0, @"JS_NativeAlertManager_Args:");
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeAnimatedModule_EndResult)
-+ (RCTManagedPointer *)JS_NativeAnimatedModule_EndResult:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAnimatedModule::EndResult>(json);
-}
-@end
 @implementation RCTCxxConvert (NativeAnimatedModule_EventMapping)
 + (RCTManagedPointer *)JS_NativeAnimatedModule_EventMapping:(id)json
 {
@@ -227,7 +190,6 @@ + (RCTManagedPointer *)JS_NativeAnimatedModule_EventMapping:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAnimatedModuleSpecJSI_startOperationBatch(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "startOperationBatch", @selector(startOperationBatch), args, count);
@@ -317,7 +279,6 @@ + (RCTManagedPointer *)JS_NativeAnimatedModule_EventMapping:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeAnimatedModuleSpecJSI::NativeAnimatedModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -376,7 +337,6 @@ + (RCTManagedPointer *)JS_NativeAnimatedModule_EventMapping:(id)json
         
         
         methodMap_["addAnimatedEventToView"] = MethodMetadata {3, __hostFunction_NativeAnimatedModuleSpecJSI_addAnimatedEventToView};
-        
         setMethodArgConversionSelector(@"addAnimatedEventToView", 2, @"JS_NativeAnimatedModule_EventMapping:");
         
         methodMap_["removeAnimatedEventFromView"] = MethodMetadata {3, __hostFunction_NativeAnimatedModuleSpecJSI_removeAnimatedEventFromView};
@@ -387,18 +347,9 @@ + (RCTManagedPointer *)JS_NativeAnimatedModule_EventMapping:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeAnimatedModuleSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeAnimatedTurboModule_EndResult)
-+ (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EndResult:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAnimatedTurboModule::EndResult>(json);
-}
-@end
 @implementation RCTCxxConvert (NativeAnimatedTurboModule_EventMapping)
 + (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EventMapping:(id)json
 {
@@ -407,7 +358,6 @@ + (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EventMapping:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAnimatedTurboModuleSpecJSI_startOperationBatch(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "startOperationBatch", @selector(startOperationBatch), args, count);
@@ -497,7 +447,6 @@ + (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EventMapping:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeAnimatedTurboModuleSpecJSI::NativeAnimatedTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -556,7 +505,6 @@ + (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EventMapping:(id)json
         
         
         methodMap_["addAnimatedEventToView"] = MethodMetadata {3, __hostFunction_NativeAnimatedTurboModuleSpecJSI_addAnimatedEventToView};
-        
         setMethodArgConversionSelector(@"addAnimatedEventToView", 2, @"JS_NativeAnimatedTurboModule_EventMapping:");
         
         methodMap_["removeAnimatedEventFromView"] = MethodMetadata {3, __hostFunction_NativeAnimatedTurboModuleSpecJSI_removeAnimatedEventFromView};
@@ -567,15 +515,12 @@ + (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EventMapping:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeAnimatedTurboModuleSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAnimationsDebugModuleSpecJSI_startRecordingFps(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "startRecordingFps", @selector(startRecordingFps), args, count);
@@ -585,7 +530,6 @@ + (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EventMapping:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "stopRecordingFps", @selector(stopRecordingFps:), args, count);
     }
 
-
     NativeAnimationsDebugModuleSpecJSI::NativeAnimationsDebugModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -594,21 +538,12 @@ + (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EventMapping:(id)json
         
         methodMap_["stopRecordingFps"] = MethodMetadata {1, __hostFunction_NativeAnimationsDebugModuleSpecJSI_stopRecordingFps};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeAppState_SpecGetCurrentAppStateSuccessAppState)
-+ (RCTManagedPointer *)JS_NativeAppState_SpecGetCurrentAppStateSuccessAppState:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAppState::SpecGetCurrentAppStateSuccessAppState>(json);
-}
-@end
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAppStateSpecJSI_getCurrentAppState(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getCurrentAppState", @selector(getCurrentAppState:error:), args, count);
@@ -626,7 +561,6 @@ + (RCTManagedPointer *)JS_NativeAppState_SpecGetCurrentAppStateSuccessAppState:(
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeAppStateSpecJSI::NativeAppStateSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -641,15 +575,12 @@ + (RCTManagedPointer *)JS_NativeAppState_SpecGetCurrentAppStateSuccessAppState:(
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeAppStateSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAppearanceSpecJSI_getColorScheme(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, "getColorScheme", @selector(getColorScheme), args, count);
@@ -663,7 +594,6 @@ + (RCTManagedPointer *)JS_NativeAppState_SpecGetCurrentAppStateSuccessAppState:(
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeAppearanceSpecJSI::NativeAppearanceSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -675,80 +605,12 @@ + (RCTManagedPointer *)JS_NativeAppState_SpecGetCurrentAppStateSuccessAppState:(
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeAppearanceSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeAppearance_AppearancePreferences)
-+ (RCTManagedPointer *)JS_NativeAppearance_AppearancePreferences:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAppearance::AppearancePreferences>(json);
-}
-@end
-folly::Optional<NativeAppearanceColorSchemeName> NSStringToNativeAppearanceColorSchemeName(NSString *value) {
-  static NSDictionary *dict = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    dict = @{
-      @"light": @0,
-      @"dark": @1,
-    };
-  });
-  return value ? (NativeAppearanceColorSchemeName)[dict[value] integerValue] : folly::Optional<NativeAppearanceColorSchemeName>{};
-}
 
-NSString *NativeAppearanceColorSchemeNameToNSString(folly::Optional<NativeAppearanceColorSchemeName> value) {
-  static NSDictionary *dict = nil;
-  static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^{
-    dict = @{
-      @0: @"light",
-      @1: @"dark",
-    };
-  });
-  return value.hasValue() ? dict[@(value.value())] : nil;
-}
-@implementation RCTCxxConvert (NativeAsyncStorage_SpecMultiGetCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiGetCallbackErrorsElement:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAsyncStorage::SpecMultiGetCallbackErrorsElement>(json);
-}
-@end
-@implementation RCTCxxConvert (NativeAsyncStorage_SpecMultiSetCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiSetCallbackErrorsElement:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAsyncStorage::SpecMultiSetCallbackErrorsElement>(json);
-}
-@end
-@implementation RCTCxxConvert (NativeAsyncStorage_SpecMultiMergeCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiMergeCallbackErrorsElement:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAsyncStorage::SpecMultiMergeCallbackErrorsElement>(json);
-}
-@end
-@implementation RCTCxxConvert (NativeAsyncStorage_SpecMultiRemoveCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiRemoveCallbackErrorsElement:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAsyncStorage::SpecMultiRemoveCallbackErrorsElement>(json);
-}
-@end
-@implementation RCTCxxConvert (NativeAsyncStorage_SpecClearCallbackError)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecClearCallbackError:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAsyncStorage::SpecClearCallbackError>(json);
-}
-@end
-@implementation RCTCxxConvert (NativeAsyncStorage_SpecGetAllKeysCallbackError)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeAsyncStorage::SpecGetAllKeysCallbackError>(json);
-}
-@end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeAsyncStorageSpecJSI_multiGet(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "multiGet", @selector(multiGet:callback:), args, count);
@@ -774,7 +636,6 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getAllKeys", @selector(getAllKeys:), args, count);
     }
 
-
     NativeAsyncStorageSpecJSI::NativeAsyncStorageSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -795,15 +656,12 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
         
         methodMap_["getAllKeys"] = MethodMetadata {1, __hostFunction_NativeAsyncStorageSpecJSI_getAllKeys};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeBlobModuleSpecJSI_addNetworkingHandler(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "addNetworkingHandler", @selector(addNetworkingHandler), args, count);
@@ -833,7 +691,6 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeBlobModuleSpecJSI::NativeBlobModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -857,15 +714,12 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeBlobModuleSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeBugReportingSpecJSI_startReportAProblemFlow(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "startReportAProblemFlow", @selector(startReportAProblemFlow), args, count);
@@ -879,7 +733,6 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setCategoryID", @selector(setCategoryID:), args, count);
     }
 
-
     NativeBugReportingSpecJSI::NativeBugReportingSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -891,15 +744,12 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
         
         methodMap_["setCategoryID"] = MethodMetadata {1, __hostFunction_NativeBugReportingSpecJSI_setCategoryID};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeClipboardSpecJSI_getString(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "getString", @selector(getString:reject:), args, count);
@@ -909,7 +759,6 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setString", @selector(setString:), args, count);
     }
 
-
     NativeClipboardSpecJSI::NativeClipboardSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -918,35 +767,28 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
         
         methodMap_["setString"] = MethodMetadata {1, __hostFunction_NativeClipboardSpecJSI_setString};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDatePickerAndroidSpecJSI_open(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "open", @selector(open:resolve:reject:), args, count);
     }
 
-
     NativeDatePickerAndroidSpecJSI::NativeDatePickerAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["open"] = MethodMetadata {1, __hostFunction_NativeDatePickerAndroidSpecJSI_open};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDevLoadingViewSpecJSI_showMessage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "showMessage", @selector(showMessage:withColor:withBackgroundColor:), args, count);
@@ -956,7 +798,6 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "hide", @selector(hide), args, count);
     }
 
-
     NativeDevLoadingViewSpecJSI::NativeDevLoadingViewSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -965,15 +806,12 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
         
         methodMap_["hide"] = MethodMetadata {0, __hostFunction_NativeDevLoadingViewSpecJSI_hide};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDevMenuSpecJSI_show(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "show", @selector(show), args, count);
@@ -995,7 +833,6 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setHotLoadingEnabled", @selector(setHotLoadingEnabled:), args, count);
     }
 
-
     NativeDevMenuSpecJSI::NativeDevMenuSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1013,15 +850,12 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
         
         methodMap_["setHotLoadingEnabled"] = MethodMetadata {1, __hostFunction_NativeDevMenuSpecJSI_setHotLoadingEnabled};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDevSettingsSpecJSI_reload(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "reload", @selector(reload), args, count);
@@ -1067,7 +901,6 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setIsShakeToShowDevMenuEnabled", @selector(setIsShakeToShowDevMenuEnabled:), args, count);
     }
 
-
     NativeDevSettingsSpecJSI::NativeDevSettingsSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1103,70 +936,55 @@ + (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)jso
         
         methodMap_["setIsShakeToShowDevMenuEnabled"] = MethodMetadata {1, __hostFunction_NativeDevSettingsSpecJSI_setIsShakeToShowDevMenuEnabled};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDevSplitBundleLoaderSpecJSI_loadBundle(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "loadBundle", @selector(loadBundle:resolve:reject:), args, count);
     }
 
-
     NativeDevSplitBundleLoaderSpecJSI::NativeDevSplitBundleLoaderSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["loadBundle"] = MethodMetadata {1, __hostFunction_NativeDevSplitBundleLoaderSpecJSI_loadBundle};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDeviceEventManagerSpecJSI_invokeDefaultBackPressHandler(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "invokeDefaultBackPressHandler", @selector(invokeDefaultBackPressHandler), args, count);
     }
 
-
     NativeDeviceEventManagerSpecJSI::NativeDeviceEventManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["invokeDefaultBackPressHandler"] = MethodMetadata {0, __hostFunction_NativeDeviceEventManagerSpecJSI_invokeDefaultBackPressHandler};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDeviceInfoSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeDeviceInfoSpecJSI::NativeDeviceInfoSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeDeviceInfoSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeDialogManagerAndroid_DialogOptions)
@@ -1177,7 +995,6 @@ + (RCTManagedPointer *)JS_NativeDialogManagerAndroid_DialogOptions:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeDialogManagerAndroidSpecJSI_showAlert(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "showAlert", @selector(showAlert:onError:onAction:), args, count);
@@ -1187,20 +1004,15 @@ + (RCTManagedPointer *)JS_NativeDialogManagerAndroid_DialogOptions:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeDialogManagerAndroidSpecJSI::NativeDialogManagerAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["showAlert"] = MethodMetadata {3, __hostFunction_NativeDialogManagerAndroidSpecJSI_showAlert};
-        
         setMethodArgConversionSelector(@"showAlert", 0, @"JS_NativeDialogManagerAndroid_DialogOptions:");
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeDialogManagerAndroidSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeExceptionsManager_StackFrame)
@@ -1217,7 +1029,6 @@ + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeExceptionsManagerSpecJSI_reportFatalException(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "reportFatalException", @selector(reportFatalException:stack:exceptionId:), args, count);
@@ -1239,7 +1050,6 @@ + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "dismissRedbox", @selector(dismissRedbox), args, count);
     }
 
-
     NativeExceptionsManagerSpecJSI::NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1250,7 +1060,6 @@ + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json
         
         
         methodMap_["reportException"] = MethodMetadata {1, __hostFunction_NativeExceptionsManagerSpecJSI_reportException};
-        
         setMethodArgConversionSelector(@"reportException", 0, @"JS_NativeExceptionsManager_ExceptionData:");
         
         methodMap_["updateExceptionMessage"] = MethodMetadata {3, __hostFunction_NativeExceptionsManagerSpecJSI_updateExceptionMessage};
@@ -1258,15 +1067,12 @@ + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json
         
         methodMap_["dismissRedbox"] = MethodMetadata {0, __hostFunction_NativeExceptionsManagerSpecJSI_dismissRedbox};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeFileReaderModuleSpecJSI_readAsDataURL(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "readAsDataURL", @selector(readAsDataURL:resolve:reject:), args, count);
@@ -1276,7 +1082,6 @@ + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "readAsText", @selector(readAsText:encoding:resolve:reject:), args, count);
     }
 
-
     NativeFileReaderModuleSpecJSI::NativeFileReaderModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1285,10 +1090,7 @@ + (RCTManagedPointer *)JS_NativeExceptionsManager_ExceptionData:(id)json
         
         methodMap_["readAsText"] = MethodMetadata {2, __hostFunction_NativeFileReaderModuleSpecJSI_readAsText};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeFrameRateLogger_SpecSetGlobalOptionsOptions)
@@ -1299,7 +1101,6 @@ + (RCTManagedPointer *)JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:(id)
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeFrameRateLoggerSpecJSI_setGlobalOptions(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setGlobalOptions", @selector(setGlobalOptions:), args, count);
@@ -1317,12 +1118,10 @@ + (RCTManagedPointer *)JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:(id)
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "endScroll", @selector(endScroll), args, count);
     }
 
-
     NativeFrameRateLoggerSpecJSI::NativeFrameRateLoggerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["setGlobalOptions"] = MethodMetadata {1, __hostFunction_NativeFrameRateLoggerSpecJSI_setGlobalOptions};
-        
         setMethodArgConversionSelector(@"setGlobalOptions", 0, @"JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:");
         
         methodMap_["setContext"] = MethodMetadata {1, __hostFunction_NativeFrameRateLoggerSpecJSI_setContext};
@@ -1333,15 +1132,12 @@ + (RCTManagedPointer *)JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:(id)
         
         methodMap_["endScroll"] = MethodMetadata {0, __hostFunction_NativeFrameRateLoggerSpecJSI_endScroll};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeHeadlessJsTaskSupportSpecJSI_notifyTaskFinished(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "notifyTaskFinished", @selector(notifyTaskFinished:), args, count);
@@ -1351,7 +1147,6 @@ + (RCTManagedPointer *)JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:(id)
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "notifyTaskRetry", @selector(notifyTaskRetry:resolve:reject:), args, count);
     }
 
-
     NativeHeadlessJsTaskSupportSpecJSI::NativeHeadlessJsTaskSupportSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1360,15 +1155,12 @@ + (RCTManagedPointer *)JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:(id)
         
         methodMap_["notifyTaskRetry"] = MethodMetadata {1, __hostFunction_NativeHeadlessJsTaskSupportSpecJSI_notifyTaskRetry};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeI18nManagerSpecJSI_allowRTL(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "allowRTL", @selector(allowRTL:), args, count);
@@ -1386,7 +1178,6 @@ + (RCTManagedPointer *)JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:(id)
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeI18nManagerSpecJSI::NativeI18nManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1401,10 +1192,7 @@ + (RCTManagedPointer *)JS_NativeFrameRateLogger_SpecSetGlobalOptionsOptions:(id)
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeI18nManagerSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeImageEditor_OptionsOffset)
@@ -1433,28 +1221,22 @@ + (RCTManagedPointer *)JS_NativeImageEditor_Options:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeImageEditorSpecJSI_cropImage(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "cropImage", @selector(cropImage:cropData:successCallback:errorCallback:), args, count);
     }
 
-
     NativeImageEditorSpecJSI::NativeImageEditorSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["cropImage"] = MethodMetadata {4, __hostFunction_NativeImageEditorSpecJSI_cropImage};
-        
         setMethodArgConversionSelector(@"cropImage", 1, @"JS_NativeImageEditor_Options:");
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeImageLoaderAndroidSpecJSI_abortRequest(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "abortRequest", @selector(abortRequest:), args, count);
@@ -1476,7 +1258,6 @@ + (RCTManagedPointer *)JS_NativeImageEditor_Options:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "queryCache", @selector(queryCache:resolve:reject:), args, count);
     }
 
-
     NativeImageLoaderAndroidSpecJSI::NativeImageLoaderAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1494,15 +1275,12 @@ + (RCTManagedPointer *)JS_NativeImageEditor_Options:(id)json
         
         methodMap_["queryCache"] = MethodMetadata {1, __hostFunction_NativeImageLoaderAndroidSpecJSI_queryCache};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeImageLoaderIOSSpecJSI_getSize(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "getSize", @selector(getSize:resolve:reject:), args, count);
@@ -1520,7 +1298,6 @@ + (RCTManagedPointer *)JS_NativeImageEditor_Options:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "queryCache", @selector(queryCache:resolve:reject:), args, count);
     }
 
-
     NativeImageLoaderIOSSpecJSI::NativeImageLoaderIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1535,10 +1312,7 @@ + (RCTManagedPointer *)JS_NativeImageEditor_Options:(id)json
         
         methodMap_["queryCache"] = MethodMetadata {1, __hostFunction_NativeImageLoaderIOSSpecJSI_queryCache};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
@@ -1555,7 +1329,6 @@ + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenSelectDialogConfig:(id)js
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeImagePickerIOSSpecJSI_canRecordVideos(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "canRecordVideos", @selector(canRecordVideos:), args, count);
@@ -1581,7 +1354,6 @@ + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenSelectDialogConfig:(id)js
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removePendingVideo", @selector(removePendingVideo:), args, count);
     }
 
-
     NativeImagePickerIOSSpecJSI::NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1592,11 +1364,9 @@ + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenSelectDialogConfig:(id)js
         
         
         methodMap_["openCameraDialog"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSSpecJSI_openCameraDialog};
-        
         setMethodArgConversionSelector(@"openCameraDialog", 0, @"JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:");
         
         methodMap_["openSelectDialog"] = MethodMetadata {3, __hostFunction_NativeImagePickerIOSSpecJSI_openSelectDialog};
-        
         setMethodArgConversionSelector(@"openSelectDialog", 0, @"JS_NativeImagePickerIOS_SpecOpenSelectDialogConfig:");
         
         methodMap_["clearAllPendingVideos"] = MethodMetadata {0, __hostFunction_NativeImagePickerIOSSpecJSI_clearAllPendingVideos};
@@ -1604,47 +1374,28 @@ + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenSelectDialogConfig:(id)js
         
         methodMap_["removePendingVideo"] = MethodMetadata {1, __hostFunction_NativeImagePickerIOSSpecJSI_removePendingVideo};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeImageStoreAndroidSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getBase64ForTag", @selector(getBase64ForTag:successCallback:errorCallback:), args, count);
     }
 
-
     NativeImageStoreAndroidSpecJSI::NativeImageStoreAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["getBase64ForTag"] = MethodMetadata {3, __hostFunction_NativeImageStoreAndroidSpecJSI_getBase64ForTag};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError)
-+ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeImageStoreIOS::SpecGetBase64ForTagErrorCallbackError>(json);
-}
-@end
-@implementation RCTCxxConvert (NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError)
-+ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeImageStoreIOS::SpecAddImageFromBase64ErrorCallbackError>(json);
-}
-@end
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeImageStoreIOSSpecJSI_getBase64ForTag(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getBase64ForTag", @selector(getBase64ForTag:successCallback:errorCallback:), args, count);
@@ -1662,7 +1413,6 @@ + (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbac
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "addImageFromBase64", @selector(addImageFromBase64:successCallback:errorCallback:), args, count);
     }
 
-
     NativeImageStoreIOSSpecJSI::NativeImageStoreIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1677,55 +1427,44 @@ + (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbac
         
         methodMap_["addImageFromBase64"] = MethodMetadata {3, __hostFunction_NativeImageStoreIOSSpecJSI_addImageFromBase64};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeJSCHeapCaptureSpecJSI_captureComplete(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "captureComplete", @selector(captureComplete:error:), args, count);
     }
 
-
     NativeJSCHeapCaptureSpecJSI::NativeJSCHeapCaptureSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["captureComplete"] = MethodMetadata {2, __hostFunction_NativeJSCHeapCaptureSpecJSI_captureComplete};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeJSCSamplingProfilerSpecJSI_operationComplete(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "operationComplete", @selector(operationComplete:result:error:), args, count);
     }
 
-
     NativeJSCSamplingProfilerSpecJSI::NativeJSCSamplingProfilerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["operationComplete"] = MethodMetadata {3, __hostFunction_NativeJSCSamplingProfilerSpecJSI_operationComplete};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeJSDevSupportSpecJSI_onSuccess(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "onSuccess", @selector(onSuccess:), args, count);
@@ -1739,7 +1478,6 @@ + (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbac
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeJSDevSupportSpecJSI::NativeJSDevSupportSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1751,15 +1489,12 @@ + (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbac
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeJSDevSupportSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeKeyboardObserverSpecJSI_addListener(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "addListener", @selector(addListener:), args, count);
@@ -1769,7 +1504,6 @@ + (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbac
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeKeyboardObserverSpecJSI::NativeKeyboardObserverSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1778,21 +1512,12 @@ + (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbac
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeKeyboardObserverSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeLinking_SpecSendIntentExtrasElement)
-+ (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeLinking::SpecSendIntentExtrasElement>(json);
-}
-@end
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeLinkingSpecJSI_getInitialURL(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "getInitialURL", @selector(getInitialURL:reject:), args, count);
@@ -1822,7 +1547,6 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeLinkingSpecJSI::NativeLinkingSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1846,15 +1570,12 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeLinkingSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeLogBoxSpecJSI_show(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "show", @selector(show), args, count);
@@ -1864,7 +1585,6 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "hide", @selector(hide), args, count);
     }
 
-
     NativeLogBoxSpecJSI::NativeLogBoxSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1873,15 +1593,12 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
         
         methodMap_["hide"] = MethodMetadata {0, __hostFunction_NativeLogBoxSpecJSI_hide};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeModalManagerSpecJSI_addListener(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "addListener", @selector(addListener:), args, count);
@@ -1891,7 +1608,6 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeModalManagerSpecJSI::NativeModalManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1900,15 +1616,12 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeModalManagerSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeNetworkingAndroidSpecJSI_sendRequest(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "sendRequest", @selector(sendRequest:url:requestId:headers:data:responseType:useIncrementalUpdates:timeout:withCredentials:), args, count);
@@ -1930,7 +1643,6 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeNetworkingAndroidSpecJSI::NativeNetworkingAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -1948,10 +1660,7 @@ + (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeNetworkingAndroidSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeNetworkingIOS_SpecSendRequestQuery)
@@ -1962,7 +1671,6 @@ + (RCTManagedPointer *)JS_NativeNetworkingIOS_SpecSendRequestQuery:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeNetworkingIOSSpecJSI_sendRequest(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "sendRequest", @selector(sendRequest:callback:), args, count);
@@ -1984,12 +1692,10 @@ + (RCTManagedPointer *)JS_NativeNetworkingIOS_SpecSendRequestQuery:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeNetworkingIOSSpecJSI::NativeNetworkingIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["sendRequest"] = MethodMetadata {2, __hostFunction_NativeNetworkingIOSSpecJSI_sendRequest};
-        
         setMethodArgConversionSelector(@"sendRequest", 0, @"JS_NativeNetworkingIOS_SpecSendRequestQuery:");
         
         methodMap_["abortRequest"] = MethodMetadata {1, __hostFunction_NativeNetworkingIOSSpecJSI_abortRequest};
@@ -2003,15 +1709,12 @@ + (RCTManagedPointer *)JS_NativeNetworkingIOS_SpecSendRequestQuery:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeNetworkingIOSSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativePermissionsAndroidSpecJSI_checkPermission(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "checkPermission", @selector(checkPermission:resolve:reject:), args, count);
@@ -2029,7 +1732,6 @@ + (RCTManagedPointer *)JS_NativeNetworkingIOS_SpecSendRequestQuery:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "requestMultiplePermissions", @selector(requestMultiplePermissions:resolve:reject:), args, count);
     }
 
-
     NativePermissionsAndroidSpecJSI::NativePermissionsAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2044,15 +1746,12 @@ + (RCTManagedPointer *)JS_NativeNetworkingIOS_SpecSendRequestQuery:(id)json
         
         methodMap_["requestMultiplePermissions"] = MethodMetadata {1, __hostFunction_NativePermissionsAndroidSpecJSI_requestMultiplePermissions};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativePlatformConstantsAndroidSpecJSI_getAndroidID(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, StringKind, "getAndroidID", @selector(getAndroidID), args, count);
@@ -2062,7 +1761,6 @@ + (RCTManagedPointer *)JS_NativeNetworkingIOS_SpecSendRequestQuery:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativePlatformConstantsAndroidSpecJSI::NativePlatformConstantsAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2071,30 +1769,23 @@ + (RCTManagedPointer *)JS_NativeNetworkingIOS_SpecSendRequestQuery:(id)json
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativePlatformConstantsAndroidSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativePlatformConstantsIOSSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativePlatformConstantsIOSSpecJSI::NativePlatformConstantsIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativePlatformConstantsIOSSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativePushNotificationManagerIOS_SpecRequestPermissionsPermission)
@@ -2103,12 +1794,6 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_SpecRequestPermission
   return facebook::react::managedPointer<JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermission>(json);
 }
 @end
-@implementation RCTCxxConvert (NativePushNotificationManagerIOS_Permissions)
-+ (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Permissions:(id)json
-{
-  return facebook::react::managedPointer<JS::NativePushNotificationManagerIOS::Permissions>(json);
-}
-@end
 @implementation RCTCxxConvert (NativePushNotificationManagerIOS_Notification)
 + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
 {
@@ -2117,7 +1802,6 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativePushNotificationManagerIOSSpecJSI_onFinishRemoteNotification(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "onFinishRemoteNotification", @selector(onFinishRemoteNotification:fetchResult:), args, count);
@@ -2187,7 +1871,6 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativePushNotificationManagerIOSSpecJSI::NativePushNotificationManagerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2201,7 +1884,6 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
         
         
         methodMap_["requestPermissions"] = MethodMetadata {1, __hostFunction_NativePushNotificationManagerIOSSpecJSI_requestPermissions};
-        
         setMethodArgConversionSelector(@"requestPermissions", 0, @"JS_NativePushNotificationManagerIOS_SpecRequestPermissionsPermission:");
         
         methodMap_["abandonPermissions"] = MethodMetadata {0, __hostFunction_NativePushNotificationManagerIOSSpecJSI_abandonPermissions};
@@ -2211,11 +1893,9 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
         
         
         methodMap_["presentLocalNotification"] = MethodMetadata {1, __hostFunction_NativePushNotificationManagerIOSSpecJSI_presentLocalNotification};
-        
         setMethodArgConversionSelector(@"presentLocalNotification", 0, @"JS_NativePushNotificationManagerIOS_Notification:");
         
         methodMap_["scheduleLocalNotification"] = MethodMetadata {1, __hostFunction_NativePushNotificationManagerIOSSpecJSI_scheduleLocalNotification};
-        
         setMethodArgConversionSelector(@"scheduleLocalNotification", 0, @"JS_NativePushNotificationManagerIOS_Notification:");
         
         methodMap_["cancelAllLocalNotifications"] = MethodMetadata {0, __hostFunction_NativePushNotificationManagerIOSSpecJSI_cancelAllLocalNotifications};
@@ -2244,15 +1924,12 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativePushNotificationManagerIOSSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeRedBoxSpecJSI_setExtraData(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setExtraData", @selector(setExtraData:forIdentifier:), args, count);
@@ -2262,7 +1939,6 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "dismiss", @selector(dismiss), args, count);
     }
 
-
     NativeRedBoxSpecJSI::NativeRedBoxSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2271,15 +1947,12 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
         
         methodMap_["dismiss"] = MethodMetadata {0, __hostFunction_NativeRedBoxSpecJSI_dismiss};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeSegmentFetcherSpecJSI_fetchSegment(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "fetchSegment", @selector(fetchSegment:options:callback:), args, count);
@@ -2289,7 +1962,6 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getSegment", @selector(getSegment:options:callback:), args, count);
     }
 
-
     NativeSegmentFetcherSpecJSI::NativeSegmentFetcherSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2298,15 +1970,12 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
         
         methodMap_["getSegment"] = MethodMetadata {3, __hostFunction_NativeSegmentFetcherSpecJSI_getSegment};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeSettingsManagerSpecJSI_setValues(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setValues", @selector(setValues:), args, count);
@@ -2320,7 +1989,6 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeSettingsManagerSpecJSI::NativeSettingsManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2332,10 +2000,7 @@ + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Notification:(id)json
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeSettingsManagerSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeShareModule_SpecShareContent)
@@ -2346,68 +2011,54 @@ + (RCTManagedPointer *)JS_NativeShareModule_SpecShareContent:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeShareModuleSpecJSI_share(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, PromiseKind, "share", @selector(share:dialogTitle:resolve:reject:), args, count);
     }
 
-
     NativeShareModuleSpecJSI::NativeShareModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["share"] = MethodMetadata {2, __hostFunction_NativeShareModuleSpecJSI_share};
-        
         setMethodArgConversionSelector(@"share", 0, @"JS_NativeShareModule_SpecShareContent:");
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeSoundManagerSpecJSI_playTouchSound(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "playTouchSound", @selector(playTouchSound), args, count);
     }
 
-
     NativeSoundManagerSpecJSI::NativeSoundManagerSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["playTouchSound"] = MethodMetadata {0, __hostFunction_NativeSoundManagerSpecJSI_playTouchSound};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeSourceCodeSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeSourceCodeSpecJSI::NativeSourceCodeSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeSourceCodeSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeStatusBarManagerAndroidSpecJSI_setColor(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setColor", @selector(setColor:animated:), args, count);
@@ -2429,7 +2080,6 @@ + (RCTManagedPointer *)JS_NativeShareModule_SpecShareContent:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeStatusBarManagerAndroidSpecJSI::NativeStatusBarManagerAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2447,21 +2097,12 @@ + (RCTManagedPointer *)JS_NativeShareModule_SpecShareContent:(id)json
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeStatusBarManagerAndroidSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-@implementation RCTCxxConvert (NativeStatusBarManagerIOS_SpecGetHeightCallbackResult)
-+ (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:(id)json
-{
-  return facebook::react::managedPointer<JS::NativeStatusBarManagerIOS::SpecGetHeightCallbackResult>(json);
-}
-@end
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeStatusBarManagerIOSSpecJSI_getHeight(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "getHeight", @selector(getHeight:), args, count);
@@ -2491,7 +2132,6 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeStatusBarManagerIOSSpecJSI::NativeStatusBarManagerIOSSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2515,15 +2155,12 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeStatusBarManagerIOSSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeTVNavigationEventEmitterSpecJSI_addListener(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "addListener", @selector(addListener:), args, count);
@@ -2533,7 +2170,6 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeTVNavigationEventEmitterSpecJSI::NativeTVNavigationEventEmitterSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2542,15 +2178,12 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeTVNavigationEventEmitterSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeTimingSpecJSI_createTimer(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "createTimer", @selector(createTimer:duration:jsSchedulingTime:repeats:), args, count);
@@ -2564,7 +2197,6 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setSendIdleEvents", @selector(setSendIdleEvents:), args, count);
     }
 
-
     NativeTimingSpecJSI::NativeTimingSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2576,15 +2208,12 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
         
         methodMap_["setSendIdleEvents"] = MethodMetadata {1, __hostFunction_NativeTimingSpecJSI_setSendIdleEvents};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
+
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeToastAndroidSpecJSI_show(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "show", @selector(show:duration:), args, count);
@@ -2602,7 +2231,6 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
     }
 
-
     NativeToastAndroidSpecJSI::NativeToastAndroidSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2617,210 +2245,12 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
         
         methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeToastAndroidSpecJSI_getConstants};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
-namespace facebook {
-  namespace react {
-
-    
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_getConstantsForViewManager(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstantsForViewManager", @selector(getConstantsForViewManager:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_getDefaultEventTypes(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ArrayKind, "getDefaultEventTypes", @selector(getDefaultEventTypes), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_lazilyLoadView(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "lazilyLoadView", @selector(lazilyLoadView:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_createView(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "createView", @selector(createView:viewName:rootTag:props:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_updateView(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "updateView", @selector(updateView:viewName:props:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_focus(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "focus", @selector(focus:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_blur(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "blur", @selector(blur:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_findSubviewIn(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "findSubviewIn", @selector(findSubviewIn:point:callback:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_dispatchViewManagerCommand(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "dispatchViewManagerCommand", @selector(dispatchViewManagerCommand:commandID:commandArgs:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_measure(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "measure", @selector(measure:callback:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_measureInWindow(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "measureInWindow", @selector(measureInWindow:callback:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_viewIsDescendantOf(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "viewIsDescendantOf", @selector(viewIsDescendantOf:ancestorReactTag:callback:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_measureLayout(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "measureLayout", @selector(measureLayout:ancestorReactTag:errorCallback:callback:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_measureLayoutRelativeToParent(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "measureLayoutRelativeToParent", @selector(measureLayoutRelativeToParent:errorCallback:callback:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_setJSResponder(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setJSResponder", @selector(setJSResponder:blockNativeResponder:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_clearJSResponder(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "clearJSResponder", @selector(clearJSResponder), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_configureNextLayoutAnimation(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "configureNextLayoutAnimation", @selector(configureNextLayoutAnimation:callback:errorCallback:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_removeSubviewsFromContainerWithID(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeSubviewsFromContainerWithID", @selector(removeSubviewsFromContainerWithID:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_replaceExistingNonRootView(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "replaceExistingNonRootView", @selector(replaceExistingNonRootView:newReactTag:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_setChildren(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setChildren", @selector(setChildren:reactTags:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_manageChildren(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "manageChildren", @selector(manageChildren:moveFromIndices:moveToIndices:addChildReactTags:addAtIndices:removeAtIndices:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_setLayoutAnimationEnabledExperimental(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "setLayoutAnimationEnabledExperimental", @selector(setLayoutAnimationEnabledExperimental:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_sendAccessibilityEvent(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "sendAccessibilityEvent", @selector(sendAccessibilityEvent:eventType:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_showPopupMenu(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "showPopupMenu", @selector(showPopupMenu:items:error:success:), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_dismissPopupMenu(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "dismissPopupMenu", @selector(dismissPopupMenu), args, count);
-    }
-
-    static facebook::jsi::Value __hostFunction_NativeUIManagerSpecJSI_getConstants(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
-      return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, ObjectKind, "getConstants", @selector(getConstants), args, count);
-    }
-
-
-    NativeUIManagerSpecJSI::NativeUIManagerSpecJSI(const ObjCTurboModule::InitParams &params)
-      : ObjCTurboModule(params) {
-        
-        methodMap_["getConstantsForViewManager"] = MethodMetadata {1, __hostFunction_NativeUIManagerSpecJSI_getConstantsForViewManager};
-        
-        
-        methodMap_["getDefaultEventTypes"] = MethodMetadata {0, __hostFunction_NativeUIManagerSpecJSI_getDefaultEventTypes};
-        
-        
-        methodMap_["lazilyLoadView"] = MethodMetadata {1, __hostFunction_NativeUIManagerSpecJSI_lazilyLoadView};
-        
-        
-        methodMap_["createView"] = MethodMetadata {4, __hostFunction_NativeUIManagerSpecJSI_createView};
-        
-        
-        methodMap_["updateView"] = MethodMetadata {3, __hostFunction_NativeUIManagerSpecJSI_updateView};
-        
-        
-        methodMap_["focus"] = MethodMetadata {1, __hostFunction_NativeUIManagerSpecJSI_focus};
-        
-        
-        methodMap_["blur"] = MethodMetadata {1, __hostFunction_NativeUIManagerSpecJSI_blur};
-        
-        
-        methodMap_["findSubviewIn"] = MethodMetadata {3, __hostFunction_NativeUIManagerSpecJSI_findSubviewIn};
-        
-        
-        methodMap_["dispatchViewManagerCommand"] = MethodMetadata {3, __hostFunction_NativeUIManagerSpecJSI_dispatchViewManagerCommand};
-        
-        
-        methodMap_["measure"] = MethodMetadata {2, __hostFunction_NativeUIManagerSpecJSI_measure};
-        
-        
-        methodMap_["measureInWindow"] = MethodMetadata {2, __hostFunction_NativeUIManagerSpecJSI_measureInWindow};
-        
-        
-        methodMap_["viewIsDescendantOf"] = MethodMetadata {3, __hostFunction_NativeUIManagerSpecJSI_viewIsDescendantOf};
-        
-        
-        methodMap_["measureLayout"] = MethodMetadata {4, __hostFunction_NativeUIManagerSpecJSI_measureLayout};
-        
-        
-        methodMap_["measureLayoutRelativeToParent"] = MethodMetadata {3, __hostFunction_NativeUIManagerSpecJSI_measureLayoutRelativeToParent};
-        
-        
-        methodMap_["setJSResponder"] = MethodMetadata {2, __hostFunction_NativeUIManagerSpecJSI_setJSResponder};
-        
-        
-        methodMap_["clearJSResponder"] = MethodMetadata {0, __hostFunction_NativeUIManagerSpecJSI_clearJSResponder};
-        
-        
-        methodMap_["configureNextLayoutAnimation"] = MethodMetadata {3, __hostFunction_NativeUIManagerSpecJSI_configureNextLayoutAnimation};
-        
-        
-        methodMap_["removeSubviewsFromContainerWithID"] = MethodMetadata {1, __hostFunction_NativeUIManagerSpecJSI_removeSubviewsFromContainerWithID};
-        
-        
-        methodMap_["replaceExistingNonRootView"] = MethodMetadata {2, __hostFunction_NativeUIManagerSpecJSI_replaceExistingNonRootView};
-        
-        
-        methodMap_["setChildren"] = MethodMetadata {2, __hostFunction_NativeUIManagerSpecJSI_setChildren};
-        
-        
-        methodMap_["manageChildren"] = MethodMetadata {6, __hostFunction_NativeUIManagerSpecJSI_manageChildren};
-        
-        
-        methodMap_["setLayoutAnimationEnabledExperimental"] = MethodMetadata {1, __hostFunction_NativeUIManagerSpecJSI_setLayoutAnimationEnabledExperimental};
-        
-        
-        methodMap_["sendAccessibilityEvent"] = MethodMetadata {2, __hostFunction_NativeUIManagerSpecJSI_sendAccessibilityEvent};
-        
-        
-        methodMap_["showPopupMenu"] = MethodMetadata {4, __hostFunction_NativeUIManagerSpecJSI_showPopupMenu};
-        
-        
-        methodMap_["dismissPopupMenu"] = MethodMetadata {0, __hostFunction_NativeUIManagerSpecJSI_dismissPopupMenu};
-        
-        
-        methodMap_["getConstants"] = MethodMetadata {0, __hostFunction_NativeUIManagerSpecJSI_getConstants};
-        
-        
-
-    }
 
-  } // namespace react
-} // namespace facebook
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeVibrationSpecJSI_vibrate(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "vibrate", @selector(vibrate:), args, count);
@@ -2834,7 +2264,6 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "cancel", @selector(cancel), args, count);
     }
 
-
     NativeVibrationSpecJSI::NativeVibrationSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
@@ -2846,10 +2275,7 @@ + (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:
         
         methodMap_["cancel"] = MethodMetadata {0, __hostFunction_NativeVibrationSpecJSI_cancel};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
 @implementation RCTCxxConvert (NativeWebSocketModule_SpecConnectOptions)
@@ -2860,7 +2286,6 @@ + (RCTManagedPointer *)JS_NativeWebSocketModule_SpecConnectOptions:(id)json
 @end
 namespace facebook {
   namespace react {
-
     
     static facebook::jsi::Value __hostFunction_NativeWebSocketModuleSpecJSI_connect(facebook::jsi::Runtime& rt, TurboModule &turboModule, const facebook::jsi::Value* args, size_t count) {
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "connect", @selector(connect:protocols:options:socketID:), args, count);
@@ -2890,12 +2315,10 @@ + (RCTManagedPointer *)JS_NativeWebSocketModule_SpecConnectOptions:(id)json
       return static_cast<ObjCTurboModule&>(turboModule).invokeObjCMethod(rt, VoidKind, "removeListeners", @selector(removeListeners:), args, count);
     }
 
-
     NativeWebSocketModuleSpecJSI::NativeWebSocketModuleSpecJSI(const ObjCTurboModule::InitParams &params)
       : ObjCTurboModule(params) {
         
         methodMap_["connect"] = MethodMetadata {4, __hostFunction_NativeWebSocketModuleSpecJSI_connect};
-        
         setMethodArgConversionSelector(@"connect", 2, @"JS_NativeWebSocketModule_SpecConnectOptions:");
         
         methodMap_["send"] = MethodMetadata {2, __hostFunction_NativeWebSocketModuleSpecJSI_send};
@@ -2915,9 +2338,6 @@ + (RCTManagedPointer *)JS_NativeWebSocketModule_SpecConnectOptions:(id)json
         
         methodMap_["removeListeners"] = MethodMetadata {1, __hostFunction_NativeWebSocketModuleSpecJSI_removeListeners};
         
-        
-
     }
-
   } // namespace react
 } // namespace facebook
diff --git a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
index 78011e9ea4d305..faed1c7120865a 100644
--- a/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
+++ b/Libraries/FBReactNativeSpec/FBReactNativeSpec/FBReactNativeSpec.h
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated by an internal genrule from Flow types.
+ * @generated by codegen project: GenerateModuleObjCpp
  *
  * We create an umbrella header (and corresponding implementation) here since
  * Cxx compilation in BUCK has a limitation: source-code producing genrule()s
@@ -39,15 +39,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AccessibilityInfo'
      */
-
     class JSI_EXPORT NativeAccessibilityInfoSpecJSI : public ObjCTurboModule {
     public:
       NativeAccessibilityInfoSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeAccessibilityManager {
     struct SpecSetAccessibilityContentSizeMultipliersJSMultipliers {
@@ -98,15 +95,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AccessibilityManager'
      */
-
     class JSI_EXPORT NativeAccessibilityManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeAccessibilityManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeActionSheetManager {
     struct SpecShowActionSheetWithOptionsOptions {
@@ -129,7 +123,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeActionSheetManager_SpecShowActionSheetWithOptionsOptions)
 + (RCTManagedPointer *)JS_NativeActionSheetManager_SpecShowActionSheetWithOptionsOptions:(id)json;
 @end
-
 namespace JS {
   namespace NativeActionSheetManager {
     struct SpecShowShareActionSheetWithOptionsOptions {
@@ -151,25 +144,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeActionSheetManager_SpecShowShareActionSheetWithOptionsOptions)
 + (RCTManagedPointer *)JS_NativeActionSheetManager_SpecShowShareActionSheetWithOptionsOptions:(id)json;
 @end
-
-namespace JS {
-  namespace NativeActionSheetManager {
-    struct SpecShowShareActionSheetWithOptionsFailureCallbackError {
-      NSString *domain() const;
-      NSString *code() const;
-      id<NSObject> _Nullable userInfo() const;
-      NSString *message() const;
-
-      SpecShowShareActionSheetWithOptionsFailureCallbackError(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeActionSheetManager_SpecShowShareActionSheetWithOptionsFailureCallbackError)
-+ (RCTManagedPointer *)JS_NativeActionSheetManager_SpecShowShareActionSheetWithOptionsFailureCallbackError:(id)json;
-@end
 @protocol NativeActionSheetManagerSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)showActionSheetWithOptions:(JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions &)options
@@ -184,21 +158,18 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ActionSheetManager'
      */
-
     class JSI_EXPORT NativeActionSheetManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeActionSheetManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeAlertManager {
     struct Args {
       NSString *title() const;
       NSString *message() const;
-      folly::Optional<facebook::react::LazyVector<id<NSObject>>> buttons() const;
+      folly::Optional<facebook::react::LazyVector<id<NSObject> >> buttons() const;
       NSString *type() const;
       NSString *defaultValue() const;
       NSString *cancelButtonKey() const;
@@ -226,31 +197,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AlertManager'
      */
-
     class JSI_EXPORT NativeAlertManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeAlertManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
-namespace JS {
-  namespace NativeAnimatedModule {
-    struct EndResult {
-      bool finished() const;
-
-      EndResult(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAnimatedModule_EndResult)
-+ (RCTManagedPointer *)JS_NativeAnimatedModule_EndResult:(id)json;
-@end
-
 namespace JS {
   namespace NativeAnimatedModule {
     struct EventMapping {
@@ -313,31 +265,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AnimatedModule'
      */
-
     class JSI_EXPORT NativeAnimatedModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeAnimatedModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
-namespace JS {
-  namespace NativeAnimatedTurboModule {
-    struct EndResult {
-      bool finished() const;
-
-      EndResult(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAnimatedTurboModule_EndResult)
-+ (RCTManagedPointer *)JS_NativeAnimatedTurboModule_EndResult:(id)json;
-@end
-
 namespace JS {
   namespace NativeAnimatedTurboModule {
     struct EventMapping {
@@ -400,14 +333,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AnimatedTurboModule'
      */
-
     class JSI_EXPORT NativeAnimatedTurboModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeAnimatedTurboModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeAnimationsDebugModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)startRecordingFps;
@@ -419,31 +351,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AnimationsDebugModule'
      */
-
     class JSI_EXPORT NativeAnimationsDebugModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeAnimationsDebugModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
-namespace JS {
-  namespace NativeAppState {
-    struct SpecGetCurrentAppStateSuccessAppState {
-      NSString *app_state() const;
-
-      SpecGetCurrentAppStateSuccessAppState(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAppState_SpecGetCurrentAppStateSuccessAppState)
-+ (RCTManagedPointer *)JS_NativeAppState_SpecGetCurrentAppStateSuccessAppState:(id)json;
-@end
-
 namespace JS {
   namespace NativeAppState {
     struct Constants {
@@ -486,17 +399,16 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AppState'
      */
-
     class JSI_EXPORT NativeAppStateSpecJSI : public ObjCTurboModule {
     public:
       NativeAppStateSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeAppearanceSpec <RCTBridgeModule, RCTTurboModule>
 
-- (NSString *)getColorScheme;
+- (NSString * _Nullable)getColorScheme;
 - (void)addListener:(NSString *)eventName;
 - (void)removeListeners:(double)count;
 
@@ -506,133 +418,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'Appearance'
      */
-
     class JSI_EXPORT NativeAppearanceSpecJSI : public ObjCTurboModule {
     public:
       NativeAppearanceSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
 
-namespace JS {
-  namespace NativeAppearance {
-    struct AppearancePreferences {
-      NSString *colorScheme() const;
-
-      AppearancePreferences(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAppearance_AppearancePreferences)
-+ (RCTManagedPointer *)JS_NativeAppearance_AppearancePreferences:(id)json;
-@end
-typedef NS_ENUM(NSInteger, NativeAppearanceColorSchemeName) {
-  NativeAppearanceColorSchemeNameLight = 0,
-  NativeAppearanceColorSchemeNameDark,
-};
-
-folly::Optional<NativeAppearanceColorSchemeName> NSStringToNativeAppearanceColorSchemeName(NSString *value);
-NSString *NativeAppearanceColorSchemeNameToNSString(folly::Optional<NativeAppearanceColorSchemeName> value);
-
-namespace JS {
-  namespace NativeAsyncStorage {
-    struct SpecMultiGetCallbackErrorsElement {
-      NSString *message() const;
-
-      SpecMultiGetCallbackErrorsElement(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAsyncStorage_SpecMultiGetCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiGetCallbackErrorsElement:(id)json;
-@end
-
-namespace JS {
-  namespace NativeAsyncStorage {
-    struct SpecMultiSetCallbackErrorsElement {
-      NSString *message() const;
-
-      SpecMultiSetCallbackErrorsElement(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAsyncStorage_SpecMultiSetCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiSetCallbackErrorsElement:(id)json;
-@end
-
-namespace JS {
-  namespace NativeAsyncStorage {
-    struct SpecMultiMergeCallbackErrorsElement {
-      NSString *message() const;
-
-      SpecMultiMergeCallbackErrorsElement(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAsyncStorage_SpecMultiMergeCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiMergeCallbackErrorsElement:(id)json;
-@end
-
-namespace JS {
-  namespace NativeAsyncStorage {
-    struct SpecMultiRemoveCallbackErrorsElement {
-      NSString *message() const;
-
-      SpecMultiRemoveCallbackErrorsElement(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAsyncStorage_SpecMultiRemoveCallbackErrorsElement)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecMultiRemoveCallbackErrorsElement:(id)json;
-@end
-
-namespace JS {
-  namespace NativeAsyncStorage {
-    struct SpecClearCallbackError {
-      NSString *message() const;
-
-      SpecClearCallbackError(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAsyncStorage_SpecClearCallbackError)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecClearCallbackError:(id)json;
-@end
-
-namespace JS {
-  namespace NativeAsyncStorage {
-    struct SpecGetAllKeysCallbackError {
-      NSString *message() const;
-
-      SpecGetAllKeysCallbackError(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeAsyncStorage_SpecGetAllKeysCallbackError)
-+ (RCTManagedPointer *)JS_NativeAsyncStorage_SpecGetAllKeysCallbackError:(id)json;
-@end
 @protocol NativeAsyncStorageSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)multiGet:(NSArray *)keys
@@ -652,15 +444,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'AsyncStorage'
      */
-
     class JSI_EXPORT NativeAsyncStorageSpecJSI : public ObjCTurboModule {
     public:
       NativeAsyncStorageSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeBlobModule {
     struct Constants {
@@ -708,14 +497,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'BlobModule'
      */
-
     class JSI_EXPORT NativeBlobModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeBlobModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeBugReportingSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)startReportAProblemFlow;
@@ -729,14 +517,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'BugReporting'
      */
-
     class JSI_EXPORT NativeBugReportingSpecJSI : public ObjCTurboModule {
     public:
       NativeBugReportingSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeClipboardSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getString:(RCTPromiseResolveBlock)resolve
@@ -749,14 +536,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'Clipboard'
      */
-
     class JSI_EXPORT NativeClipboardSpecJSI : public ObjCTurboModule {
     public:
       NativeClipboardSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeDatePickerAndroidSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)open:(NSDictionary *)options
@@ -769,14 +555,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DatePickerAndroid'
      */
-
     class JSI_EXPORT NativeDatePickerAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativeDatePickerAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeDevLoadingViewSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)showMessage:(NSString *)message
@@ -790,14 +575,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DevLoadingView'
      */
-
     class JSI_EXPORT NativeDevLoadingViewSpecJSI : public ObjCTurboModule {
     public:
       NativeDevLoadingViewSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeDevMenuSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)show;
@@ -812,14 +596,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DevMenu'
      */
-
     class JSI_EXPORT NativeDevMenuSpecJSI : public ObjCTurboModule {
     public:
       NativeDevMenuSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeDevSettingsSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)reload;
@@ -840,14 +623,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DevSettings'
      */
-
     class JSI_EXPORT NativeDevSettingsSpecJSI : public ObjCTurboModule {
     public:
       NativeDevSettingsSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeDevSplitBundleLoaderSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)loadBundle:(NSString *)bundlePath
@@ -860,14 +642,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DevSplitBundleLoader'
      */
-
     class JSI_EXPORT NativeDevSplitBundleLoaderSpecJSI : public ObjCTurboModule {
     public:
       NativeDevSplitBundleLoaderSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeDeviceEventManagerSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)invokeDefaultBackPressHandler;
@@ -878,15 +659,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DeviceEventManager'
      */
-
     class JSI_EXPORT NativeDeviceEventManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeDeviceEventManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeDeviceInfo {
     struct DisplayMetrics {
@@ -917,7 +695,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeDeviceInfo {
     struct DisplayMetricsAndroid {
@@ -949,7 +726,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeDeviceInfo {
     struct DimensionsPayload {
@@ -980,7 +756,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativeDeviceInfo {
     struct Constants {
@@ -1020,15 +795,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DeviceInfo'
      */
-
     class JSI_EXPORT NativeDeviceInfoSpecJSI : public ObjCTurboModule {
     public:
       NativeDeviceInfoSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeDialogManagerAndroid {
     struct DialogOptions {
@@ -1050,7 +822,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeDialogManagerAndroid_DialogOptions)
 + (RCTManagedPointer *)JS_NativeDialogManagerAndroid_DialogOptions:(id)json;
 @end
-
 namespace JS {
   namespace NativeDialogManagerAndroid {
     struct Constants {
@@ -1096,15 +867,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'DialogManagerAndroid'
      */
-
     class JSI_EXPORT NativeDialogManagerAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativeDialogManagerAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeExceptionsManager {
     struct StackFrame {
@@ -1124,7 +892,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeExceptionsManager_StackFrame)
 + (RCTManagedPointer *)JS_NativeExceptionsManager_StackFrame:(id)json;
 @end
-
 namespace JS {
   namespace NativeExceptionsManager {
     struct ExceptionData {
@@ -1167,14 +934,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ExceptionsManager'
      */
-
     class JSI_EXPORT NativeExceptionsManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeExceptionsManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeFileReaderModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)readAsDataURL:(NSDictionary *)data
@@ -1191,15 +957,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'FileReaderModule'
      */
-
     class JSI_EXPORT NativeFileReaderModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeFileReaderModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeFrameRateLogger {
     struct SpecSetGlobalOptionsOptions {
@@ -1229,14 +992,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'FrameRateLogger'
      */
-
     class JSI_EXPORT NativeFrameRateLoggerSpecJSI : public ObjCTurboModule {
     public:
       NativeFrameRateLoggerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeHeadlessJsTaskSupportSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)notifyTaskFinished:(double)taskId;
@@ -1250,15 +1012,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'HeadlessJsTaskSupport'
      */
-
     class JSI_EXPORT NativeHeadlessJsTaskSupportSpecJSI : public ObjCTurboModule {
     public:
       NativeHeadlessJsTaskSupportSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeI18nManager {
     struct Constants {
@@ -1301,15 +1060,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'I18nManager'
      */
-
     class JSI_EXPORT NativeI18nManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeI18nManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeImageEditor {
     struct OptionsOffset {
@@ -1326,7 +1082,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeImageEditor_OptionsOffset)
 + (RCTManagedPointer *)JS_NativeImageEditor_OptionsOffset:(id)json;
 @end
-
 namespace JS {
   namespace NativeImageEditor {
     struct OptionsSize {
@@ -1343,7 +1098,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeImageEditor_OptionsSize)
 + (RCTManagedPointer *)JS_NativeImageEditor_OptionsSize:(id)json;
 @end
-
 namespace JS {
   namespace NativeImageEditor {
     struct OptionsDisplaySize {
@@ -1360,7 +1114,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeImageEditor_OptionsDisplaySize)
 + (RCTManagedPointer *)JS_NativeImageEditor_OptionsDisplaySize:(id)json;
 @end
-
 namespace JS {
   namespace NativeImageEditor {
     struct Options {
@@ -1393,14 +1146,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ImageEditor'
      */
-
     class JSI_EXPORT NativeImageEditorSpecJSI : public ObjCTurboModule {
     public:
       NativeImageEditorSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeImageLoaderAndroidSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)abortRequest:(double)requestId;
@@ -1425,14 +1177,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ImageLoaderAndroid'
      */
-
     class JSI_EXPORT NativeImageLoaderAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativeImageLoaderAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeImageLoaderIOSSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getSize:(NSString *)uri
@@ -1455,15 +1206,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ImageLoaderIOS'
      */
-
     class JSI_EXPORT NativeImageLoaderIOSSpecJSI : public ObjCTurboModule {
     public:
       NativeImageLoaderIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeImagePickerIOS {
     struct SpecOpenCameraDialogConfig {
@@ -1480,7 +1228,6 @@ namespace JS {
 @interface RCTCxxConvert (NativeImagePickerIOS_SpecOpenCameraDialogConfig)
 + (RCTManagedPointer *)JS_NativeImagePickerIOS_SpecOpenCameraDialogConfig:(id)json;
 @end
-
 namespace JS {
   namespace NativeImagePickerIOS {
     struct SpecOpenSelectDialogConfig {
@@ -1516,14 +1263,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ImagePickerIOS'
      */
-
     class JSI_EXPORT NativeImagePickerIOSSpecJSI : public ObjCTurboModule {
     public:
       NativeImagePickerIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeImageStoreAndroidSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getBase64ForTag:(NSString *)uri
@@ -1536,46 +1282,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ImageStoreAndroid'
      */
-
     class JSI_EXPORT NativeImageStoreAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativeImageStoreAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
 
-namespace JS {
-  namespace NativeImageStoreIOS {
-    struct SpecGetBase64ForTagErrorCallbackError {
-      NSString *message() const;
-
-      SpecGetBase64ForTagErrorCallbackError(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError)
-+ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecGetBase64ForTagErrorCallbackError:(id)json;
-@end
-
-namespace JS {
-  namespace NativeImageStoreIOS {
-    struct SpecAddImageFromBase64ErrorCallbackError {
-      NSString *message() const;
-
-      SpecAddImageFromBase64ErrorCallbackError(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError)
-+ (RCTManagedPointer *)JS_NativeImageStoreIOS_SpecAddImageFromBase64ErrorCallbackError:(id)json;
-@end
 @protocol NativeImageStoreIOSSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getBase64ForTag:(NSString *)uri
@@ -1594,14 +1307,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ImageStoreIOS'
      */
-
     class JSI_EXPORT NativeImageStoreIOSSpecJSI : public ObjCTurboModule {
     public:
       NativeImageStoreIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeJSCHeapCaptureSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)captureComplete:(NSString *)path
@@ -1613,14 +1325,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'JSCHeapCapture'
      */
-
     class JSI_EXPORT NativeJSCHeapCaptureSpecJSI : public ObjCTurboModule {
     public:
       NativeJSCHeapCaptureSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeJSCSamplingProfilerSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)operationComplete:(double)token
@@ -1633,15 +1344,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'JSCSamplingProfiler'
      */
-
     class JSI_EXPORT NativeJSCSamplingProfilerSpecJSI : public ObjCTurboModule {
     public:
       NativeJSCSamplingProfilerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeJSDevSupport {
     struct Constants {
@@ -1684,14 +1392,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'JSDevSupport'
      */
-
     class JSI_EXPORT NativeJSDevSupportSpecJSI : public ObjCTurboModule {
     public:
       NativeJSDevSupportSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeKeyboardObserverSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)addListener:(NSString *)eventName;
@@ -1703,31 +1410,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'KeyboardObserver'
      */
-
     class JSI_EXPORT NativeKeyboardObserverSpecJSI : public ObjCTurboModule {
     public:
       NativeKeyboardObserverSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
 
-namespace JS {
-  namespace NativeLinking {
-    struct SpecSendIntentExtrasElement {
-      NSString *key() const;
-      id<NSObject> value() const;
-
-      SpecSendIntentExtrasElement(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeLinking_SpecSendIntentExtrasElement)
-+ (RCTManagedPointer *)JS_NativeLinking_SpecSendIntentExtrasElement:(id)json;
-@end
 @protocol NativeLinkingSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)getInitialURL:(RCTPromiseResolveBlock)resolve
@@ -1741,7 +1430,7 @@ namespace JS {
 - (void)openSettings:(RCTPromiseResolveBlock)resolve
               reject:(RCTPromiseRejectBlock)reject;
 - (void)sendIntent:(NSString *)action
-            extras:(NSArray *_Nullable)extras
+            extras:(NSArray * _Nullable)extras
            resolve:(RCTPromiseResolveBlock)resolve
             reject:(RCTPromiseRejectBlock)reject;
 - (void)addListener:(NSString *)eventName;
@@ -1753,14 +1442,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'Linking'
      */
-
     class JSI_EXPORT NativeLinkingSpecJSI : public ObjCTurboModule {
     public:
       NativeLinkingSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeLogBoxSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)show;
@@ -1772,14 +1460,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'LogBox'
      */
-
     class JSI_EXPORT NativeLogBoxSpecJSI : public ObjCTurboModule {
     public:
       NativeLogBoxSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeModalManagerSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)addListener:(NSString *)eventName;
@@ -1791,14 +1478,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ModalManager'
      */
-
     class JSI_EXPORT NativeModalManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeModalManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeNetworkingAndroidSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)sendRequest:(NSString *)method
@@ -1821,22 +1507,19 @@ namespace facebook {
     /**
      * ObjC++ class for module 'NetworkingAndroid'
      */
-
     class JSI_EXPORT NativeNetworkingAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativeNetworkingAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeNetworkingIOS {
     struct SpecSendRequestQuery {
       NSString *method() const;
       NSString *url() const;
-      id<NSObject> data() const;
-      id<NSObject> headers() const;
+      id<NSObject>  data() const;
+      id<NSObject>  headers() const;
       NSString *responseType() const;
       bool incrementalUpdates() const;
       double timeout() const;
@@ -1867,14 +1550,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'NetworkingIOS'
      */
-
     class JSI_EXPORT NativeNetworkingIOSSpecJSI : public ObjCTurboModule {
     public:
       NativeNetworkingIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativePermissionsAndroidSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)checkPermission:(NSString *)permission
@@ -1896,15 +1578,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'PermissionsAndroid'
      */
-
     class JSI_EXPORT NativePermissionsAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativePermissionsAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativePlatformConstantsAndroid {
     struct ConstantsReactNativeVersion {
@@ -1935,7 +1614,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativePlatformConstantsAndroid {
     struct Constants {
@@ -1985,15 +1663,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'PlatformConstantsAndroid'
      */
-
     class JSI_EXPORT NativePlatformConstantsAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativePlatformConstantsAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativePlatformConstantsIOS {
     struct ConstantsReactNativeVersion {
@@ -2024,7 +1699,6 @@ namespace JS {
     };
   }
 }
-
 namespace JS {
   namespace NativePlatformConstantsIOS {
     struct Constants {
@@ -2068,15 +1742,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'PlatformConstantsIOS'
      */
-
     class JSI_EXPORT NativePlatformConstantsIOSSpecJSI : public ObjCTurboModule {
     public:
       NativePlatformConstantsIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativePushNotificationManagerIOS {
     struct SpecRequestPermissionsPermission {
@@ -2094,25 +1765,6 @@ namespace JS {
 @interface RCTCxxConvert (NativePushNotificationManagerIOS_SpecRequestPermissionsPermission)
 + (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_SpecRequestPermissionsPermission:(id)json;
 @end
-
-namespace JS {
-  namespace NativePushNotificationManagerIOS {
-    struct Permissions {
-      bool alert() const;
-      bool badge() const;
-      bool sound() const;
-
-      Permissions(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativePushNotificationManagerIOS_Permissions)
-+ (RCTManagedPointer *)JS_NativePushNotificationManagerIOS_Permissions:(id)json;
-@end
-
 namespace JS {
   namespace NativePushNotificationManagerIOS {
     struct Notification {
@@ -2166,14 +1818,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'PushNotificationManagerIOS'
      */
-
     class JSI_EXPORT NativePushNotificationManagerIOSSpecJSI : public ObjCTurboModule {
     public:
       NativePushNotificationManagerIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeRedBoxSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)setExtraData:(NSDictionary *)extraData
@@ -2186,14 +1837,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'RedBox'
      */
-
     class JSI_EXPORT NativeRedBoxSpecJSI : public ObjCTurboModule {
     public:
       NativeRedBoxSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeSegmentFetcherSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)fetchSegment:(double)segmentId
@@ -2209,22 +1859,19 @@ namespace facebook {
     /**
      * ObjC++ class for module 'SegmentFetcher'
      */
-
     class JSI_EXPORT NativeSegmentFetcherSpecJSI : public ObjCTurboModule {
     public:
       NativeSegmentFetcherSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeSettingsManager {
     struct Constants {
 
       struct Builder {
         struct Input {
-          RCTRequired<id<NSObject>> settings;
+          RCTRequired<id<NSObject> > settings;
         };
 
         /** Initialize with a set of values */
@@ -2258,15 +1905,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'SettingsManager'
      */
-
     class JSI_EXPORT NativeSettingsManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeSettingsManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeShareModule {
     struct SpecShareContent {
@@ -2296,14 +1940,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ShareModule'
      */
-
     class JSI_EXPORT NativeShareModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeShareModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeSoundManagerSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)playTouchSound;
@@ -2314,15 +1957,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'SoundManager'
      */
-
     class JSI_EXPORT NativeSoundManagerSpecJSI : public ObjCTurboModule {
     public:
       NativeSoundManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeSourceCode {
     struct Constants {
@@ -2361,15 +2001,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'SourceCode'
      */
-
     class JSI_EXPORT NativeSourceCodeSpecJSI : public ObjCTurboModule {
     public:
       NativeSourceCodeSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeStatusBarManagerAndroid {
     struct Constants {
@@ -2414,31 +2051,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'StatusBarManagerAndroid'
      */
-
     class JSI_EXPORT NativeStatusBarManagerAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativeStatusBarManagerAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
-namespace JS {
-  namespace NativeStatusBarManagerIOS {
-    struct SpecGetHeightCallbackResult {
-      double height() const;
-
-      SpecGetHeightCallbackResult(NSDictionary *const v) : _v(v) {}
-    private:
-      NSDictionary *_v;
-    };
-  }
-}
-
-@interface RCTCxxConvert (NativeStatusBarManagerIOS_SpecGetHeightCallbackResult)
-+ (RCTManagedPointer *)JS_NativeStatusBarManagerIOS_SpecGetHeightCallbackResult:(id)json;
-@end
-
 namespace JS {
   namespace NativeStatusBarManagerIOS {
     struct Constants {
@@ -2486,14 +2104,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'StatusBarManagerIOS'
      */
-
     class JSI_EXPORT NativeStatusBarManagerIOSSpecJSI : public ObjCTurboModule {
     public:
       NativeStatusBarManagerIOSSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeTVNavigationEventEmitterSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)addListener:(NSString *)eventName;
@@ -2505,14 +2122,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'TVNavigationEventEmitter'
      */
-
     class JSI_EXPORT NativeTVNavigationEventEmitterSpecJSI : public ObjCTurboModule {
     public:
       NativeTVNavigationEventEmitterSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
+
 @protocol NativeTimingSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)createTimer:(double)callbackID
@@ -2528,15 +2144,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'Timing'
      */
-
     class JSI_EXPORT NativeTimingSpecJSI : public ObjCTurboModule {
     public:
       NativeTimingSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeToastAndroid {
     struct Constants {
@@ -2589,117 +2202,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'ToastAndroid'
      */
-
     class JSI_EXPORT NativeToastAndroidSpecJSI : public ObjCTurboModule {
     public:
       NativeToastAndroidSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
 
-namespace JS {
-  namespace NativeUIManager {
-    struct Constants {
-
-      struct Builder {
-        struct Input {
-        };
-
-        /** Initialize with a set of values */
-        Builder(const Input i);
-        /** Initialize with an existing Constants */
-        Builder(Constants i);
-        /** Builds the object. Generally used only by the infrastructure. */
-        NSDictionary *buildUnsafeRawValue() const { return _factory(); };
-      private:
-        NSDictionary *(^_factory)(void);
-      };
-
-      static Constants fromUnsafeRawValue(NSDictionary *const v) { return {v}; }
-      NSDictionary *unsafeRawValue() const { return _v; }
-    private:
-      Constants(NSDictionary *const v) : _v(v) {}
-      NSDictionary *_v;
-    };
-  }
-}
-@protocol NativeUIManagerSpec <RCTBridgeModule, RCTTurboModule>
-
-- (NSDictionary *)getConstantsForViewManager:(NSString *)viewManagerName;
-- (NSArray<NSString *> *)getDefaultEventTypes;
-- (NSDictionary *)lazilyLoadView:(NSString *)name;
-- (void)createView:(NSNumber *)reactTag
-          viewName:(NSString *)viewName
-           rootTag:(double)rootTag
-             props:(NSDictionary *)props;
-- (void)updateView:(double)reactTag
-          viewName:(NSString *)viewName
-             props:(NSDictionary *)props;
-- (void)focus:(NSNumber *)reactTag;
-- (void)blur:(NSNumber *)reactTag;
-- (void)findSubviewIn:(NSNumber *)reactTag
-                point:(NSArray *)point
-             callback:(RCTResponseSenderBlock)callback;
-- (void)dispatchViewManagerCommand:(NSNumber *)reactTag
-                         commandID:(double)commandID
-                       commandArgs:(NSArray *_Nullable)commandArgs;
-- (void)measure:(NSNumber *)reactTag
-       callback:(RCTResponseSenderBlock)callback;
-- (void)measureInWindow:(NSNumber *)reactTag
-               callback:(RCTResponseSenderBlock)callback;
-- (void)viewIsDescendantOf:(NSNumber *)reactTag
-          ancestorReactTag:(NSNumber *)ancestorReactTag
-                  callback:(RCTResponseSenderBlock)callback;
-- (void)measureLayout:(NSNumber *)reactTag
-     ancestorReactTag:(NSNumber *)ancestorReactTag
-        errorCallback:(RCTResponseSenderBlock)errorCallback
-             callback:(RCTResponseSenderBlock)callback;
-- (void)measureLayoutRelativeToParent:(NSNumber *)reactTag
-                        errorCallback:(RCTResponseSenderBlock)errorCallback
-                             callback:(RCTResponseSenderBlock)callback;
-- (void)setJSResponder:(NSNumber *)reactTag
-  blockNativeResponder:(BOOL)blockNativeResponder;
-- (void)clearJSResponder;
-- (void)configureNextLayoutAnimation:(NSDictionary *)config
-                            callback:(RCTResponseSenderBlock)callback
-                       errorCallback:(RCTResponseSenderBlock)errorCallback;
-- (void)removeSubviewsFromContainerWithID:(double)containerID;
-- (void)replaceExistingNonRootView:(NSNumber *)reactTag
-                       newReactTag:(NSNumber *)newReactTag;
-- (void)setChildren:(NSNumber *)containerTag
-          reactTags:(NSArray *)reactTags;
-- (void)manageChildren:(NSNumber *)containerTag
-       moveFromIndices:(NSArray *)moveFromIndices
-         moveToIndices:(NSArray *)moveToIndices
-     addChildReactTags:(NSArray *)addChildReactTags
-          addAtIndices:(NSArray *)addAtIndices
-       removeAtIndices:(NSArray *)removeAtIndices;
-- (void)setLayoutAnimationEnabledExperimental:(BOOL)enabled;
-- (void)sendAccessibilityEvent:(NSNumber *)reactTag
-                     eventType:(double)eventType;
-- (void)showPopupMenu:(NSNumber *)reactTag
-                items:(NSArray *)items
-                error:(RCTResponseSenderBlock)error
-              success:(RCTResponseSenderBlock)success;
-- (void)dismissPopupMenu;
-- (facebook::react::ModuleConstants<JS::NativeUIManager::Constants::Builder>)constantsToExport;
-- (facebook::react::ModuleConstants<JS::NativeUIManager::Constants::Builder>)getConstants;
-
-@end
-namespace facebook {
-  namespace react {
-    /**
-     * ObjC++ class for module 'UIManager'
-     */
-
-    class JSI_EXPORT NativeUIManagerSpecJSI : public ObjCTurboModule {
-    public:
-      NativeUIManagerSpecJSI(const ObjCTurboModule::InitParams &params);
-
-    };
-  } // namespace react
-} // namespace facebook
 @protocol NativeVibrationSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)vibrate:(double)pattern;
@@ -2713,15 +2222,12 @@ namespace facebook {
     /**
      * ObjC++ class for module 'Vibration'
      */
-
     class JSI_EXPORT NativeVibrationSpecJSI : public ObjCTurboModule {
     public:
       NativeVibrationSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
-
 namespace JS {
   namespace NativeWebSocketModule {
     struct SpecConnectOptions {
@@ -2740,7 +2246,7 @@ namespace JS {
 @protocol NativeWebSocketModuleSpec <RCTBridgeModule, RCTTurboModule>
 
 - (void)connect:(NSString *)url
-      protocols:(NSArray *_Nullable)protocols
+      protocols:(NSArray * _Nullable)protocols
         options:(JS::NativeWebSocketModule::SpecConnectOptions &)options
        socketID:(double)socketID;
 - (void)send:(NSString *)message
@@ -2760,18 +2266,13 @@ namespace facebook {
     /**
      * ObjC++ class for module 'WebSocketModule'
      */
-
     class JSI_EXPORT NativeWebSocketModuleSpecJSI : public ObjCTurboModule {
     public:
       NativeWebSocketModuleSpecJSI(const ObjCTurboModule::InitParams &params);
-
     };
   } // namespace react
 } // namespace facebook
 
-#import <RCTTypeSafety/RCTConvertHelpers.h>
-
-
 inline folly::Optional<double> JS::NativeAccessibilityManager::SpecSetAccessibilityContentSizeMultipliersJSMultipliers::extraSmall() const
 {
   id const p = _v[@"extraSmall"];
@@ -2835,12 +2336,12 @@ inline folly::Optional<double> JS::NativeAccessibilityManager::SpecSetAccessibil
 inline NSString *JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions::title() const
 {
   id const p = _v[@"title"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions::message() const
 {
   id const p = _v[@"message"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions::options() const
 {
@@ -2870,22 +2371,22 @@ inline folly::Optional<double> JS::NativeActionSheetManager::SpecShowActionSheet
 inline NSString *JS::NativeActionSheetManager::SpecShowActionSheetWithOptionsOptions::userInterfaceStyle() const
 {
   id const p = _v[@"userInterfaceStyle"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions::message() const
 {
   id const p = _v[@"message"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions::url() const
 {
   id const p = _v[@"url"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions::subject() const
 {
   id const p = _v[@"subject"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline folly::Optional<double> JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions::anchor() const
 {
@@ -2905,72 +2406,47 @@ inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeAction
 inline NSString *JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsOptions::userInterfaceStyle() const
 {
   id const p = _v[@"userInterfaceStyle"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsFailureCallbackError::domain() const
-{
-  id const p = _v[@"domain"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsFailureCallbackError::code() const
-{
-  id const p = _v[@"code"];
-  return RCTBridgingToString(p);
-}
-inline id<NSObject> _Nullable JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsFailureCallbackError::userInfo() const
-{
-  id const p = _v[@"userInfo"];
-  return p;
-}
-inline NSString *JS::NativeActionSheetManager::SpecShowShareActionSheetWithOptionsFailureCallbackError::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeAlertManager::Args::title() const
 {
   id const p = _v[@"title"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeAlertManager::Args::message() const
 {
   id const p = _v[@"message"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
-inline folly::Optional<facebook::react::LazyVector<id<NSObject>>> JS::NativeAlertManager::Args::buttons() const
+inline folly::Optional<facebook::react::LazyVector<id<NSObject> >> JS::NativeAlertManager::Args::buttons() const
 {
   id const p = _v[@"buttons"];
-  return RCTBridgingToOptionalVec(p, ^id<NSObject>(id itemValue_0) { return itemValue_0; });
+  return RCTBridgingToOptionalVec(p, ^id<NSObject> (id itemValue_0) { return itemValue_0; });
 }
 inline NSString *JS::NativeAlertManager::Args::type() const
 {
   id const p = _v[@"type"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeAlertManager::Args::defaultValue() const
 {
   id const p = _v[@"defaultValue"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeAlertManager::Args::cancelButtonKey() const
 {
   id const p = _v[@"cancelButtonKey"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeAlertManager::Args::destructiveButtonKey() const
 {
   id const p = _v[@"destructiveButtonKey"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeAlertManager::Args::keyboardType() const
 {
   id const p = _v[@"keyboardType"];
-  return RCTBridgingToString(p);
-}
-inline bool JS::NativeAnimatedModule::EndResult::finished() const
-{
-  id const p = _v[@"finished"];
-  return RCTBridgingToBool(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline facebook::react::LazyVector<NSString *> JS::NativeAnimatedModule::EventMapping::nativeEventPath() const
 {
@@ -2982,11 +2458,6 @@ inline folly::Optional<double> JS::NativeAnimatedModule::EventMapping::animatedV
   id const p = _v[@"animatedValueTag"];
   return RCTBridgingToOptionalDouble(p);
 }
-inline bool JS::NativeAnimatedTurboModule::EndResult::finished() const
-{
-  id const p = _v[@"finished"];
-  return RCTBridgingToBool(p);
-}
 inline facebook::react::LazyVector<NSString *> JS::NativeAnimatedTurboModule::EventMapping::nativeEventPath() const
 {
   id const p = _v[@"nativeEventPath"];
@@ -2997,11 +2468,7 @@ inline folly::Optional<double> JS::NativeAnimatedTurboModule::EventMapping::anim
   id const p = _v[@"animatedValueTag"];
   return RCTBridgingToOptionalDouble(p);
 }
-inline NSString *JS::NativeAppState::SpecGetCurrentAppStateSuccessAppState::app_state() const
-{
-  id const p = _v[@"app_state"];
-  return RCTBridgingToString(p);
-}
+
 inline JS::NativeAppState::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto initialAppState = i.initialAppState.get();
@@ -3011,41 +2478,8 @@ inline JS::NativeAppState::Constants::Builder::Builder(const Input i) : _factory
 inline JS::NativeAppState::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-inline NSString *JS::NativeAppearance::AppearancePreferences::colorScheme() const
-{
-  id const p = _v[@"colorScheme"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeAsyncStorage::SpecMultiGetCallbackErrorsElement::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeAsyncStorage::SpecMultiSetCallbackErrorsElement::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeAsyncStorage::SpecMultiMergeCallbackErrorsElement::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeAsyncStorage::SpecMultiRemoveCallbackErrorsElement::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeAsyncStorage::SpecClearCallbackError::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeAsyncStorage::SpecGetAllKeysCallbackError::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
+
+
 inline JS::NativeBlobModule::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto BLOB_URI_SCHEME = i.BLOB_URI_SCHEME.get();
@@ -3057,6 +2491,14 @@ inline JS::NativeBlobModule::Constants::Builder::Builder(const Input i) : _facto
 inline JS::NativeBlobModule::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
+
+
+
+
+
+
+
+
 inline JS::NativeDeviceInfo::DisplayMetrics::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto width = i.width.get();
@@ -3118,27 +2560,27 @@ inline JS::NativeDeviceInfo::Constants::Builder::Builder(Constants i) : _factory
 inline NSString *JS::NativeDialogManagerAndroid::DialogOptions::title() const
 {
   id const p = _v[@"title"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeDialogManagerAndroid::DialogOptions::message() const
 {
   id const p = _v[@"message"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeDialogManagerAndroid::DialogOptions::buttonPositive() const
 {
   id const p = _v[@"buttonPositive"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeDialogManagerAndroid::DialogOptions::buttonNegative() const
 {
   id const p = _v[@"buttonNegative"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeDialogManagerAndroid::DialogOptions::buttonNeutral() const
 {
   id const p = _v[@"buttonNeutral"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline folly::Optional<facebook::react::LazyVector<NSString *>> JS::NativeDialogManagerAndroid::DialogOptions::items() const
 {
@@ -3175,7 +2617,7 @@ inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::column()
 inline NSString *JS::NativeExceptionsManager::StackFrame::file() const
 {
   id const p = _v[@"file"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline folly::Optional<double> JS::NativeExceptionsManager::StackFrame::lineNumber() const
 {
@@ -3200,17 +2642,17 @@ inline NSString *JS::NativeExceptionsManager::ExceptionData::message() const
 inline NSString *JS::NativeExceptionsManager::ExceptionData::originalMessage() const
 {
   id const p = _v[@"originalMessage"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeExceptionsManager::ExceptionData::name() const
 {
   id const p = _v[@"name"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeExceptionsManager::ExceptionData::componentStack() const
 {
   id const p = _v[@"componentStack"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> JS::NativeExceptionsManager::ExceptionData::stack() const
 {
@@ -3219,7 +2661,7 @@ inline facebook::react::LazyVector<JS::NativeExceptionsManager::StackFrame> JS::
 }
 inline double JS::NativeExceptionsManager::ExceptionData::id_() const
 {
-  id const p = _v[@"id"];
+  id const p = _v[@"id_"];
   return RCTBridgingToDouble(p);
 }
 inline bool JS::NativeExceptionsManager::ExceptionData::isFatal() const
@@ -3232,6 +2674,7 @@ inline id<NSObject> _Nullable JS::NativeExceptionsManager::ExceptionData::extraD
   id const p = _v[@"extraData"];
   return p;
 }
+
 inline folly::Optional<bool> JS::NativeFrameRateLogger::SpecSetGlobalOptionsOptions::debug() const
 {
   id const p = _v[@"debug"];
@@ -3242,6 +2685,7 @@ inline folly::Optional<bool> JS::NativeFrameRateLogger::SpecSetGlobalOptionsOpti
   id const p = _v[@"reportStackTraces"];
   return RCTBridgingToOptionalBool(p);
 }
+
 inline JS::NativeI18nManager::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto isRTL = i.isRTL.get();
@@ -3301,13 +2745,15 @@ inline folly::Optional<JS::NativeImageEditor::OptionsDisplaySize> JS::NativeImag
 inline NSString *JS::NativeImageEditor::Options::resizeMode() const
 {
   id const p = _v[@"resizeMode"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline folly::Optional<bool> JS::NativeImageEditor::Options::allowExternalStorage() const
 {
   id const p = _v[@"allowExternalStorage"];
   return RCTBridgingToOptionalBool(p);
 }
+
+
 inline bool JS::NativeImagePickerIOS::SpecOpenCameraDialogConfig::unmirrorFrontFacingCamera() const
 {
   id const p = _v[@"unmirrorFrontFacingCamera"];
@@ -3328,16 +2774,10 @@ inline bool JS::NativeImagePickerIOS::SpecOpenSelectDialogConfig::showVideos() c
   id const p = _v[@"showVideos"];
   return RCTBridgingToBool(p);
 }
-inline NSString *JS::NativeImageStoreIOS::SpecGetBase64ForTagErrorCallbackError::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
-inline NSString *JS::NativeImageStoreIOS::SpecAddImageFromBase64ErrorCallbackError::message() const
-{
-  id const p = _v[@"message"];
-  return RCTBridgingToString(p);
-}
+
+
+
+
 inline JS::NativeJSDevSupport::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto ERROR_CODE_EXCEPTION = i.ERROR_CODE_EXCEPTION.get();
@@ -3349,16 +2789,11 @@ inline JS::NativeJSDevSupport::Constants::Builder::Builder(const Input i) : _fac
 inline JS::NativeJSDevSupport::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-inline NSString *JS::NativeLinking::SpecSendIntentExtrasElement::key() const
-{
-  id const p = _v[@"key"];
-  return RCTBridgingToString(p);
-}
-inline id<NSObject> JS::NativeLinking::SpecSendIntentExtrasElement::value() const
-{
-  id const p = _v[@"value"];
-  return p;
-}
+
+
+
+
+
 inline NSString *JS::NativeNetworkingIOS::SpecSendRequestQuery::method() const
 {
   id const p = _v[@"method"];
@@ -3369,12 +2804,12 @@ inline NSString *JS::NativeNetworkingIOS::SpecSendRequestQuery::url() const
   id const p = _v[@"url"];
   return RCTBridgingToString(p);
 }
-inline id<NSObject> JS::NativeNetworkingIOS::SpecSendRequestQuery::data() const
+inline id<NSObject>  JS::NativeNetworkingIOS::SpecSendRequestQuery::data() const
 {
   id const p = _v[@"data"];
   return p;
 }
-inline id<NSObject> JS::NativeNetworkingIOS::SpecSendRequestQuery::headers() const
+inline id<NSObject>  JS::NativeNetworkingIOS::SpecSendRequestQuery::headers() const
 {
   id const p = _v[@"headers"];
   return p;
@@ -3399,6 +2834,7 @@ inline bool JS::NativeNetworkingIOS::SpecSendRequestQuery::withCredentials() con
   id const p = _v[@"withCredentials"];
   return RCTBridgingToBool(p);
 }
+
 inline JS::NativePlatformConstantsAndroid::ConstantsReactNativeVersion::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto major = i.major.get();
@@ -3492,25 +2928,10 @@ inline bool JS::NativePushNotificationManagerIOS::SpecRequestPermissionsPermissi
   id const p = _v[@"sound"];
   return RCTBridgingToBool(p);
 }
-inline bool JS::NativePushNotificationManagerIOS::Permissions::alert() const
-{
-  id const p = _v[@"alert"];
-  return RCTBridgingToBool(p);
-}
-inline bool JS::NativePushNotificationManagerIOS::Permissions::badge() const
-{
-  id const p = _v[@"badge"];
-  return RCTBridgingToBool(p);
-}
-inline bool JS::NativePushNotificationManagerIOS::Permissions::sound() const
-{
-  id const p = _v[@"sound"];
-  return RCTBridgingToBool(p);
-}
 inline NSString *JS::NativePushNotificationManagerIOS::Notification::alertTitle() const
 {
   id const p = _v[@"alertTitle"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline folly::Optional<double> JS::NativePushNotificationManagerIOS::Notification::fireDate() const
 {
@@ -3520,12 +2941,12 @@ inline folly::Optional<double> JS::NativePushNotificationManagerIOS::Notificatio
 inline NSString *JS::NativePushNotificationManagerIOS::Notification::alertBody() const
 {
   id const p = _v[@"alertBody"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativePushNotificationManagerIOS::Notification::alertAction() const
 {
   id const p = _v[@"alertAction"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline id<NSObject> _Nullable JS::NativePushNotificationManagerIOS::Notification::userInfo() const
 {
@@ -3535,12 +2956,12 @@ inline id<NSObject> _Nullable JS::NativePushNotificationManagerIOS::Notification
 inline NSString *JS::NativePushNotificationManagerIOS::Notification::category() const
 {
   id const p = _v[@"category"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativePushNotificationManagerIOS::Notification::repeatInterval() const
 {
   id const p = _v[@"repeatInterval"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline folly::Optional<double> JS::NativePushNotificationManagerIOS::Notification::applicationIconBadgeNumber() const
 {
@@ -3552,6 +2973,8 @@ inline folly::Optional<bool> JS::NativePushNotificationManagerIOS::Notification:
   id const p = _v[@"isSilent"];
   return RCTBridgingToOptionalBool(p);
 }
+
+
 inline JS::NativeSettingsManager::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto settings = i.settings.get();
@@ -3564,13 +2987,14 @@ inline JS::NativeSettingsManager::Constants::Builder::Builder(Constants i) : _fa
 inline NSString *JS::NativeShareModule::SpecShareContent::title() const
 {
   id const p = _v[@"title"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
 inline NSString *JS::NativeShareModule::SpecShareContent::message() const
 {
   id const p = _v[@"message"];
-  return RCTBridgingToString(p);
+  return RCTBridgingToOptionalString(p);
 }
+
 inline JS::NativeSourceCode::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto scriptURL = i.scriptURL.get();
@@ -3591,11 +3015,6 @@ inline JS::NativeStatusBarManagerAndroid::Constants::Builder::Builder(const Inpu
 inline JS::NativeStatusBarManagerAndroid::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-inline double JS::NativeStatusBarManagerIOS::SpecGetHeightCallbackResult::height() const
-{
-  id const p = _v[@"height"];
-  return RCTBridgingToDouble(p);
-}
 inline JS::NativeStatusBarManagerIOS::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto HEIGHT = i.HEIGHT.get();
@@ -3607,6 +3026,8 @@ inline JS::NativeStatusBarManagerIOS::Constants::Builder::Builder(const Input i)
 inline JS::NativeStatusBarManagerIOS::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
+
+
 inline JS::NativeToastAndroid::Constants::Builder::Builder(const Input i) : _factory(^{
   NSMutableDictionary *d = [NSMutableDictionary new];
   auto SHORT = i.SHORT.get();
@@ -3624,13 +3045,7 @@ inline JS::NativeToastAndroid::Constants::Builder::Builder(const Input i) : _fac
 inline JS::NativeToastAndroid::Constants::Builder::Builder(Constants i) : _factory(^{
   return i.unsafeRawValue();
 }) {}
-inline JS::NativeUIManager::Constants::Builder::Builder(const Input i) : _factory(^{
-  NSMutableDictionary *d = [NSMutableDictionary new];
-  return d;
-}) {}
-inline JS::NativeUIManager::Constants::Builder::Builder(Constants i) : _factory(^{
-  return i.unsafeRawValue();
-}) {}
+
 inline id<NSObject> _Nullable JS::NativeWebSocketModule::SpecConnectOptions::headers() const
 {
   id const p = _v[@"headers"];

From 0d02c60bae3025dee41874a88765dc872f401f45 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 9 Oct 2020 03:13:26 -0700
Subject: [PATCH 205/241] Don't call FabricUIManager.stopSurface from
 ReactRootView with invalid ID

Summary:
There are cases under investigation where unmountReactApplication is called before the ReactRootView gets an ID; in some or all of those cases, UIManagerBinding.stopSurface cannot get the ReactFabric JSI module and crashes there.

It's still unclear why `unmountReactApplication` is being called in these circumstances - maybe another crash causing React Native teardown?

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D24214712

fbshipit-source-id: 796594653f4ff6d87088c4841b89f06cc873b46f
---
 .../main/java/com/facebook/react/ReactRootView.java    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
index 30b322a68a3e8d..63a6de08c0a37b 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java
@@ -35,6 +35,7 @@
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.bridge.ReactMarker;
 import com.facebook.react.bridge.ReactMarkerConstants;
+import com.facebook.react.bridge.ReactSoftException;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UiThreadUtil;
 import com.facebook.react.bridge.WritableMap;
@@ -490,7 +491,14 @@ public void unmountReactApplication() {
             UIManagerHelper.getUIManager(reactApplicationContext, getUIManagerType());
         if (uiManager != null) {
           FLog.e(TAG, "stopSurface for surfaceId: " + this.getId());
-          uiManager.stopSurface(this.getId());
+          if (getId() == NO_ID) {
+            ReactSoftException.logSoftException(
+                TAG,
+                new RuntimeException(
+                    "unmountReactApplication called on ReactRootView with invalid id"));
+          } else {
+            uiManager.stopSurface(this.getId());
+          }
         }
       }
     }

From 0c438be6c7efd134163a8915821f5dd51bc33782 Mon Sep 17 00:00:00 2001
From: George Zahariev <gkz@fb.com>
Date: Fri, 9 Oct 2020 11:18:15 -0700
Subject: [PATCH 206/241] Clean up other Xplat .flowconfigs

Summary:
Types First and the various esproposal flags are on by default as of 0.135

Clean up flowconfigs that have to be in sync with the main one

Changelog: [Internal]

Reviewed By: jimmy623

Differential Revision: D24221995

fbshipit-source-id: 5da2867e2f013ad729a436ada192ecab690cb413
---
 .flowconfig         | 5 -----
 .flowconfig.android | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/.flowconfig b/.flowconfig
index c8b28fb8c86800..21f8935ed9d1e7 100644
--- a/.flowconfig
+++ b/.flowconfig
@@ -29,9 +29,6 @@ flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
 exact_by_default=true
 
 module.file_ext=.js
@@ -50,8 +47,6 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-well_formed_exports=true
-types_first=true
 experimental.abstract_locations=true
 
 [lints]
diff --git a/.flowconfig.android b/.flowconfig.android
index 8008aacbad5243..6a13e89ec4d681 100644
--- a/.flowconfig.android
+++ b/.flowconfig.android
@@ -29,9 +29,6 @@ flow/
 [options]
 emoji=true
 
-esproposal.optional_chaining=enable
-esproposal.nullish_coalescing=enable
-
 exact_by_default=true
 
 module.file_ext=.js
@@ -50,8 +47,6 @@ suppress_type=$FlowFixMeProps
 suppress_type=$FlowFixMeState
 suppress_type=$FlowFixMeEmpty
 
-well_formed_exports=true
-types_first=true
 experimental.abstract_locations=true
 
 [lints]

From 3aa4de7912f218bfc1c3fc35a1d3dc570c9d7edd Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 9 Oct 2020 12:14:01 -0700
Subject: [PATCH 207/241] Add debugging mode to non-Fabric
 NativeViewHierarchyManager

Summary:
Just helpful for debugging sessions.

Changelog: [Internal]

Reviewed By: sammy-SC

Differential Revision: D24207622

fbshipit-source-id: 904cbaa4512c03581d6a5c3efd69ebfca7972d42
---
 .../uimanager/NativeViewHierarchyManager.java | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
index a5e9e13ace4c8a..83ec3105e76276 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/NativeViewHierarchyManager.java
@@ -29,6 +29,7 @@
 import com.facebook.react.bridge.RetryableMountingLayerException;
 import com.facebook.react.bridge.SoftAssertions;
 import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.common.build.ReactBuildConfig;
 import com.facebook.react.config.ReactFeatureFlags;
 import com.facebook.react.touch.JSResponderHandler;
 import com.facebook.react.uimanager.layoutanimation.LayoutAnimationController;
@@ -69,6 +70,7 @@
 public class NativeViewHierarchyManager {
 
   private static final String TAG = NativeViewHierarchyManager.class.getSimpleName();
+  private final boolean DEBUG_MODE = ReactBuildConfig.DEBUG && false;
 
   private final SparseArray<View> mTagsToViews;
   private final SparseArray<ViewManager> mTagsToViewManagers;
@@ -128,6 +130,9 @@ public synchronized void updateInstanceHandle(int tag, long instanceHandle) {
   }
 
   public synchronized void updateProperties(int tag, ReactStylesDiffMap props) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "updateProperties[%d]: %s", tag, props.toString());
+    }
     UiThreadUtil.assertOnUiThread();
 
     try {
@@ -143,6 +148,9 @@ public synchronized void updateProperties(int tag, ReactStylesDiffMap props) {
   }
 
   public synchronized void updateViewExtraData(int tag, Object extraData) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "updateViewExtraData[%d]: %s", tag, extraData.toString());
+    }
     UiThreadUtil.assertOnUiThread();
 
     ViewManager viewManager = resolveViewManager(tag);
@@ -152,6 +160,9 @@ public synchronized void updateViewExtraData(int tag, Object extraData) {
 
   public synchronized void updateLayout(
       int parentTag, int tag, int x, int y, int width, int height) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "updateLayout[%d]->[%d]: %d %d %d %d", tag, parentTag, x, y, width, height);
+    }
     UiThreadUtil.assertOnUiThread();
     SystraceMessage.beginSection(
             Systrace.TRACE_TAG_REACT_VIEW, "NativeViewHierarchyManager_updateLayout")
@@ -250,6 +261,9 @@ public synchronized void createView(
       int tag,
       String className,
       @Nullable ReactStylesDiffMap initialProps) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "createView[%d]: %s %s", tag, className, initialProps.toString());
+    }
     UiThreadUtil.assertOnUiThread();
     SystraceMessage.beginSection(
             Systrace.TRACE_TAG_REACT_VIEW, "NativeViewHierarchyManager_createView")
@@ -372,6 +386,15 @@ public synchronized void manageChildren(
       @Nullable int[] indicesToRemove,
       @Nullable ViewAtIndex[] viewsToAdd,
       @Nullable int[] tagsToDelete) {
+    if (DEBUG_MODE) {
+      FLog.d(
+          TAG,
+          "createView[%d]: %s %s %s",
+          tag,
+          (indicesToRemove != null ? indicesToRemove.toString() : "<null>"),
+          (viewsToAdd != null ? viewsToAdd.toString() : "<null>"),
+          (tagsToDelete != null ? tagsToDelete.toString() : "<null>"));
+    }
     UiThreadUtil.assertOnUiThread();
 
     final Set<Integer> pendingDeletionTags = getPendingDeletionsForTag(tag);
@@ -545,6 +568,13 @@ private static String constructSetChildrenErrorMessage(
 
   /** Simplified version of manageChildren that only deals with adding children views */
   public synchronized void setChildren(int tag, ReadableArray childrenTags) {
+    if (DEBUG_MODE) {
+      FLog.d(
+          TAG,
+          "setChildren[%d]: %s",
+          tag,
+          (childrenTags != null ? childrenTags.toString() : "<null>"));
+    }
     UiThreadUtil.assertOnUiThread();
     ViewGroup viewToManage = (ViewGroup) mTagsToViews.get(tag);
     ViewGroupManager viewManager = (ViewGroupManager) resolveViewManager(tag);
@@ -568,6 +598,9 @@ public synchronized void addRootView(int tag, View view) {
   }
 
   protected final synchronized void addRootViewGroup(int tag, View view) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "addRootViewGroup[%d]: %s", tag, (view != null ? view.toString() : "<null>"));
+    }
     if (view.getId() != View.NO_ID) {
       FLog.e(
           TAG,
@@ -587,6 +620,9 @@ protected final synchronized void addRootViewGroup(int tag, View view) {
 
   /** Releases all references to given native View. */
   protected synchronized void dropView(View view) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "dropView[%d]", (view != null ? view.getId() : -1));
+    }
     UiThreadUtil.assertOnUiThread();
     if (view == null) {
       // Ignore this drop operation when view is null.
@@ -620,6 +656,9 @@ protected synchronized void dropView(View view) {
   }
 
   public synchronized void removeRootView(int rootViewTag) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "removeRootView[%d]", rootViewTag);
+    }
     UiThreadUtil.assertOnUiThread();
     if (!mRootTags.get(rootViewTag)) {
       SoftAssertions.assertUnreachable(
@@ -635,6 +674,9 @@ public synchronized void removeRootView(int rootViewTag) {
    * {x, y, width, height}.
    */
   public synchronized void measure(int tag, int[] outputBuffer) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "measure[%d]", tag);
+    }
     UiThreadUtil.assertOnUiThread();
     View v = mTagsToViews.get(tag);
     if (v == null) {
@@ -699,6 +741,9 @@ private void mapRectFromViewToWindowCoords(View view, RectF rect) {
    *     relative to the device window
    */
   public synchronized void measureInWindow(int tag, int[] outputBuffer) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "measureInWindow[%d]", tag);
+    }
     UiThreadUtil.assertOnUiThread();
     View v = mTagsToViews.get(tag);
     if (v == null) {
@@ -720,6 +765,9 @@ public synchronized void measureInWindow(int tag, int[] outputBuffer) {
   }
 
   public synchronized int findTargetTagForTouch(int reactTag, float touchX, float touchY) {
+    if (DEBUG_MODE) {
+      FLog.d(TAG, "findTargetTagForTouch[%d]: %f %f", reactTag, touchX, touchY);
+    }
     UiThreadUtil.assertOnUiThread();
     View view = mTagsToViews.get(reactTag);
     if (view == null) {
@@ -765,6 +813,14 @@ void clearLayoutAnimation() {
   @Deprecated
   public synchronized void dispatchCommand(
       int reactTag, int commandId, @Nullable ReadableArray args) {
+    if (DEBUG_MODE) {
+      FLog.d(
+          TAG,
+          "dispatchCommand[%d]: %d %s",
+          reactTag,
+          commandId,
+          (args != null ? args.toString() : "<null>"));
+    }
     UiThreadUtil.assertOnUiThread();
     View view = mTagsToViews.get(reactTag);
     if (view == null) {
@@ -780,6 +836,14 @@ public synchronized void dispatchCommand(
 
   public synchronized void dispatchCommand(
       int reactTag, String commandId, @Nullable ReadableArray args) {
+    if (DEBUG_MODE) {
+      FLog.d(
+          TAG,
+          "dispatchCommand[%d]: %s %s",
+          reactTag,
+          commandId,
+          (args != null ? args.toString() : "<null>"));
+    }
     UiThreadUtil.assertOnUiThread();
     View view = mTagsToViews.get(reactTag);
     if (view == null) {

From 254d4551036abbd61eb1b809d7640d5adb863ba3 Mon Sep 17 00:00:00 2001
From: Panagiotis Vekris <pvekris@fb.com>
Date: Fri, 9 Oct 2020 15:49:17 -0700
Subject: [PATCH 208/241] Add type annotations to prevent issues with planned
 Flow changes

Summary:
We're planning a fix in Flow (D24112595) that uncovers some existing errors that were
previously suppressed. Adding these annotations prevents them from surfacing during the
deploy of the fix.

Changelog: [Internal]

Reviewed By: dsainati1

Differential Revision: D24147994

fbshipit-source-id: fef59a9427da6db79d4824e39768dd5ad0a8d1a3
---
 Libraries/StyleSheet/splitLayoutProps.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Libraries/StyleSheet/splitLayoutProps.js b/Libraries/StyleSheet/splitLayoutProps.js
index 953b3e55f462fd..2c6fd33f87eca1 100644
--- a/Libraries/StyleSheet/splitLayoutProps.js
+++ b/Libraries/StyleSheet/splitLayoutProps.js
@@ -49,8 +49,8 @@ function splitLayoutProps(
   const inner = {};
   const outer = {};
   if (props) {
-    Object.keys(props).forEach(k => {
-      const value: $ElementType<DangerouslyImpreciseStyle, typeof k> = props[k];
+    Object.keys(props).forEach((k: string) => {
+      const value = props[k];
       if (OUTER_PROPS[k]) {
         outer[k] = value;
       } else {

From fa20f254809c14696c9bb66bff1b28a9403d33c2 Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Fri, 9 Oct 2020 17:09:26 -0700
Subject: [PATCH 209/241] Enable multitouch on RCTViewComponentView

Summary:
Changelog: [internal]

RCTViewComponent view should have multipleTouchEnabled set to YES.
Paper has it enabled by default as well.

Reviewed By: JoshuaGross, yungsters

Differential Revision: D24219076

fbshipit-source-id: 74c18632457147b944a8abbacdbecb57e57f62ef
---
 .../Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
index e50f0c2540fc5d..f15be9a11b50fe 100644
--- a/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/View/RCTViewComponentView.mm
@@ -31,6 +31,7 @@ - (instancetype)initWithFrame:(CGRect)frame
   if (self = [super initWithFrame:frame]) {
     static auto const defaultProps = std::make_shared<ViewProps const>();
     _props = defaultProps;
+    self.multipleTouchEnabled = YES;
   }
   return self;
 }

From f40cdcdfe7c70cc56ce61f0d0c8154931d2e649c Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Fri, 9 Oct 2020 19:00:01 -0700
Subject: [PATCH 210/241] LayoutAnimations: remove "ConsecutiveMetadata"
 adjustment concept, adjust immediate and delayed mutation indices at the same
 time

Summary:
Index adjustment is tricky. Seems more reliable to adjust each immediate mutation, and then immediately adjust delayed mutations based on it, rinse and repeat.

Previously it was possible to construct examples where the UI would get into a weird state because index adjustment caused items to be inserted in the wrong location.

Changelog: [Internal]

Reviewed By: kacieb

Differential Revision: D24232926

fbshipit-source-id: f8c445213528c2d2aedacf3e0c73c5bbeb62bc3d
---
 .../LayoutAnimationKeyFrameManager.cpp        | 94 +++++--------------
 .../LayoutAnimationKeyFrameManager.h          |  7 --
 .../react/renderer/mounting/StubViewTree.cpp  |  4 +
 3 files changed, 28 insertions(+), 77 deletions(-)

diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
index 4264be5d3c613b..f86e1c2027a948 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp
@@ -397,12 +397,10 @@ void LayoutAnimationKeyFrameManager::
     adjustImmediateMutationIndicesForDelayedMutations(
         SurfaceId surfaceId,
         ShadowViewMutation &mutation,
-        ConsecutiveAdjustmentMetadata &consecutiveAdjustmentMetadata,
         bool skipLastAnimation,
         bool lastAnimationOnly) const {
   bool isRemoveMutation = mutation.type == ShadowViewMutation::Type::Remove;
-  bool isInsertMutation = mutation.type == ShadowViewMutation::Type::Insert;
-  assert(isRemoveMutation || isInsertMutation);
+  assert(isRemoveMutation || mutation.type == ShadowViewMutation::Type::Insert);
 
   // TODO: turn all of this into a lambda and share code?
   if (mutatedViewIsVirtual(mutation)) {
@@ -416,26 +414,6 @@ void LayoutAnimationKeyFrameManager::
       "[IndexAdjustment] Calling adjustImmediateMutationIndicesForDelayedMutations for:",
       mutation);
 
-  // When adjusting INSERTs, we want to batch adjacent inserts so they're all
-  // adjacent to each other in the resulting view. For instance, if we're
-  // processing INSERTS into positions 2,3,4,5,6, etc, it is possible that
-  // delayed mutations would otherwise cause the inserts to be adjusted to
-  // positions 2, 4, 6, 8... etc, creating a striping effect. We want to prevent
-  // that.
-  if (isInsertMutation &&
-      mutation.parentShadowView.tag ==
-          consecutiveAdjustmentMetadata.lastAdjustedParent &&
-      mutation.index == (consecutiveAdjustmentMetadata.lastIndexOriginal + 1)) {
-    PrintMutationInstruction(
-        std::string(
-            "[IndexAdjustment] adjustImmediateMutationIndicesForDelayedMutations: Adjusting consecutive INSERT mutation by ") +
-            std::to_string(consecutiveAdjustmentMetadata.lastAdjustedDelta),
-        mutation);
-    consecutiveAdjustmentMetadata.lastIndexOriginal = mutation.index;
-    mutation.index += consecutiveAdjustmentMetadata.lastAdjustedDelta;
-    return;
-  }
-
   // First, collect all final mutations that could impact this immediate
   // mutation.
   std::vector<ShadowViewMutation *> candidateMutations{};
@@ -502,11 +480,6 @@ void LayoutAnimationKeyFrameManager::
   // bottom of adjustDelayedMutationIndicesForMutation for further explanation.
   bool changed = true;
   int adjustedDelta = 0;
-  if (isInsertMutation) {
-    consecutiveAdjustmentMetadata.lastAdjustedParent =
-        mutation.parentShadowView.tag;
-    consecutiveAdjustmentMetadata.lastIndexOriginal = mutation.index;
-  }
   while (changed) {
     changed = false;
     candidateMutations.erase(
@@ -514,7 +487,10 @@ void LayoutAnimationKeyFrameManager::
             candidateMutations.begin(),
             candidateMutations.end(),
             [&](ShadowViewMutation *candidateMutation) {
-              bool indexConflicts = candidateMutation->index <= mutation.index;
+              bool indexConflicts =
+                  (candidateMutation->index < mutation.index ||
+                   (isRemoveMutation &&
+                    candidateMutation->index == mutation.index));
               if (indexConflicts) {
                 mutation.index++;
                 adjustedDelta++;
@@ -529,11 +505,6 @@ void LayoutAnimationKeyFrameManager::
             }),
         candidateMutations.end());
   }
-  if (isInsertMutation) {
-    consecutiveAdjustmentMetadata.lastAdjustedDelta = adjustedDelta;
-  } else {
-    consecutiveAdjustmentMetadata.lastAdjustedParent = -1;
-  }
 }
 
 void LayoutAnimationKeyFrameManager::adjustDelayedMutationIndicesForMutation(
@@ -1248,7 +1219,6 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // adjusted based on [Delayed], no dependency on [FinalConflicting],
       // [FrameDelayed] [Delayed] -> assumes [FinalConflicting],
       // [ImmediateMutations] not executed yet
-      ConsecutiveAdjustmentMetadata consecutiveAdjustmentMetadata{};
 
       // Adjust [Delayed] based on [FinalConflicting]
       // Knowledge Graph:
@@ -1288,7 +1258,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
             // all `mutation`s here come from the last animation, so we can't
             // adjust a batch against itself.
             adjustImmediateMutationIndicesForDelayedMutations(
-                surfaceId, mutation, consecutiveAdjustmentMetadata, true);
+                surfaceId, mutation, true);
           }
         }
       }
@@ -1301,26 +1271,8 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
       // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
       // [FinalConflicting]; assumes [ImmediateExecutions] not executed yet
-#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-      LOG(ERROR) << "Adjust [ImmediateExecutions] based on [Delayed]";
-#endif
-      consecutiveAdjustmentMetadata = ConsecutiveAdjustmentMetadata{};
-      for (auto &mutation : immediateMutations) {
-        // Note: when adjusting [ImmediateExecutions] based on [FrameDelayed],
-        // we need only adjust Inserts. Since inserts are executed
-        // highest-index-first, lower indices being delayed does not impact the
-        // higher-index removals; and conversely, higher indices being delayed
-        // cannot impact lower index removal, regardless of order.
-        if (mutation.type == ShadowViewMutation::Type::Insert ||
-            mutation.type == ShadowViewMutation::Type::Remove) {
-          adjustImmediateMutationIndicesForDelayedMutations(
-              surfaceId,
-              mutation,
-              consecutiveAdjustmentMetadata,
-              mutation.type == ShadowViewMutation::Type::Remove);
-        }
-      }
-
+      //
+      // THEN,
       // Adjust [Delayed] based on [ImmediateExecutions] and [FinalConflicting]
       // Knowledge Graph:
       // [ImmediateExecutions] -> adjusted for [FrameDelayed], [Delayed];
@@ -1329,13 +1281,26 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // [FinalConflicting] -> is adjusted based on [Delayed], no dependency on
       // [FinalConflicting], [FrameDelayed] [Delayed] -> adjusted for
       // [FinalConflicting], [ImmediateExecutions]
+      //
+      // We do these in the same loop because each immediate execution is
+      // impacted by each delayed mutation, and also can impact each delayed
+      // mutation, and these effects compound.
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
       LOG(ERROR)
-          << "Adjust [Delayed] based on [ImmediateExecutions] and [FinalConflicting]";
+          << "Adjust each [ImmediateExecution] based on [Delayed] and [Delayed] based on each [ImmediateExecution]";
 #endif
       for (auto &mutation : immediateMutations) {
+        // Note: when adjusting [ImmediateExecutions] based on [FrameDelayed],
+        // we need only adjust Inserts. Since inserts are executed
+        // highest-index-first, lower indices being delayed does not impact the
+        // higher-index removals; and conversely, higher indices being delayed
+        // cannot impact lower index removal, regardless of order.
         if (mutation.type == ShadowViewMutation::Type::Insert ||
             mutation.type == ShadowViewMutation::Type::Remove) {
+          adjustImmediateMutationIndicesForDelayedMutations(
+              surfaceId,
+              mutation,
+              mutation.type == ShadowViewMutation::Type::Remove);
           // Here we need to adjust both Delayed and FrameDelayed mutations.
           // Delayed Removes can be impacted by non-delayed Inserts from the
           // same frame.
@@ -1401,24 +1366,13 @@ LayoutAnimationKeyFrameManager::pullTransaction(
       // or later.
 #ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
       LOG(ERROR)
-          << "No Animation: Adjust mutations based on remaining delayed mutations";
+          << "No Animation: Adjust mutations based on remaining delayed mutations / adjust delayed, based on each";
 #endif
-      ConsecutiveAdjustmentMetadata consecutiveAdjustmentMetadata{};
       for (auto &mutation : mutations) {
         if (mutation.type == ShadowViewMutation::Type::Remove ||
             mutation.type == ShadowViewMutation::Type::Insert) {
           adjustImmediateMutationIndicesForDelayedMutations(
-              surfaceId, mutation, consecutiveAdjustmentMetadata);
-        }
-      }
-
-#ifdef LAYOUT_ANIMATION_VERBOSE_LOGGING
-      LOG(ERROR)
-          << "No Animation: Adjust delayed mutations based on all immediate mutations";
-#endif
-      for (auto &mutation : mutations) {
-        if (mutation.type == ShadowViewMutation::Type::Remove ||
-            mutation.type == ShadowViewMutation::Type::Insert) {
+              surfaceId, mutation);
           adjustDelayedMutationIndicesForMutation(surfaceId, mutation);
         }
       }
diff --git a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
index 891d25d46d11ea..0afc6dd7892dcc 100644
--- a/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
+++ b/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.h
@@ -110,12 +110,6 @@ struct AnimationKeyFrame {
   bool invalidated{false};
 };
 
-struct ConsecutiveAdjustmentMetadata {
-  Tag lastAdjustedParent{-1};
-  int lastAdjustedDelta{0};
-  int lastIndexOriginal{0};
-};
-
 class LayoutAnimationCallbackWrapper {
  public:
   LayoutAnimationCallbackWrapper(jsi::Function &&callback)
@@ -218,7 +212,6 @@ class LayoutAnimationKeyFrameManager : public UIManagerAnimationDelegate,
   void adjustImmediateMutationIndicesForDelayedMutations(
       SurfaceId surfaceId,
       ShadowViewMutation &mutation,
-      ConsecutiveAdjustmentMetadata &consecutiveAdjustmentMetadata,
       bool skipLastAnimation = false,
       bool lastAnimationOnly = false) const;
 
diff --git a/ReactCommon/react/renderer/mounting/StubViewTree.cpp b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
index 698af4374f2522..0c9dedee025294 100644
--- a/ReactCommon/react/renderer/mounting/StubViewTree.cpp
+++ b/ReactCommon/react/renderer/mounting/StubViewTree.cpp
@@ -116,9 +116,13 @@ void StubViewTree::mutate(
             parentStubView->children[mutation.index]->tag == childStubView->tag;
         STUB_VIEW_LOG({
           std::string strChildList = "";
+          int i = 0;
           for (auto const &child : parentStubView->children) {
+            strChildList.append(std::to_string(i));
+            strChildList.append(":");
             strChildList.append(std::to_string(child->tag));
             strChildList.append(", ");
+            i++;
           }
           LOG(ERROR) << "StubView: BEFORE REMOVE: Children of " << parentTag
                      << ": " << strChildList;

From f9dec992843c1b695d13067c98a3de06371d2832 Mon Sep 17 00:00:00 2001
From: Luna Wei <luwe@fb.com>
Date: Sat, 10 Oct 2020 02:03:42 -0700
Subject: [PATCH 211/241] Introduce multi-flush logger

Summary:
Changelog:
[Internal][Changed] - export types of performance logger

Reviewed By: rubennorte

Differential Revision: D24099293

fbshipit-source-id: 023459baa3754fb8bfaf6bf7a9061873af5756f9
---
 Libraries/Utilities/createPerformanceLogger.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Libraries/Utilities/createPerformanceLogger.js b/Libraries/Utilities/createPerformanceLogger.js
index 50c097158a7a5a..ee8e2ef2e5f5dd 100644
--- a/Libraries/Utilities/createPerformanceLogger.js
+++ b/Libraries/Utilities/createPerformanceLogger.js
@@ -16,7 +16,7 @@ const infoLog = require('./infoLog');
 const performanceNow: () => number =
   global.nativeQPLTimestamp ?? global.performance.now.bind(global.performance);
 
-type Timespan = {
+export type Timespan = {
   startTime: number,
   endTime?: number,
   totalTime?: number,
@@ -25,9 +25,9 @@ type Timespan = {
 };
 
 // Extra values should be serializable primitives
-type ExtraValue = number | string | boolean;
+export type ExtraValue = number | string | boolean;
 
-type Extras = {[key: string]: ExtraValue};
+export type Extras = {[key: string]: ExtraValue};
 
 export interface IPerformanceLogger {
   addTimespan(

From 9a7f2b590e3ac530755a71bc317e067d8b5af2bd Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Sat, 10 Oct 2020 02:48:39 -0700
Subject: [PATCH 212/241] Log QPL Events from TM + NM, when Perf. Logging is
 enabled

Summary:
## Previously
- When TurboModules system was on, we'd only log events from the TurboModules system.
- When TurboModules system was off, we'd only log events from the NativeModule system.

This ultimately gives us less data to analyze both systems in production.

## Changes in This Diff
When perf. logging is on, we'll log events from both systems. Each QPL event now include an annotation of which system the event is coming from. Concretely, this will allow us to see how much of the NativeModule system is being exercised in the TurboModule test group.

Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24232594

fbshipit-source-id: 7dff57bd74fc7ef744d3e06ff174304f25790456
---
 .../nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp   | 4 ++++
 .../nativemodule/core/ReactCommon/TurboModulePerfLogger.h     | 1 +
 .../reactperflogger/BridgeNativeModulePerfLogger.cpp          | 4 ++++
 .../reactperflogger/BridgeNativeModulePerfLogger.h            | 1 +
 4 files changed, 10 insertions(+)

diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp
index f69701a26c0d85..a55e632ffca787 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.cpp
@@ -17,6 +17,10 @@ void enableLogging(std::unique_ptr<NativeModulePerfLogger> &&newPerfLogger) {
   g_perfLogger = std::move(newPerfLogger);
 }
 
+void disableLogging() {
+  g_perfLogger = nullptr;
+}
+
 void moduleDataCreateStart(const char *moduleName, int32_t id) {
   NativeModulePerfLogger *logger = g_perfLogger.get();
   if (logger != nullptr) {
diff --git a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h
index 56abad502f5c92..2f7fcf8c8b2dd3 100644
--- a/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h
+++ b/ReactCommon/react/nativemodule/core/ReactCommon/TurboModulePerfLogger.h
@@ -14,6 +14,7 @@ namespace facebook {
 namespace react {
 namespace TurboModulePerfLogger {
 void enableLogging(std::unique_ptr<NativeModulePerfLogger> &&logger);
+void disableLogging();
 
 void moduleDataCreateStart(const char *moduleName, int32_t id);
 void moduleDataCreateEnd(const char *moduleName, int32_t id);
diff --git a/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp b/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp
index 9192889c1d482d..f23256bf5cef24 100644
--- a/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp
+++ b/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.cpp
@@ -17,6 +17,10 @@ void enableLogging(std::unique_ptr<NativeModulePerfLogger> &&newPerfLogger) {
   g_perfLogger = std::move(newPerfLogger);
 }
 
+void disableLogging() {
+  g_perfLogger = nullptr;
+}
+
 void moduleDataCreateStart(const char *moduleName, int32_t id) {
   NativeModulePerfLogger *logger = g_perfLogger.get();
   if (logger != nullptr) {
diff --git a/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h b/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h
index c2fa24550119fe..9ac83b9615e837 100644
--- a/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h
+++ b/ReactCommon/reactperflogger/reactperflogger/BridgeNativeModulePerfLogger.h
@@ -14,6 +14,7 @@ namespace react {
 
 namespace BridgeNativeModulePerfLogger {
 void enableLogging(std::unique_ptr<NativeModulePerfLogger> &&logger);
+void disableLogging();
 
 void moduleDataCreateStart(const char *moduleName, int32_t id);
 void moduleDataCreateEnd(const char *moduleName, int32_t id);

From d8b0e9d9ab401fb3a0b2486ef64c97420cd45051 Mon Sep 17 00:00:00 2001
From: Riley Dulin <dulinr@fb.com>
Date: Sat, 10 Oct 2020 13:22:56 -0700
Subject: [PATCH 213/241] Add HeapProfiler.lastSeenObjectId and
 HeapProfiler.heapStatsUpdate to inspector

Summary:
When taking a heap timeline, Hermes wasn't showing any data until the timeline
was written to disk and then reloaded.

Turns out we were missing support for two events:
* `HeapProfiler.lastSeenObjectId`: This event reports the most recently
allocated object ID. Used to know when objects were allocated in the
timeline.
* `HeapProfiler.heapStatsUpdate`: Report how many objects and bytes
exist for a "time fragment", represented by a fragment index. Later updates
to the same index can decrease the amount of live memory, which show up
as grey spikes instead of blue spikes

Previously, we only supported these by writing out to a file, and they didn't work
with a "live" profiling view. To fix this, I changed the periodic sampling thread
to instead be a periodic flush of a sample every few allocations. The performance
impact is tucked away only when profiling is turned on, and it's very non-invasive to
the rest of the GC. The flush calls a callback with the relevant information if the
inspector is on, and the inspector sends a message back to the browser.

Changelog: [Internal] Fix for Hermes heap timeline profiling

Reviewed By: neildhar

Differential Revision: D23993363

fbshipit-source-id: 8e0b571130cbb7e839dfb009b04f584f5179085d
---
 .../hermes/inspector/chrome/Connection.cpp    | 52 ++++++++++++++++---
 .../hermes/inspector/chrome/MessageTypes.cpp  | 48 ++++++++++++++++-
 .../hermes/inspector/chrome/MessageTypes.h    | 21 +++++++-
 .../hermes/inspector/tools/message_types.txt  |  2 +
 ReactCommon/jsi/jsi/decorator.h               |  9 +++-
 ReactCommon/jsi/jsi/instrumentation.h         | 17 +++++-
 ReactCommon/jsi/jsi/jsi.cpp                   |  6 ++-
 7 files changed, 143 insertions(+), 12 deletions(-)

diff --git a/ReactCommon/hermes/inspector/chrome/Connection.cpp b/ReactCommon/hermes/inspector/chrome/Connection.cpp
index 980f355c9f4c7a..9f73750075e756 100644
--- a/ReactCommon/hermes/inspector/chrome/Connection.cpp
+++ b/ReactCommon/hermes/inspector/chrome/Connection.cpp
@@ -469,6 +469,13 @@ void Connection::Impl::sendSnapshot(
           message,
           [this, reportProgress, stopStackTraceCapture](
               const debugger::ProgramState &) {
+            // Stop taking any new traces before sending out the heap snapshot.
+            if (stopStackTraceCapture) {
+              getRuntime()
+                  .instrumentation()
+                  .stopTrackingHeapObjectStackTraces();
+            }
+
             if (reportProgress) {
               // A progress notification with finished = true indicates the
               // snapshot has been captured and is ready to be sent.  Our
@@ -492,11 +499,6 @@ void Connection::Impl::sendSnapshot(
                 });
 
             getRuntime().instrumentation().createSnapshotToStream(cos);
-            if (stopStackTraceCapture) {
-              getRuntime()
-                  .instrumentation()
-                  .stopTrackingHeapObjectStackTraces();
-            }
           })
       .via(executor_.get())
       .thenValue([this, reqId](auto &&) {
@@ -522,7 +524,45 @@ void Connection::Impl::handle(
       ->executeIfEnabled(
           "HeapProfiler.startTrackingHeapObjects",
           [this](const debugger::ProgramState &) {
-            getRuntime().instrumentation().startTrackingHeapObjectStackTraces();
+            getRuntime().instrumentation().startTrackingHeapObjectStackTraces(
+                [this](
+                    uint64_t lastSeenObjectId,
+                    std::chrono::microseconds timestamp,
+                    std::vector<jsi::Instrumentation::HeapStatsUpdate> stats) {
+                  // Send the last object ID notification first.
+                  m::heapProfiler::LastSeenObjectIdNotification note;
+                  note.lastSeenObjectId = lastSeenObjectId;
+                  // The protocol uses milliseconds with a fraction for
+                  // microseconds.
+                  note.timestamp =
+                      static_cast<double>(timestamp.count()) / 1000;
+                  sendNotificationToClient(note);
+
+                  m::heapProfiler::HeapStatsUpdateNotification heapStatsNote;
+                  // Flatten the HeapStatsUpdate list.
+                  heapStatsNote.statsUpdate.reserve(stats.size() * 3);
+                  for (const jsi::Instrumentation::HeapStatsUpdate &fragment :
+                       stats) {
+                    // Each triplet is the fragment number, the total count of
+                    // objects for the fragment, and the total size of objects
+                    // for the fragment.
+                    heapStatsNote.statsUpdate.push_back(
+                        static_cast<int>(std::get<0>(fragment)));
+                    heapStatsNote.statsUpdate.push_back(
+                        static_cast<int>(std::get<1>(fragment)));
+                    heapStatsNote.statsUpdate.push_back(
+                        static_cast<int>(std::get<2>(fragment)));
+                  }
+                  assert(
+                      heapStatsNote.statsUpdate.size() == stats.size() * 3 &&
+                      "Should be exactly 3x the stats vector");
+                  // TODO: Chunk this if there are too many fragments to update.
+                  // Unlikely to be a problem in practice unless there's a huge
+                  // amount of allocation and freeing.
+                  sendNotificationToClient(heapStatsNote);
+                });
+            // At this point we need the equivalent of a setInterval, where each
+            // interval samples the existing
           })
       .via(executor_.get())
       .thenValue(
diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
index fa97e98ed87f76..dc14073deb794c 100644
--- a/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
+++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.cpp
@@ -1,5 +1,5 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
-// @generated SignedSource<<addf39d6b92b8dc857e6e5ffe2a441d4>>
+// @generated SignedSource<<80b4da5580a1fe18b9551723bdf7cab0>>
 
 #include "MessageTypes.h"
 
@@ -1126,6 +1126,52 @@ dynamic heapProfiler::AddHeapSnapshotChunkNotification::toDynamic() const {
   return obj;
 }
 
+heapProfiler::HeapStatsUpdateNotification::HeapStatsUpdateNotification()
+    : Notification("HeapProfiler.heapStatsUpdate") {}
+
+heapProfiler::HeapStatsUpdateNotification::HeapStatsUpdateNotification(
+    const dynamic &obj)
+    : Notification("HeapProfiler.heapStatsUpdate") {
+  assign(method, obj, "method");
+
+  dynamic params = obj.at("params");
+  assign(statsUpdate, params, "statsUpdate");
+}
+
+dynamic heapProfiler::HeapStatsUpdateNotification::toDynamic() const {
+  dynamic params = dynamic::object;
+  put(params, "statsUpdate", statsUpdate);
+
+  dynamic obj = dynamic::object;
+  put(obj, "method", method);
+  put(obj, "params", std::move(params));
+  return obj;
+}
+
+heapProfiler::LastSeenObjectIdNotification::LastSeenObjectIdNotification()
+    : Notification("HeapProfiler.lastSeenObjectId") {}
+
+heapProfiler::LastSeenObjectIdNotification::LastSeenObjectIdNotification(
+    const dynamic &obj)
+    : Notification("HeapProfiler.lastSeenObjectId") {
+  assign(method, obj, "method");
+
+  dynamic params = obj.at("params");
+  assign(lastSeenObjectId, params, "lastSeenObjectId");
+  assign(timestamp, params, "timestamp");
+}
+
+dynamic heapProfiler::LastSeenObjectIdNotification::toDynamic() const {
+  dynamic params = dynamic::object;
+  put(params, "lastSeenObjectId", lastSeenObjectId);
+  put(params, "timestamp", timestamp);
+
+  dynamic obj = dynamic::object;
+  put(obj, "method", method);
+  put(obj, "params", std::move(params));
+  return obj;
+}
+
 heapProfiler::ReportHeapSnapshotProgressNotification::
     ReportHeapSnapshotProgressNotification()
     : Notification("HeapProfiler.reportHeapSnapshotProgress") {}
diff --git a/ReactCommon/hermes/inspector/chrome/MessageTypes.h b/ReactCommon/hermes/inspector/chrome/MessageTypes.h
index fdb6270f11a7c4..e22f6cacc852ee 100644
--- a/ReactCommon/hermes/inspector/chrome/MessageTypes.h
+++ b/ReactCommon/hermes/inspector/chrome/MessageTypes.h
@@ -1,5 +1,5 @@
 // Copyright 2004-present Facebook. All Rights Reserved.
-// @generated SignedSource<<0563169b47d73a70d7540528f28d1d13>>
+// @generated SignedSource<<7383ffe2d956ba3aef8262dbee2f3427>>
 
 #pragma once
 
@@ -71,6 +71,8 @@ using UnserializableValue = std::string;
 
 namespace heapProfiler {
 struct AddHeapSnapshotChunkNotification;
+struct HeapStatsUpdateNotification;
+struct LastSeenObjectIdNotification;
 struct ReportHeapSnapshotProgressNotification;
 struct StartTrackingHeapObjectsRequest;
 struct StopTrackingHeapObjectsRequest;
@@ -607,6 +609,23 @@ struct heapProfiler::AddHeapSnapshotChunkNotification : public Notification {
   std::string chunk;
 };
 
+struct heapProfiler::HeapStatsUpdateNotification : public Notification {
+  HeapStatsUpdateNotification();
+  explicit HeapStatsUpdateNotification(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  std::vector<int> statsUpdate;
+};
+
+struct heapProfiler::LastSeenObjectIdNotification : public Notification {
+  LastSeenObjectIdNotification();
+  explicit LastSeenObjectIdNotification(const folly::dynamic &obj);
+  folly::dynamic toDynamic() const override;
+
+  int lastSeenObjectId{};
+  double timestamp{};
+};
+
 struct heapProfiler::ReportHeapSnapshotProgressNotification
     : public Notification {
   ReportHeapSnapshotProgressNotification();
diff --git a/ReactCommon/hermes/inspector/tools/message_types.txt b/ReactCommon/hermes/inspector/tools/message_types.txt
index 7807ac5b01799a..05ea241de97bf0 100644
--- a/ReactCommon/hermes/inspector/tools/message_types.txt
+++ b/ReactCommon/hermes/inspector/tools/message_types.txt
@@ -21,6 +21,8 @@ HeapProfiler.reportHeapSnapshotProgress
 HeapProfiler.takeHeapSnapshot
 HeapProfiler.startTrackingHeapObjects
 HeapProfiler.stopTrackingHeapObjects
+HeapProfiler.heapStatsUpdate
+HeapProfiler.lastSeenObjectId
 Runtime.consoleAPICalled
 Runtime.evaluate
 Runtime.executionContextCreated
diff --git a/ReactCommon/jsi/jsi/decorator.h b/ReactCommon/jsi/jsi/decorator.h
index bef9796dc5b8af..9110145e17788f 100644
--- a/ReactCommon/jsi/jsi/decorator.h
+++ b/ReactCommon/jsi/jsi/decorator.h
@@ -335,8 +335,13 @@ class RuntimeDecorator : public Base, private jsi::Instrumentation {
     plain().instrumentation().collectGarbage(std::move(cause));
   }
 
-  void startTrackingHeapObjectStackTraces() override {
-    plain().instrumentation().startTrackingHeapObjectStackTraces();
+  void startTrackingHeapObjectStackTraces(
+      std::function<void(
+          uint64_t,
+          std::chrono::microseconds,
+          std::vector<HeapStatsUpdate>)> callback) override {
+    plain().instrumentation().startTrackingHeapObjectStackTraces(
+        std::move(callback));
   }
 
   void stopTrackingHeapObjectStackTraces() override {
diff --git a/ReactCommon/jsi/jsi/instrumentation.h b/ReactCommon/jsi/jsi/instrumentation.h
index b8aa4da02b2366..0a9f48abb52b13 100644
--- a/ReactCommon/jsi/jsi/instrumentation.h
+++ b/ReactCommon/jsi/jsi/instrumentation.h
@@ -7,8 +7,10 @@
 
 #pragma once
 
+#include <chrono>
 #include <iosfwd>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 
 #include <jsi/jsi.h>
@@ -54,9 +56,22 @@ class JSI_EXPORT Instrumentation {
   ///   logs.
   virtual void collectGarbage(std::string cause) = 0;
 
+  /// A HeapStatsUpdate is a tuple of the fragment index, the number of objects
+  /// in that fragment, and the number of bytes used by those objects.
+  /// A "fragment" is a view of all objects allocated within a time slice.
+  using HeapStatsUpdate = std::tuple<uint64_t, uint64_t, uint64_t>;
+
   /// Start capturing JS stack-traces for all JS heap allocated objects. These
   /// can be accessed via \c ::createSnapshotToFile().
-  virtual void startTrackingHeapObjectStackTraces() = 0;
+  /// \param fragmentCallback If present, invoke this callback every so often
+  ///   with the most recently seen object ID, and a list of fragments that have
+  ///   been updated. This callback will be invoked on the same thread that the
+  ///   runtime is using.
+  virtual void startTrackingHeapObjectStackTraces(
+      std::function<void(
+          uint64_t lastSeenObjectID,
+          std::chrono::microseconds timestamp,
+          std::vector<HeapStatsUpdate> stats)> fragmentCallback) = 0;
 
   /// Stop capture JS stack-traces for JS heap allocated objects.
   virtual void stopTrackingHeapObjectStackTraces() = 0;
diff --git a/ReactCommon/jsi/jsi/jsi.cpp b/ReactCommon/jsi/jsi/jsi.cpp
index eac4c4b6356a8a..1054057e1fdab5 100644
--- a/ReactCommon/jsi/jsi/jsi.cpp
+++ b/ReactCommon/jsi/jsi/jsi.cpp
@@ -99,7 +99,11 @@ Instrumentation& Runtime::instrumentation() {
 
     void collectGarbage(std::string) override {}
 
-    void startTrackingHeapObjectStackTraces() override {}
+    void startTrackingHeapObjectStackTraces(
+        std::function<void(
+            uint64_t,
+            std::chrono::microseconds,
+            std::vector<HeapStatsUpdate>)>) override {}
     void stopTrackingHeapObjectStackTraces() override {}
 
     void createSnapshotToFile(const std::string&) override {

From 6685aba462699c696cb6ac95626b9592deb292fc Mon Sep 17 00:00:00 2001
From: Janic Duplessis <janicduplessis@gmail.com>
Date: Mon, 12 Oct 2020 01:25:52 -0700
Subject: [PATCH 214/241] Update template to xcode 12 (#30150)

Summary:
This makes a few change to the template xcodeproj

- Update to recommended settings for Xcode 12
- Remove the main.jsbundle file that doesn't exists, this file is included automatically in the app bundle and doesn't need to be in xcode (it won't even be at that path).
- Add -e to the bundle images script. It seems like Xcode doesn't fail the build on script errors anymore so this makes it so the build stop. If it doesn't stop the app will launch and crash because the bundle doesn't exist (note this is only if running the app in release mode since in debug we don't generate the bundle).

## Changelog

[iOS] [Added] - Update template to xcode 12

Pull Request resolved: https://github.com/facebook/react-native/pull/30150

Test Plan: Made the same changes in an app and made sure it ran well.

Reviewed By: cpojer

Differential Revision: D24237481

Pulled By: sammy-SC

fbshipit-source-id: 2b06a24c510c423eb45a1a840ea365b64506321b
---
 .../rn-tester/RNTesterPods.xcodeproj/project.pbxproj     | 4 ++--
 template/ios/HelloWorld.xcodeproj/project.pbxproj        | 9 ++++-----
 .../xcshareddata/xcschemes/HelloWorld.xcscheme           | 2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
index e877dd0c278422..62c78de7045a8e 100644
--- a/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
+++ b/packages/rn-tester/RNTesterPods.xcodeproj/project.pbxproj
@@ -164,7 +164,7 @@
 		E7DB215F22B2F3EC005AC45F /* RCTUIManagerScenarioTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTUIManagerScenarioTests.m; sourceTree = "<group>"; };
 		E7DB216022B2F3EC005AC45F /* RNTesterSnapshotTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNTesterSnapshotTests.m; sourceTree = "<group>"; };
 		E7DB216122B2F3EC005AC45F /* RCTRootViewIntegrationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTRootViewIntegrationTests.m; sourceTree = "<group>"; };
-		E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = XCTest.framework; sourceTree = DEVELOPER_DIR; };
+		E7DB218B22B41FCD005AC45F /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = XCTest.framework; sourceTree = DEVELOPER_DIR; };
 		E9618482EC8608D4872A6E28 /* Pods-RNTesterUnitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RNTesterUnitTests.release.xcconfig"; path = "Pods/Target Support Files/Pods-RNTesterUnitTests/Pods-RNTesterUnitTests.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -586,7 +586,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/..\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" $SRCROOT/../../packages/rn-tester/js/RNTesterApp.ios.js\n";
+			shellScript = "set -e\n\nexport NODE_BINARY=node\nexport PROJECT_ROOT=$SRCROOT/..\nexport SOURCEMAP_FILE=../sourcemap.ios.map\n# export FORCE_BUNDLING=true\n\"$SRCROOT/../../scripts/react-native-xcode.sh\" $SRCROOT/../../packages/rn-tester/js/RNTesterApp.ios.js\n";
 		};
 		C1C7A9D58CE1D09515F20577 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
diff --git a/template/ios/HelloWorld.xcodeproj/project.pbxproj b/template/ios/HelloWorld.xcodeproj/project.pbxproj
index 217779569f5da2..28166f3694353f 100644
--- a/template/ios/HelloWorld.xcodeproj/project.pbxproj
+++ b/template/ios/HelloWorld.xcodeproj/project.pbxproj
@@ -25,7 +25,6 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
 		00E356EE1AD99517003FC87E /* HelloWorldTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = HelloWorldTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* HelloWorldTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = HelloWorldTests.m; sourceTree = "<group>"; };
@@ -77,7 +76,6 @@
 		13B07FAE1A68108700A75B9A /* HelloWorld */ = {
 			isa = PBXGroup;
 			children = (
-				008F07F21AC5B25A0029DE68 /* main.jsbundle */,
 				13B07FAF1A68108700A75B9A /* AppDelegate.h */,
 				13B07FB01A68108700A75B9A /* AppDelegate.m */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
@@ -92,7 +90,6 @@
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
-				ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -173,7 +170,7 @@
 		83CBB9F71A601CBA00E9B192 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1130;
+				LastUpgradeCheck = 1200;
 				TargetAttributes = {
 					00E356ED1AD99517003FC87E = {
 						CreatedOnToolsVersion = 6.2;
@@ -235,7 +232,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "export NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+			shellScript = "set -e\n\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh\n";
 		};
 		FD10A7F022414F080027D42C /* Start Packager */ = {
 			isa = PBXShellScriptBuildPhase;
@@ -393,6 +390,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -453,6 +451,7 @@
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme b/template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme
index 39743fdfd75bea..eb6ca51ab0fb0f 100644
--- a/template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme
+++ b/template/ios/HelloWorld.xcodeproj/xcshareddata/xcschemes/HelloWorld.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1130"
+   LastUpgradeVersion = "1200"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

From 748aa137472d6080427f74bb686c795b925c7d43 Mon Sep 17 00:00:00 2001
From: Mark Sinkovics <sinkovics.mark@gmail.com>
Date: Mon, 12 Oct 2020 01:45:43 -0700
Subject: [PATCH 215/241] fix: crash when insert nil value into a dictionary
 (#30066)

Summary:
This PR attempts to fix issue https://github.com/facebook/react-native/issues/28278 and https://github.com/facebook/react-native/issues/29525

On Crashlytics, the following error occurs in file `RCTWebSocketModule.m` at method `-[RCTWebSocketModule webSocket:didFailWithError:]` when a nil value is inserted into a dictionary as a value.

```
Fatal Exception: NSInvalidArgumentException
*** -[__NSPlaceholderDictionary initWithObjects:forKeys:count:]: attempt to insert nil object from objects[0]
```

This PR is following the suggestion of this: https://github.com/facebook/react-native/issues/28278#issuecomment-597461650 and it replaces the values of any property if it is nil. In detail:
- it converts `error` to empty NSString if the original value is nil
- it converts `socketID` to a NSNumber object, which stores `-1` if the original value is nil

## Changelog

[iOS] [Fixed] - A crash in WebSocket module

Pull Request resolved: https://github.com/facebook/react-native/pull/30066

Test Plan: We were not able to reproduce the crash, but the report itself provided enough information to find a solution for this issue.

Reviewed By: shergin

Differential Revision: D24241147

Pulled By: sammy-SC

fbshipit-source-id: d5d632b49ca77b5d8be8b9c32358bef68f17d30a
---
 React/CoreModules/RCTWebSocketModule.mm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/React/CoreModules/RCTWebSocketModule.mm b/React/CoreModules/RCTWebSocketModule.mm
index 3bc43d797f65d6..32889ea7d4bddb 100644
--- a/React/CoreModules/RCTWebSocketModule.mm
+++ b/React/CoreModules/RCTWebSocketModule.mm
@@ -168,7 +168,9 @@ - (void)webSocket:(RCTSRWebSocket *)webSocket didFailWithError:(NSError *)error
   NSNumber *socketID = [webSocket reactTag];
   _contentHandlers[socketID] = nil;
   _sockets[socketID] = nil;
-  [self sendEventWithName:@"websocketFailed" body:@{@"message" : error.localizedDescription, @"id" : socketID}];
+  NSDictionary *body =
+      @{@"message" : error.localizedDescription ?: @"Undefined, error is nil", @"id" : socketID ?: @(-1)};
+  [self sendEventWithName:@"websocketFailed" body:body];
 }
 
 - (void)webSocket:(RCTSRWebSocket *)webSocket

From eb7701c1ec445bf81ea0e8434ddc57707f7da69d Mon Sep 17 00:00:00 2001
From: Samuel Susla <samuelsusla@fb.com>
Date: Mon, 12 Oct 2020 01:57:12 -0700
Subject: [PATCH 216/241] Search for Fabric managed view when creating Touch

Summary:
Changelog: [Internal]

If `uiTouch.view` isn't managed by Fabric, go up the view hierarchy to find first view that is.

This is important for host views wrapped by <Touchable>, otherwise touches are not delivered to the component.

Reviewed By: yungsters

Differential Revision: D24219223

fbshipit-source-id: 17b4e3460735371553ee0d30b41776a977f8eafb
---
 React/Fabric/RCTSurfaceTouchHandler.mm | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/React/Fabric/RCTSurfaceTouchHandler.mm b/React/Fabric/RCTSurfaceTouchHandler.mm
index 387908ccf6d729..04e09ddfd5718c 100644
--- a/React/Fabric/RCTSurfaceTouchHandler.mm
+++ b/React/Fabric/RCTSurfaceTouchHandler.mm
@@ -102,18 +102,21 @@ static void UpdateActiveTouchWithUITouch(
 
 static ActiveTouch CreateTouchWithUITouch(UITouch *uiTouch, UIView *rootComponentView, CGPoint rootViewOriginOffset)
 {
-  UIView *componentView = uiTouch.view;
-
   ActiveTouch activeTouch = {};
 
-  if ([componentView respondsToSelector:@selector(touchEventEmitterAtPoint:)]) {
-    activeTouch.eventEmitter = [(id<RCTTouchableComponentViewProtocol>)componentView
-        touchEventEmitterAtPoint:[uiTouch locationInView:componentView]];
-    activeTouch.touch.target = (Tag)componentView.tag;
+  // Find closest Fabric-managed touchable view
+  UIView *componentView = uiTouch.view;
+  while (componentView) {
+    if ([componentView respondsToSelector:@selector(touchEventEmitterAtPoint:)]) {
+      activeTouch.eventEmitter = [(id<RCTTouchableComponentViewProtocol>)componentView
+          touchEventEmitterAtPoint:[uiTouch locationInView:componentView]];
+      activeTouch.touch.target = (Tag)componentView.tag;
+      activeTouch.componentView = componentView;
+      break;
+    }
+    componentView = componentView.superview;
   }
 
-  activeTouch.componentView = componentView;
-
   UpdateActiveTouchWithUITouch(activeTouch, uiTouch, rootComponentView, rootViewOriginOffset);
   return activeTouch;
 }

From b7167c23fc052f8d9f8c27a7f4ad9c5cdf51281e Mon Sep 17 00:00:00 2001
From: simek <gosimek@gmail.com>
Date: Mon, 12 Oct 2020 02:12:44 -0700
Subject: [PATCH 217/241] PlatformColors: add missing clearColor for iOS
 (#30054)

Summary:
This small PR adds missing [`clearColor`](https://developer.apple.com/documentation/uikit/uicolor/1621945-clearcolor?language=objc) to the avaiable PlatformColors on iOS.

**Please let me know** if you would like to see ["Fixed colors"](https://developer.apple.com/documentation/uikit/uicolor/standard_colors?language=objc) added to the `PlatformColors`. I can address this within this PR or create a separate one.

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[iOS] [Added] - PlatformColors: add missing `clearColor`

Pull Request resolved: https://github.com/facebook/react-native/pull/30054

Test Plan:
[(I had to disable the Dark Mode to fix the RNTester readability problems)](https://user-images.githubusercontent.com/719641/94453196-b35cb000-01b0-11eb-8d7d-73d48ceecf53.PNG)

Transparent/clear color has been added to the RNTester PlatformColors API example:
![IMG_6782](https://user-images.githubusercontent.com/719641/94453172-ae97fc00-01b0-11eb-9bef-1a1a387ac009.PNG)

Reviewed By: shergin

Differential Revision: D24241160

Pulled By: sammy-SC

fbshipit-source-id: 41fb51677329cc3b3f915d5d08694c07b4ef2cf3
---
 React/Base/RCTConvert.m                                      | 5 +++++
 .../rn-tester/RNTesterUnitTests/RCTConvert_UIColorTests.m    | 2 ++
 .../js/examples/PlatformColor/PlatformColorExample.js        | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/React/Base/RCTConvert.m b/React/Base/RCTConvert.m
index 7ef3b233893ae9..af47b0d353ed1a 100644
--- a/React/Base/RCTConvert.m
+++ b/React/Base/RCTConvert.m
@@ -722,6 +722,11 @@ +(type)type : (id)json                                      \
         // iOS 13.0
         RCTFallbackARGB : @(0xFFf2f2f7)
       },
+      // Transparent Color
+      @"clearColor" : @{
+        // iOS 13.0
+        RCTFallbackARGB : @(0x00000000)
+      },
     } mutableCopy];
     // The color names are the Objective-C UIColor selector names,
     // but Swift selector names are valid as well, so make aliases.
diff --git a/packages/rn-tester/RNTesterUnitTests/RCTConvert_UIColorTests.m b/packages/rn-tester/RNTesterUnitTests/RCTConvert_UIColorTests.m
index fbb6824885a147..f58047b0af2ba4 100644
--- a/packages/rn-tester/RNTesterUnitTests/RCTConvert_UIColorTests.m
+++ b/packages/rn-tester/RNTesterUnitTests/RCTConvert_UIColorTests.m
@@ -154,6 +154,8 @@ - (void)testGenerateFallbacks
     @"systemGray4Color": @(0xFFd1d1d6),
     @"systemGray5Color": @(0xFFe5e5ea),
     @"systemGray6Color": @(0xFFf2f2f7),
+    // Clear Color
+    @"clearColor": @(0x00000000),
   };
 
 #if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 130000
diff --git a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
index cda369e62e1e76..345b609ac31b30 100644
--- a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
+++ b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
@@ -110,6 +110,8 @@ function PlatformColorsExample() {
         {label: 'systemGray4', color: PlatformColor('systemGray4')},
         {label: 'systemGray5', color: PlatformColor('systemGray5')},
         {label: 'systemGray6', color: PlatformColor('systemGray6')},
+        // Transparent Color
+        {label: 'clear', color: PlatformColor('clear')},
       ];
     } else if (Platform.OS === 'android') {
       colors = [

From 760c10a5aa25065096650d49601aefa5d8e28306 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Mon, 12 Oct 2020 12:47:18 -0700
Subject: [PATCH 218/241] Fix new RCTDeviceInfo assert to work in bridgeless
 mode

Summary:
shergin added a new assert to dimensions calculations in D24038911 (https://github.com/facebook/react-native/commit/e85372298109abf258d5154e2a28bc6496fb9529). This crashes in bridgeless mode b/c no bridge.

 This diff uses `turboModuleRegistry` as a bridge workaround.  The registry is a [weak property](https://www.fburl.com/diffusion/sunv3bx9) so retain cycles shouldn't be an issue here, let me know if that's incorrect.

As a nice bonus, this fixes dynamic font sizing in bridgeless mode. It was broken before since it relied on the bridge.

Changelog: [Internal]

Reviewed By: ejanzer

Differential Revision: D24256338

fbshipit-source-id: 141d36239ac6a6e9e87ca96eea7aeec56729095d
---
 React/CoreModules/RCTDeviceInfo.mm | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm
index 1f0bd576a4b4ec..829821acc573ad 100644
--- a/React/CoreModules/RCTDeviceInfo.mm
+++ b/React/CoreModules/RCTDeviceInfo.mm
@@ -28,6 +28,7 @@ @implementation RCTDeviceInfo {
 }
 
 @synthesize bridge = _bridge;
+@synthesize turboModuleRegistry = _turboModuleRegistry;
 
 RCT_EXPORT_MODULE()
 
@@ -57,7 +58,7 @@ - (void)setBridge:(RCTBridge *)bridge
                                                name:UIApplicationDidChangeStatusBarOrientationNotification
                                              object:nil];
 
-  _currentInterfaceDimensions = RCTExportedDimensions(_bridge);
+  _currentInterfaceDimensions = RCTExportedDimensions(_bridge, _turboModuleRegistry);
 
   [[NSNotificationCenter defaultCenter] addObserver:self
                                            selector:@selector(interfaceFrameDidChange)
@@ -90,11 +91,18 @@ static BOOL RCTIsIPhoneX()
   return isIPhoneX;
 }
 
-static NSDictionary *RCTExportedDimensions(RCTBridge *bridge)
+static NSDictionary *RCTExportedDimensions(RCTBridge *bridge, id<RCTTurboModuleRegistry> turboModuleRegistry)
 {
   RCTAssertMainQueue();
-  RCTAssert(bridge, @"Bridge must not be `nil`.");
-  RCTDimensions dimensions = RCTGetDimensions(bridge.accessibilityManager.multiplier ?: 1.0);
+  RCTDimensions dimensions;
+  if (bridge) {
+    dimensions = RCTGetDimensions(bridge.accessibilityManager.multiplier ?: 1.0);
+  } else if (turboModuleRegistry) {
+    dimensions = RCTGetDimensions(
+        ((RCTAccessibilityManager *)[turboModuleRegistry moduleForName:"RCTAccessibilityManager"]).multiplier ?: 1.0);
+  } else {
+    RCTAssert(false, @"Bridge or TurboModuleRegistry must be set to properly init dimensions.");
+  }
   __typeof(dimensions.window) window = dimensions.window;
   NSDictionary<NSString *, NSNumber *> *dimsWindow = @{
     @"width" : @(window.width),
@@ -122,7 +130,7 @@ static BOOL RCTIsIPhoneX()
   __block NSDictionary<NSString *, id> *constants;
   RCTUnsafeExecuteOnMainQueueSync(^{
     constants = @{
-      @"Dimensions" : RCTExportedDimensions(self->_bridge),
+      @"Dimensions" : RCTExportedDimensions(self->_bridge, self->_turboModuleRegistry),
       // Note:
       // This prop is deprecated and will be removed in a future release.
       // Please use this only for a quick and temporary solution.
@@ -141,7 +149,8 @@ - (void)didReceiveNewContentSizeMultiplier
   // Report the event across the bridge.
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions" body:RCTExportedDimensions(bridge)];
+    [bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
+                                               body:RCTExportedDimensions(bridge, self->_turboModuleRegistry)];
 #pragma clang diagnostic pop
   });
 }
@@ -165,7 +174,8 @@ - (void)_interfaceOrientationDidChange
        !UIInterfaceOrientationIsLandscape(nextOrientation))) {
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
-    [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions" body:RCTExportedDimensions(_bridge)];
+    [_bridge.eventDispatcher sendDeviceEventWithName:@"didUpdateDimensions"
+                                                body:RCTExportedDimensions(_bridge, _turboModuleRegistry)];
 #pragma clang diagnostic pop
   }
 
@@ -182,7 +192,7 @@ - (void)interfaceFrameDidChange
 
 - (void)_interfaceFrameDidChange
 {
-  NSDictionary *nextInterfaceDimensions = RCTExportedDimensions(_bridge);
+  NSDictionary *nextInterfaceDimensions = RCTExportedDimensions(_bridge, _turboModuleRegistry);
 
   if (!([nextInterfaceDimensions isEqual:_currentInterfaceDimensions])) {
 #pragma clang diagnostic push

From 4d247fe058e3cefd557a166717a753683754f1c4 Mon Sep 17 00:00:00 2001
From: Nick Gerleman <ngerlem@microsoft.com>
Date: Mon, 12 Oct 2020 19:53:39 -0700
Subject: [PATCH 219/241] Avoid Repo Structure Assumptions in RNTester Imports
 (#30141)

Summary:
RNTester has some imports left over that operate on directory traversal, assuming it is contained within react-native sources. This change makes these imports relative to react-native, enabling usage outside of the RN repo.

Relates to https://github.com/microsoft/react-native-windows/issues/6210

## Changelog

[Internal] [Fixed] - Avoid File Structure Assumptions in RNTester Imports

Pull Request resolved: https://github.com/facebook/react-native/pull/30141

Test Plan: Validated we can bundle and flow-check both iOS + Android

Reviewed By: cpojer

Differential Revision: D24259628

Pulled By: appden

fbshipit-source-id: 0c21b5d354b01785d8402599da3b0a5be81b4c6d
---
 .../NativeModuleExample/NativeScreenshotManager.js          | 4 ++--
 packages/rn-tester/RCTTest/RCTSnapshotNativeComponent.js    | 6 +++---
 packages/rn-tester/js/components/RNTesterButton.js          | 2 +-
 .../rn-tester/js/examples/Appearance/AppearanceExample.js   | 2 +-
 packages/rn-tester/js/examples/FlatList/FlatListExample.js  | 2 +-
 .../rn-tester/js/examples/Image/ImageCapInsetsExample.js    | 2 +-
 .../rn-tester/js/examples/Layout/LayoutEventsExample.js     | 2 +-
 .../rn-tester/js/examples/MultiColumn/MultiColumnExample.js | 2 +-
 .../js/examples/NativeAnimation/NativeAnimationsExample.js  | 4 ++--
 .../js/examples/NewAppScreen/NewAppScreenExample.js         | 2 +-
 .../examples/OrientationChange/OrientationChangeExample.js  | 2 +-
 .../js/examples/PanResponder/PanResponderExample.js         | 4 ++--
 .../js/examples/PlatformColor/PlatformColorExample.js       | 2 +-
 .../rn-tester/js/examples/ScrollView/ScrollViewExample.js   | 2 +-
 .../rn-tester/js/examples/SectionList/SectionListExample.js | 2 +-
 .../js/examples/Snapshot/SnapshotViewIOS.android.js         | 2 +-
 .../rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js   | 4 ++--
 packages/rn-tester/js/examples/Text/TextExample.ios.js      | 2 +-
 .../js/examples/TurboModule/SampleTurboModuleExample.js     | 4 ++--
 19 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js b/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js
index 023a8e329560bf..862ffa5213f9c0 100644
--- a/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js
+++ b/packages/rn-tester/NativeModuleExample/NativeScreenshotManager.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-import type {TurboModule} from '../../../Libraries/TurboModule/RCTExport';
-import * as TurboModuleRegistry from '../../../Libraries/TurboModule/TurboModuleRegistry';
+import type {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
 
 export interface Spec extends TurboModule {
   +getConstants: () => {||};
diff --git a/packages/rn-tester/RCTTest/RCTSnapshotNativeComponent.js b/packages/rn-tester/RCTTest/RCTSnapshotNativeComponent.js
index 9d8b9b949e2815..f9a30031b154dc 100644
--- a/packages/rn-tester/RCTTest/RCTSnapshotNativeComponent.js
+++ b/packages/rn-tester/RCTTest/RCTSnapshotNativeComponent.js
@@ -12,9 +12,9 @@
 
 const {requireNativeComponent} = require('react-native');
 
-import type {HostComponent} from '../../../Libraries/Renderer/shims/ReactNativeTypes';
-import type {SyntheticEvent} from '../../../Libraries/Types/CoreEventTypes';
-import type {ViewProps} from '../../../Libraries/Components/View/ViewPropTypes';
+import type {HostComponent} from 'react-native/Libraries/Renderer/shims/ReactNativeTypes';
+import type {SyntheticEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
 
 type SnapshotReadyEvent = SyntheticEvent<
   $ReadOnly<{testIdentifier: string, ...}>,
diff --git a/packages/rn-tester/js/components/RNTesterButton.js b/packages/rn-tester/js/components/RNTesterButton.js
index 25ffd42ceecb7f..d006e17f2b1c6a 100644
--- a/packages/rn-tester/js/components/RNTesterButton.js
+++ b/packages/rn-tester/js/components/RNTesterButton.js
@@ -14,7 +14,7 @@ const React = require('react');
 
 const {StyleSheet, Text, TouchableHighlight} = require('react-native');
 
-import type {PressEvent} from '../../../../Libraries/Types/CoreEventTypes';
+import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 
 type Props = $ReadOnly<{|
   children?: React.Node,
diff --git a/packages/rn-tester/js/examples/Appearance/AppearanceExample.js b/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
index f4e23a6871e3c2..38a7e68fd8f491 100644
--- a/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
+++ b/packages/rn-tester/js/examples/Appearance/AppearanceExample.js
@@ -12,7 +12,7 @@
 
 import * as React from 'react';
 import {Appearance, Text, useColorScheme, View} from 'react-native';
-import type {AppearancePreferences} from '../../../../../Libraries/Utilities/NativeAppearance';
+import type {AppearancePreferences} from 'react-native/Libraries/Utilities/NativeAppearance';
 import {RNTesterThemeContext, themes} from '../../components/RNTesterTheme';
 
 class ColorSchemeSubscription extends React.Component<
diff --git a/packages/rn-tester/js/examples/FlatList/FlatListExample.js b/packages/rn-tester/js/examples/FlatList/FlatListExample.js
index b62e95fb3020eb..4dec5886a01a7a 100644
--- a/packages/rn-tester/js/examples/FlatList/FlatListExample.js
+++ b/packages/rn-tester/js/examples/FlatList/FlatListExample.js
@@ -13,7 +13,7 @@
 const RNTesterPage = require('../../components/RNTesterPage');
 const React = require('react');
 
-const infoLog = require('../../../../../Libraries/Utilities/infoLog');
+const infoLog = require('react-native/Libraries/Utilities/infoLog');
 
 const {
   FooterComponent,
diff --git a/packages/rn-tester/js/examples/Image/ImageCapInsetsExample.js b/packages/rn-tester/js/examples/Image/ImageCapInsetsExample.js
index c0df4a58bf98be..f474ca6c9ba589 100644
--- a/packages/rn-tester/js/examples/Image/ImageCapInsetsExample.js
+++ b/packages/rn-tester/js/examples/Image/ImageCapInsetsExample.js
@@ -13,7 +13,7 @@
 const React = require('react');
 const ReactNative = require('react-native');
 
-const nativeImageSource = require('../../../../../Libraries/Image/nativeImageSource');
+const nativeImageSource = require('react-native/Libraries/Image/nativeImageSource');
 const {Image, StyleSheet, Text, View} = ReactNative;
 
 type Props = $ReadOnly<{||}>;
diff --git a/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js b/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
index 48c4cb5d718b13..55e9e275e48910 100644
--- a/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
+++ b/packages/rn-tester/js/examples/Layout/LayoutEventsExample.js
@@ -23,7 +23,7 @@ const {
 import type {
   ViewLayout,
   ViewLayoutEvent,
-} from '../../../../../Libraries/Components/View/ViewPropTypes';
+} from 'react-native/Libraries/Components/View/ViewPropTypes';
 
 type Props = $ReadOnly<{||}>;
 type State = {
diff --git a/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js b/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js
index ca822b22c07d01..7d6b554cd5951f 100644
--- a/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js
+++ b/packages/rn-tester/js/examples/MultiColumn/MultiColumnExample.js
@@ -12,7 +12,7 @@
 const RNTesterPage = require('../../components/RNTesterPage');
 const React = require('react');
 
-const infoLog = require('../../../../../Libraries/Utilities/infoLog');
+const infoLog = require('react-native/Libraries/Utilities/infoLog');
 
 const {
   FooterComponent,
diff --git a/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js b/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
index 7afe58e886bf4c..81851e1e2f7ff2 100644
--- a/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
+++ b/packages/rn-tester/js/examples/NativeAnimation/NativeAnimationsExample.js
@@ -195,13 +195,13 @@ class InternalSettings extends React.Component<
           initialValue={false}
           label="Track JS Stalls"
           onEnable={() => {
-            require('../../../../../Libraries/Interaction/JSEventLoopWatchdog').install(
+            require('react-native/Libraries/Interaction/JSEventLoopWatchdog').install(
               {
                 thresholdMS: 25,
               },
             );
             this.setState({busyTime: '<none>'});
-            require('../../../../../Libraries/Interaction/JSEventLoopWatchdog').addHandler(
+            require('react-native/Libraries/Interaction/JSEventLoopWatchdog').addHandler(
               {
                 onStall: ({busyTime}) =>
                   this.setState(state => ({
diff --git a/packages/rn-tester/js/examples/NewAppScreen/NewAppScreenExample.js b/packages/rn-tester/js/examples/NewAppScreen/NewAppScreenExample.js
index 277cdc9a5d8945..5dad9e2fc52eaa 100644
--- a/packages/rn-tester/js/examples/NewAppScreen/NewAppScreenExample.js
+++ b/packages/rn-tester/js/examples/NewAppScreen/NewAppScreenExample.js
@@ -18,7 +18,7 @@ const {
   Colors,
   DebugInstructions,
   ReloadInstructions,
-} = require('../../../../../Libraries/NewAppScreen');
+} = require('react-native/Libraries/NewAppScreen');
 
 exports.title = 'New App Screen';
 exports.description = 'Displays the content of the new app screen';
diff --git a/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js b/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
index 1cf3d45e20f3d6..c8b2df92d3ed80 100644
--- a/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
+++ b/packages/rn-tester/js/examples/OrientationChange/OrientationChangeExample.js
@@ -14,7 +14,7 @@ const React = require('react');
 
 const {DeviceEventEmitter, Text, View} = require('react-native');
 
-import {type EventSubscription} from '../../../../../Libraries/vendor/emitter/EventEmitter';
+import {type EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 
 class OrientationChangeExample extends React.Component<{...}, $FlowFixMeState> {
   _orientationSubscription: EventSubscription;
diff --git a/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js b/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js
index 33dcf037b430bc..fcb807edb9d391 100644
--- a/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js
+++ b/packages/rn-tester/js/examples/PanResponder/PanResponderExample.js
@@ -17,8 +17,8 @@ const RNTesterPage = require('../../components/RNTesterPage');
 import type {
   PanResponderInstance,
   GestureState,
-} from '../../../../../Libraries/Interaction/PanResponder';
-import type {PressEvent} from '../../../../../Libraries/Types/CoreEventTypes';
+} from 'react-native/Libraries/Interaction/PanResponder';
+import type {PressEvent} from 'react-native/Libraries/Types/CoreEventTypes';
 
 type CircleStyles = {
   backgroundColor?: string,
diff --git a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
index 345b609ac31b30..e542f70ff3b0db 100644
--- a/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
+++ b/packages/rn-tester/js/examples/PlatformColor/PlatformColorExample.js
@@ -12,7 +12,7 @@
 
 const React = require('react');
 const ReactNative = require('react-native');
-import Platform from '../../../../../Libraries/Utilities/Platform';
+import Platform from 'react-native/Libraries/Utilities/Platform';
 const {DynamicColorIOS, PlatformColor, StyleSheet, Text, View} = ReactNative;
 
 function PlatformColorsExample() {
diff --git a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
index 76e9147080e810..7aa352b4228aca 100644
--- a/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
+++ b/packages/rn-tester/js/examples/ScrollView/ScrollViewExample.js
@@ -23,7 +23,7 @@ const {
 
 const nullthrows = require('nullthrows');
 
-import type {ViewStyleProp} from '../../../../../Libraries/StyleSheet/StyleSheet';
+import type {ViewStyleProp} from 'react-native/Libraries/StyleSheet/StyleSheet';
 
 exports.displayName = 'ScrollViewExample';
 exports.title = 'ScrollView';
diff --git a/packages/rn-tester/js/examples/SectionList/SectionListExample.js b/packages/rn-tester/js/examples/SectionList/SectionListExample.js
index f65cc8196f2d95..b00cc81c71e1fa 100644
--- a/packages/rn-tester/js/examples/SectionList/SectionListExample.js
+++ b/packages/rn-tester/js/examples/SectionList/SectionListExample.js
@@ -12,7 +12,7 @@
 const RNTesterPage = require('../../components/RNTesterPage');
 const React = require('react');
 
-const infoLog = require('../../../../../Libraries/Utilities/infoLog');
+const infoLog = require('react-native/Libraries/Utilities/infoLog');
 
 const {
   HeaderComponent,
diff --git a/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.android.js b/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.android.js
index 824ac6a0ef4bd0..29970c1f7b456f 100644
--- a/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.android.js
+++ b/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.android.js
@@ -9,4 +9,4 @@
 
 'use strict';
 
-module.exports = require('../../../../../Libraries/Components/UnimplementedViews/UnimplementedView');
+module.exports = require('react-native/Libraries/Components/UnimplementedViews/UnimplementedView');
diff --git a/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js b/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js
index dd0596eadf9937..89296d7d3d767f 100644
--- a/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js
+++ b/packages/rn-tester/js/examples/Snapshot/SnapshotViewIOS.ios.js
@@ -16,8 +16,8 @@ const {NativeModules, StyleSheet, UIManager, View} = require('react-native');
 
 const {TestModule} = NativeModules;
 
-import type {SyntheticEvent} from '../../../../../Libraries/Types/CoreEventTypes';
-import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import type {SyntheticEvent} from 'react-native/Libraries/Types/CoreEventTypes';
+import type {ViewProps} from 'react-native/Libraries/Components/View/ViewPropTypes';
 
 // Verify that RCTSnapshot is part of the UIManager since it is only loaded
 // if you have linked against RCTTest like in tests, otherwise we will have
diff --git a/packages/rn-tester/js/examples/Text/TextExample.ios.js b/packages/rn-tester/js/examples/Text/TextExample.ios.js
index 9562f1c45b4940..1acdfd2e3aa47f 100644
--- a/packages/rn-tester/js/examples/Text/TextExample.ios.js
+++ b/packages/rn-tester/js/examples/Text/TextExample.ios.js
@@ -11,7 +11,7 @@
 'use strict';
 
 const React = require('react');
-const TextAncestor = require('../../../../../Libraries/Text/TextAncestor');
+const TextAncestor = require('react-native/Libraries/Text/TextAncestor');
 const TextInlineView = require('../../components/TextInlineView');
 const TextLegend = require('../../components/TextLegend');
 
diff --git a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
index c55e2d2ae602bf..bc227cdc94c357 100644
--- a/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
+++ b/packages/rn-tester/js/examples/TurboModule/SampleTurboModuleExample.js
@@ -10,8 +10,8 @@
 
 'use strict';
 
-import NativeSampleTurboModule from '../../../../../Libraries/TurboModule/samples/NativeSampleTurboModule';
-import type {RootTag} from '../../../../../Libraries/ReactNative/RootTag';
+import NativeSampleTurboModule from 'react-native/Libraries/TurboModule/samples/NativeSampleTurboModule';
+import type {RootTag} from 'react-native/Libraries/ReactNative/RootTag';
 import {
   StyleSheet,
   Text,

From 71bb19827b0568ead70dc5c591d07ec976445449 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Mon, 12 Oct 2020 22:50:24 -0700
Subject: [PATCH 220/241] NativeAnimatedModule: fix crash that can occur when
 animated node setup races with NativeAnimatedModule setup

Summary:
When switching between non-Fabric and Fabric screens, I believe that `initializeEventListenerForUIManagerType` is not always being called on the NativeAnimatedNodesManager if
`NativeAnimatedModule.initializeLifecycleEventListenersForViewTag` is being called before the NativeAnimatedNodesManager ivar has been set. This should occur very infrequently, but logs
indicate that it /does/ happen in some marginal cases. Protecting against these cases should be trivial, by using the `getNodesManager` method which is responsible for returning a nodes manager or creating a new one.

The existing uses of the `NativeAnimatedNodesManager` ivar also occur on different threads and we were not protecting against this, so I'm changing it to an atomic. It's very likely that
the inconsistency issues in the past were caused not by ordering errors, but thread races.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24267118

fbshipit-source-id: 68abbff7ef3d0b2ecc9aa9977165663ad9447ab8
---
 .../react/animated/NativeAnimatedModule.java  | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
index 8a05e0627edbfb..2f2880080e6fc5 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/animated/NativeAnimatedModule.java
@@ -17,6 +17,7 @@
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactSoftException;
 import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.UIManager;
 import com.facebook.react.bridge.UIManagerListener;
@@ -34,6 +35,7 @@
 import com.facebook.react.uimanager.common.ViewUtil;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Module that exposes interface for creating and managing animated nodes on the "native" side.
@@ -111,7 +113,7 @@ public long getBatchNumber() {
   private final ConcurrentLinkedQueue<UIThreadOperation> mPreOperations =
       new ConcurrentLinkedQueue<>();
 
-  private @Nullable NativeAnimatedNodesManager mNodesManager;
+  private final AtomicReference<NativeAnimatedNodesManager> mNodesManager = new AtomicReference<>();
 
   private boolean mBatchingControlledByJS = false; // TODO T71377544: delete
   private volatile long mCurrentFrameNumber; // TODO T71377544: delete
@@ -223,6 +225,7 @@ public void didDispatchMountItems(UIManager uiManager) {
     executeAllOperations(mOperations, batchNumber);
   }
 
+  @UiThread
   private void executeAllOperations(Queue<UIThreadOperation> operationQueue, long maxBatchNumber) {
     NativeAnimatedNodesManager nodesManager = getNodesManager();
     while (true) {
@@ -315,15 +318,15 @@ public String getName() {
    */
   @Nullable
   private NativeAnimatedNodesManager getNodesManager() {
-    if (mNodesManager == null) {
+    if (mNodesManager.get() == null) {
       ReactApplicationContext reactApplicationContext = getReactApplicationContextIfActiveOrWarn();
 
       if (reactApplicationContext != null) {
-        mNodesManager = new NativeAnimatedNodesManager(reactApplicationContext);
+        mNodesManager.compareAndSet(null, new NativeAnimatedNodesManager(reactApplicationContext));
       }
     }
 
-    return mNodesManager;
+    return mNodesManager.get();
   }
 
   private void clearFrameCallback() {
@@ -340,7 +343,7 @@ private void enqueueFrameCallback() {
 
   @VisibleForTesting
   public void setNodesManager(NativeAnimatedNodesManager nodesManager) {
-    mNodesManager = nodesManager;
+    mNodesManager.set(nodesManager);
   }
 
   /**
@@ -358,8 +361,14 @@ private void initializeLifecycleEventListenersForViewTag(final int viewTag) {
       mNumNonFabricAnimations++;
     }
 
-    if (mNodesManager != null) {
-      mNodesManager.initializeEventListenerForUIManagerType(mUIManagerType);
+    NativeAnimatedNodesManager nodesManager = getNodesManager();
+    if (nodesManager != null) {
+      nodesManager.initializeEventListenerForUIManagerType(mUIManagerType);
+    } else {
+      ReactSoftException.logSoftException(
+          NAME,
+          new RuntimeException(
+              "initializeLifecycleEventListenersForViewTag could not get NativeAnimatedNodesManager"));
     }
 
     // Subscribe to UIManager (Fabric or non-Fabric) lifecycle events if we haven't yet

From 38cb06cbd39639f42d60449867f46ea5453c261e Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 221/241] Initial commit for Fabric Picker

Summary:
This is a starting point for the handwritten Fabric Picker component. It is incomplete, and needs to be landed with the rest of the stack above it.

In general, this creates a new `ComponentView`, `ComponentDescriptor`, `ShadowNode`, `Props` and a few other boilerplate classes for Picker. A bunch of the logic in `ComponentView` was copied over from the Paper `RCTPicker` and `RCTPickerManager`.

What works in this diff:
- A `<Picker>` with items can be created in JS, and a corresponding `UIPicker` is created in native with placeholder text, default styling and the correct amount of items

What doesn't work yet (implemented in later diffs):
- Parsing items to use correct text and styling in native
- Events/commands

Reviewed By: sammy-SC

Differential Revision: D23941821

fbshipit-source-id: e049ca6004757fbd1361985644d5dbb8f53e1ce6
---
 .../Picker/RCTPickerComponentView.h           |  19 ++
 .../Picker/RCTPickerComponentView.mm          | 176 ++++++++++++++++++
 .../RCTFabricComponentsPlugins.h              |   1 +
 .../RCTFabricComponentsPlugins.mm             |   1 +
 .../react/renderer/components/picker/BUCK     |   4 +-
 .../renderer/components/picker/iospicker/BUCK |  58 ++++++
 .../iospicker/PickerComponentDescriptor.h     |  26 +++
 .../picker/iospicker/PickerEventEmitter.h     |  21 +++
 .../picker/iospicker/PickerProps.cpp          |  40 ++++
 .../components/picker/iospicker/PickerProps.h |  34 ++++
 .../picker/iospicker/PickerShadowNode.cpp     |  16 ++
 .../picker/iospicker/PickerShadowNode.h       |  33 ++++
 .../components/picker/iospicker/PickerState.h |  19 ++
 .../components/picker/iospicker/conversions.h |  31 +++
 .../components/picker/iospicker/primitives.h  |  29 +++
 15 files changed, 506 insertions(+), 2 deletions(-)
 create mode 100644 React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h
 create mode 100644 React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/BUCK
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.cpp
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerState.h
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/conversions.h
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/primitives.h

diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h
new file mode 100644
index 00000000000000..62f6d1e61a68c5
--- /dev/null
+++ b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <React/RCTViewComponentView.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * UIView class for root <Picker> component.
+ */
+@interface RCTPickerComponentView : RCTViewComponentView
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
new file mode 100644
index 00000000000000..bc9e3b4c4d5ad4
--- /dev/null
+++ b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTPickerComponentView.h"
+
+#import <React/RCTConvert.h>
+#import <UIKit/UIKit.h>
+#import <react/renderer/components/iospicker/PickerComponentDescriptor.h>
+#import <react/renderer/components/iospicker/PickerProps.h>
+
+#import "FBRCTFabricComponentsPlugins.h"
+#import "RCTConversions.h"
+
+using namespace facebook::react;
+
+@interface RCTPickerComponentView () <UIPickerViewAccessibilityDelegate, UIPickerViewDelegate, UIPickerViewDataSource>
+
+@end
+
+@implementation RCTPickerComponentView {
+  UIPickerView *_pickerView;
+  UIColor *_textColor;
+  UIFont *_font;
+  NSTextAlignment _textAlignment;
+  std::vector<PickerItemsStruct> _items;
+  NSInteger _selectedIndex;
+  NSString *_accessibilityLabel;
+}
+
+- (instancetype)initWithFrame:(CGRect)frame
+{
+  if (self = [super initWithFrame:frame]) {
+    _pickerView = [[UIPickerView alloc] initWithFrame:self.bounds];
+    // TODO (T75217510) - Handle and test onChange, something like:
+    // [_pickerView addTarget:self action:@selector(onChange:) forControlEvents:UIControlEventValueChanged];
+    self.contentView = _pickerView;
+    [self setPropsToDefault];
+  }
+
+  return self;
+}
+
+- (void)setPropsToDefault
+{
+  static const auto defaultProps = std::make_shared<const PickerProps>();
+  _props = defaultProps;
+
+  _pickerView.delegate = self;
+  _pickerView.dataSource = self;
+  _textColor = [UIColor blackColor];
+  _font = [UIFont systemFontOfSize:21];
+  _textAlignment = NSTextAlignmentCenter;
+  _selectedIndex = NSNotFound;
+}
+
+- (void)prepareForRecycle
+{
+  [super prepareForRecycle];
+  _selectedIndex = NSNotFound;
+}
+
+#pragma mark - RCTComponentViewProtocol
+
++ (ComponentDescriptorProvider)componentDescriptorProvider
+{
+  return concreteComponentDescriptorProvider<PickerComponentDescriptor>();
+}
+
+- (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &)oldProps
+{
+  const auto &oldPickerProps = *std::static_pointer_cast<const PickerProps>(_props);
+  const auto &newPickerProps = *std::static_pointer_cast<const PickerProps>(props);
+
+  if (oldPickerProps.items != newPickerProps.items) {
+    _items = newPickerProps.items;
+  }
+
+  if (oldPickerProps.selectedIndex != newPickerProps.selectedIndex) {
+    _selectedIndex = newPickerProps.selectedIndex;
+  }
+
+  // TODO (T75217510) - Figure out how to forward styling.
+  if (oldPickerProps.style != newPickerProps.style) {
+  }
+
+  // TODO (T75217510) - Figure out testID.
+  if (oldPickerProps.testID != newPickerProps.testID) {
+  }
+
+  if (oldPickerProps.accessibilityLabel != newPickerProps.accessibilityLabel) {
+    _accessibilityLabel = [NSString stringWithUTF8String:newPickerProps.accessibilityLabel.c_str()];
+  }
+
+  [super updateProps:props oldProps:oldProps];
+}
+
+- (void)onChange:(UISwitch *)sender
+{
+  // TODO (T75217510) - Handle and test onChange
+}
+
+// TODO (T75217510) - Handle Native Commands
+#pragma mark - Native Commands
+
+#pragma mark - UIPickerViewDataSource protocol
+
+- (NSInteger)numberOfComponentsInPickerView:(__unused UIPickerView *)pickerView
+{
+  return 1;
+}
+
+- (NSInteger)pickerView:(__unused UIPickerView *)pickerView numberOfRowsInComponent:(__unused NSInteger)component
+{
+  return _items.size();
+}
+
+#pragma mark - UIPickerViewDelegate methods
+
+- (NSString *)pickerView:(__unused UIPickerView *)pickerView
+             titleForRow:(NSInteger)row
+            forComponent:(__unused NSInteger)component
+{
+  return [NSString stringWithUTF8String:_items[row].label.c_str()];
+  ;
+}
+
+- (CGFloat)pickerView:(__unused UIPickerView *)pickerView rowHeightForComponent:(NSInteger)__unused component
+{
+  return _font.pointSize + 19;
+}
+
+- (UIView *)pickerView:(UIPickerView *)pickerView
+            viewForRow:(NSInteger)row
+          forComponent:(NSInteger)component
+           reusingView:(UILabel *)label
+{
+  if (!label) {
+    label = [[UILabel alloc] initWithFrame:(CGRect){CGPointZero,
+                                                    {
+                                                        [pickerView rowSizeForComponent:component].width,
+                                                        [pickerView rowSizeForComponent:component].height,
+                                                    }}];
+  }
+  label.font = _font;
+  // TODO (T75217510) - This should be something like RCTUIColorFromSharedColor(_items[row].textColor) ?: _textColor;
+  label.textColor = [UIColor blackColor];
+  label.textAlignment = _textAlignment;
+  label.text = [self pickerView:pickerView titleForRow:row forComponent:component];
+  return label;
+}
+
+- (void)pickerView:(__unused UIPickerView *)pickerView
+      didSelectRow:(NSInteger)row
+       inComponent:(__unused NSInteger)component
+{
+  _selectedIndex = row;
+  // TODO (T75217510) - Handle and test onChange
+}
+
+#pragma mark - UIPickerViewAccessibilityDelegate protocol
+
+- (NSString *)pickerView:(UIPickerView *)pickerView accessibilityLabelForComponent:(NSInteger)component
+{
+  return _accessibilityLabel;
+}
+
+@end
+
+Class<RCTComponentViewProtocol> RCTPickerCls(void)
+{
+  return RCTPickerComponentView.class;
+}
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
index 4f6ea0e815679c..47cd8759fab861 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.h
@@ -35,6 +35,7 @@ Class<RCTComponentViewProtocol> RCTPullToRefreshViewCls(void) __attribute__((use
 Class<RCTComponentViewProtocol> RCTActivityIndicatorViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSliderCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTSwitchCls(void) __attribute__((used));
+Class<RCTComponentViewProtocol> RCTPickerCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTUnimplementedNativeViewCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTParagraphCls(void) __attribute__((used));
 Class<RCTComponentViewProtocol> RCTTextInputCls(void) __attribute__((used));
diff --git a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
index a52c8c06e366da..e5ed57f33af978 100644
--- a/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
+++ b/React/Fabric/Mounting/ComponentViews/RCTFabricComponentsPlugins.mm
@@ -24,6 +24,7 @@
     {"ActivityIndicatorView", RCTActivityIndicatorViewCls},
     {"Slider", RCTSliderCls},
     {"Switch", RCTSwitchCls},
+    {"Picker", RCTPickerCls},
     {"UnimplementedNativeView", RCTUnimplementedNativeViewCls},
     {"Paragraph", RCTParagraphCls},
     {"TextInput", RCTTextInputCls},
diff --git a/ReactCommon/react/renderer/components/picker/BUCK b/ReactCommon/react/renderer/components/picker/BUCK
index 985b331f4ac36f..9c0661e9370b2d 100644
--- a/ReactCommon/react/renderer/components/picker/BUCK
+++ b/ReactCommon/react/renderer/components/picker/BUCK
@@ -19,11 +19,11 @@ APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
 rn_xplat_cxx_library(
     name = "androidpicker",
     srcs = glob(
-        ["**/*.cpp"],
+        ["androidpicker/**/*.cpp"],
         exclude = glob(["tests/**/*.cpp"]),
     ),
     headers = glob(
-        ["**/*.h"],
+        ["androidpicker/**/*.h"],
         exclude = glob(["tests/**/*.h"]),
     ),
     header_namespace = "",
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/BUCK b/ReactCommon/react/renderer/components/picker/iospicker/BUCK
new file mode 100644
index 00000000000000..8e48198de3ea73
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/BUCK
@@ -0,0 +1,58 @@
+load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "get_preprocessor_flags_for_build_mode")
+load(
+    "//tools/build_defs/oss:rn_defs.bzl",
+    "ANDROID",
+    "APPLE",
+    "CXX",
+    "YOGA_CXX_TARGET",
+    "get_apple_compiler_flags",
+    "get_apple_inspector_flags",
+    "react_native_xplat_target",
+    "rn_xplat_cxx_library",
+    "subdir_glob",
+)
+
+APPLE_COMPILER_FLAGS = get_apple_compiler_flags()
+
+rn_xplat_cxx_library(
+    name = "iospicker",
+    srcs = glob(
+        ["**/*.cpp"],
+    ),
+    headers = glob(
+        ["**/*.h"],
+    ),
+    header_namespace = "",
+    exported_headers = subdir_glob(
+        [
+            ("", "*.h"),
+        ],
+        prefix = "react/renderer/components/iospicker",
+    ),
+    compiler_flags = [
+        "-fexceptions",
+        "-frtti",
+        "-std=c++14",
+        "-Wall",
+    ],
+    fbobjc_compiler_flags = APPLE_COMPILER_FLAGS,
+    fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(),
+    force_static = True,
+    labels = ["supermodule:xplat/default/public.react_native.infra"],
+    platforms = (ANDROID, APPLE, CXX),
+    preprocessor_flags = [
+        "-DLOG_TAG=\"ReactNative\"",
+        "-DWITH_FBSYSTRACE=1",
+    ],
+    visibility = ["PUBLIC"],
+    deps = [
+        "//xplat/folly:headers_only",
+        YOGA_CXX_TARGET,
+        react_native_xplat_target("react/utils:utils"),
+        react_native_xplat_target("react/renderer/attributedstring:attributedstring"),
+        react_native_xplat_target("react/renderer/core:core"),
+        react_native_xplat_target("react/renderer/graphics:graphics"),
+        react_native_xplat_target("react/renderer/components/text:text"),
+        react_native_xplat_target("react/renderer/components/view:view"),
+    ],
+)
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h
new file mode 100644
index 00000000000000..d134689e784623
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerComponentDescriptor.h
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/iospicker/PickerShadowNode.h>
+#include <react/renderer/core/ConcreteComponentDescriptor.h>
+
+/*
+ * Descriptor for <Picker> component.
+ */
+namespace facebook {
+namespace react {
+
+class PickerComponentDescriptor final
+    : public ConcreteComponentDescriptor<PickerShadowNode> {
+ public:
+  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
new file mode 100644
index 00000000000000..df523632cedf15
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/view/ViewEventEmitter.h>
+
+namespace facebook {
+namespace react {
+
+class PickerEventEmitter : public ViewEventEmitter {
+ public:
+  using ViewEventEmitter::ViewEventEmitter;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
new file mode 100644
index 00000000000000..200c8253088cca
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "PickerProps.h"
+
+#include <react/renderer/attributedstring/conversions.h>
+#include <react/renderer/components/iospicker/conversions.h>
+#include <react/renderer/core/propsConversions.h>
+
+namespace facebook {
+namespace react {
+
+PickerProps::PickerProps(
+    PickerProps const &sourceProps,
+    RawProps const &rawProps)
+    : ViewProps(sourceProps, rawProps),
+      items(convertRawProp(rawProps, "items", sourceProps.items, {})),
+      selectedIndex(convertRawProp(
+          rawProps,
+          "selectedIndex",
+          sourceProps.selectedIndex,
+          {0})),
+      // TODO (T75217510) - This doesn't build, need to inherit from
+      // BaseTextProps? style(convertRawProp(rawProps, "style",
+      // sourceProps.style, {})),
+      testID(convertRawProp(rawProps, "testID", sourceProps.testID, {})),
+      accessibilityLabel(convertRawProp(
+          rawProps,
+          "accessibilityLabel",
+          sourceProps.accessibilityLabel,
+          {})){
+
+      };
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
new file mode 100644
index 00000000000000..428f9b531beeba
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/iospicker/primitives.h>
+#include <react/renderer/components/text/BaseTextProps.h>
+#include <react/renderer/components/view/ViewProps.h>
+
+#include <vector>
+
+namespace facebook {
+namespace react {
+
+class PickerProps final : public ViewProps {
+ public:
+  PickerProps() = default;
+  PickerProps(PickerProps const &sourceProps, RawProps const &rawProps);
+
+#pragma mark - Props
+
+  std::vector<PickerItemsStruct> items{};
+  int selectedIndex{0};
+  TextAttributes style{};
+  std::string const testID{};
+  std::string const accessibilityLabel{};
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.cpp b/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.cpp
new file mode 100644
index 00000000000000..2d39cdb106b856
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.cpp
@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "PickerShadowNode.h"
+
+namespace facebook {
+namespace react {
+
+extern const char PickerComponentName[] = "Picker";
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h
new file mode 100644
index 00000000000000..c2c80bc6ae2a03
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerShadowNode.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/iospicker/PickerEventEmitter.h>
+#include <react/renderer/components/iospicker/PickerProps.h>
+#include <react/renderer/components/iospicker/PickerState.h>
+#include <react/renderer/components/view/ConcreteViewShadowNode.h>
+
+namespace facebook {
+namespace react {
+
+extern const char PickerComponentName[];
+
+/*
+ * `ShadowNode` for <Picker> component.
+ */
+class PickerShadowNode final : public ConcreteViewShadowNode<
+                                   PickerComponentName,
+                                   PickerProps,
+                                   PickerEventEmitter,
+                                   PickerState> {
+ public:
+  using ConcreteViewShadowNode::ConcreteViewShadowNode;
+};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerState.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerState.h
new file mode 100644
index 00000000000000..fa50b38dfdbf6a
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerState.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+namespace facebook {
+namespace react {
+
+/*
+ * State for <Picker> component.
+ */
+class PickerState final {};
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/conversions.h b/ReactCommon/react/renderer/components/picker/iospicker/conversions.h
new file mode 100644
index 00000000000000..b52037bcb88af1
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/conversions.h
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/components/iospicker/primitives.h>
+
+#include <vector>
+
+namespace facebook {
+namespace react {
+
+inline void fromRawValue(
+    const RawValue &value,
+    std::vector<PickerItemsStruct> &items) {
+  auto array = (folly::dynamic)value;
+  for (auto itr = array.begin(); itr != array.end(); ++itr) {
+    // TODO (T75217510) - Use the itr to create the item instead of using these
+    // dummy values.
+    struct PickerItemsStruct item = {
+        .label = "LOL", .value = "LOL2", .textColor = 0};
+    items.push_back(item);
+  }
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/primitives.h b/ReactCommon/react/renderer/components/picker/iospicker/primitives.h
new file mode 100644
index 00000000000000..d9804aa98868e4
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/primitives.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#include <react/renderer/graphics/Color.h>
+
+#include <string>
+
+namespace facebook {
+namespace react {
+
+struct PickerItemsStruct {
+  std::string label;
+  std::string value;
+  SharedColor textColor;
+
+  bool operator==(const PickerItemsStruct &rhs) const {
+    return (
+        label == rhs.label && value == rhs.value && textColor == rhs.textColor);
+  }
+};
+
+} // namespace react
+} // namespace facebook

From c2e7ac1b35366987a0df8cacf16749ebc2ee8db8 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 222/241] Fabric picker item parsing

Summary:
This builds on previous diff to properly parse `<Picker.Item/>` into a cpp struct.

This fixes the dummy text and text color TODOs.

Changelog: [iOS][Fabric] Fabric Picker support

Reviewed By: sammy-SC

Differential Revision: D23964557

fbshipit-source-id: f42c6c9cf410bfc5e66ff078645b6378548481de
---
 .../Picker/RCTPickerComponentView.mm          |  3 +-
 .../components/picker/iospicker/conversions.h | 28 +++++++++++++++----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
index bc9e3b4c4d5ad4..3001c423ea24b8 100644
--- a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
@@ -146,8 +146,7 @@ - (UIView *)pickerView:(UIPickerView *)pickerView
                                                     }}];
   }
   label.font = _font;
-  // TODO (T75217510) - This should be something like RCTUIColorFromSharedColor(_items[row].textColor) ?: _textColor;
-  label.textColor = [UIColor blackColor];
+  label.textColor = RCTUIColorFromSharedColor(_items[row].textColor) ?: _textColor;
   label.textAlignment = _textAlignment;
   label.text = [self pickerView:pickerView titleForRow:row forComponent:component];
   return label;
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/conversions.h b/ReactCommon/react/renderer/components/picker/iospicker/conversions.h
index b52037bcb88af1..b39f10431b78bc 100644
--- a/ReactCommon/react/renderer/components/picker/iospicker/conversions.h
+++ b/ReactCommon/react/renderer/components/picker/iospicker/conversions.h
@@ -17,12 +17,28 @@ namespace react {
 inline void fromRawValue(
     const RawValue &value,
     std::vector<PickerItemsStruct> &items) {
-  auto array = (folly::dynamic)value;
-  for (auto itr = array.begin(); itr != array.end(); ++itr) {
-    // TODO (T75217510) - Use the itr to create the item instead of using these
-    // dummy values.
-    struct PickerItemsStruct item = {
-        .label = "LOL", .value = "LOL2", .textColor = 0};
+  assert(value.hasType<std::vector<RawValue>>());
+  auto array = (std::vector<RawValue>)value;
+  items.reserve(array.size());
+
+  for (auto const &val : array) {
+    bool check = val.hasType<better::map<std::string, RawValue>>();
+    assert(check);
+    auto map = (better::map<std::string, RawValue>)val;
+    PickerItemsStruct item;
+
+    if (map.find("label") != map.end()) {
+      assert(map.at("label").hasType<std::string>());
+      item.label = (std::string)map.at("label");
+    }
+    if (map.find("value") != map.end()) {
+      assert(map.at("value").hasType<std::string>());
+      item.value = (std::string)map.at("value");
+    }
+    if (map.find("textColor") != map.end()) {
+      assert(map.at("textColor").hasType<int>());
+      item.textColor = (int)map.at("textColor");
+    }
     items.push_back(item);
   }
 }

From 251d5e1bbe26c5d210dd48da44d4c69f8ff2ed4f Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 223/241] Fabric Picker onChange event

Summary:
Implements `onChange` prop for `<Picker/>`.

Changelog: [iOS][Fabric] Fabric Picker support

Reviewed By: sammy-SC

Differential Revision: D23975689

fbshipit-source-id: 7aa81c203d420a8971e4309911a41ecfd377a318
---
 .../Picker/RCTPickerComponentView.mm          | 14 ++++-------
 .../picker/iospicker/PickerEventEmitter.cpp   | 23 +++++++++++++++++++
 .../picker/iospicker/PickerEventEmitter.h     |  7 ++++++
 3 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp

diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
index 3001c423ea24b8..2cc534f9cbf7be 100644
--- a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
@@ -10,6 +10,7 @@
 #import <React/RCTConvert.h>
 #import <UIKit/UIKit.h>
 #import <react/renderer/components/iospicker/PickerComponentDescriptor.h>
+#import <react/renderer/components/iospicker/PickerEventEmitter.h>
 #import <react/renderer/components/iospicker/PickerProps.h>
 
 #import "FBRCTFabricComponentsPlugins.h"
@@ -35,8 +36,6 @@ - (instancetype)initWithFrame:(CGRect)frame
 {
   if (self = [super initWithFrame:frame]) {
     _pickerView = [[UIPickerView alloc] initWithFrame:self.bounds];
-    // TODO (T75217510) - Handle and test onChange, something like:
-    // [_pickerView addTarget:self action:@selector(onChange:) forControlEvents:UIControlEventValueChanged];
     self.contentView = _pickerView;
     [self setPropsToDefault];
   }
@@ -98,11 +97,6 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
   [super updateProps:props oldProps:oldProps];
 }
 
-- (void)onChange:(UISwitch *)sender
-{
-  // TODO (T75217510) - Handle and test onChange
-}
-
 // TODO (T75217510) - Handle Native Commands
 #pragma mark - Native Commands
 
@@ -125,7 +119,6 @@ - (NSString *)pickerView:(__unused UIPickerView *)pickerView
             forComponent:(__unused NSInteger)component
 {
   return [NSString stringWithUTF8String:_items[row].label.c_str()];
-  ;
 }
 
 - (CGFloat)pickerView:(__unused UIPickerView *)pickerView rowHeightForComponent:(NSInteger)__unused component
@@ -157,7 +150,10 @@ - (void)pickerView:(__unused UIPickerView *)pickerView
        inComponent:(__unused NSInteger)component
 {
   _selectedIndex = row;
-  // TODO (T75217510) - Handle and test onChange
+  PickerEventEmitter::PickerIOSChangeEvent event = {.newValue = _items[row].value, .newIndex = (int)row};
+  if (_eventEmitter) {
+    std::static_pointer_cast<PickerEventEmitter const>(_eventEmitter)->onChange(event);
+  }
 }
 
 #pragma mark - UIPickerViewAccessibilityDelegate protocol
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp
new file mode 100644
index 00000000000000..9e608966063531
--- /dev/null
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.cpp
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#include "PickerEventEmitter.h"
+
+namespace facebook {
+namespace react {
+
+void PickerEventEmitter::onChange(PickerIOSChangeEvent event) const {
+  dispatchEvent("change", [event = std::move(event)](jsi::Runtime &runtime) {
+    auto payload = jsi::Object(runtime);
+    payload.setProperty(runtime, "newValue", event.newValue);
+    payload.setProperty(runtime, "newIndex", event.newIndex);
+    return payload;
+  });
+}
+
+} // namespace react
+} // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
index df523632cedf15..fea36adf3f699f 100644
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerEventEmitter.h
@@ -15,6 +15,13 @@ namespace react {
 class PickerEventEmitter : public ViewEventEmitter {
  public:
   using ViewEventEmitter::ViewEventEmitter;
+
+  struct PickerIOSChangeEvent {
+    std::string newValue;
+    int newIndex;
+  };
+
+  void onChange(PickerIOSChangeEvent event) const;
 };
 
 } // namespace react

From 51e8e0b7e1dd617bfc760150cc40d845b1214033 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 224/241] Fabric Picker styling support

Summary:
This adds support for `<Picker style={}/>` prop for text styling. It reuses most of conversion logic from BaseText. This means that it actually supports more styles than Paper Picker supported. (Paper picker only supported ~4 styles, this supports everything that Text supports, so 10+ styles).

The only tricky thing is that Picker supports multiple ways of setting text color. Both

      <Picker
        itemStyle={{color: '#008BD0'}} >
        <Picker.Item label="Java" value="java" />
        <Picker.Item label="JavaScript" value="js" />
      </Picker>

and

      <Picker>
        <Picker.Item label="Java" value="java" color={'#008BD0'} />
        <Picker.Item label="JavaScript" value="js" />
      </Picker>

technically work in Paper. I've decided to maintain this behaviour (since there's lots of product code callsites to both options).

Changelog: [iOS][Fabric] Fabric Picker support

Reviewed By: sammy-SC

Differential Revision: D23980319

fbshipit-source-id: e469a837e28af0ad97cf0e171df26ee19adff3ab
---
 .../Picker/RCTPickerComponentView.mm          | 36 +++++++++++--------
 .../picker/iospicker/PickerProps.cpp          | 12 +++++--
 .../components/picker/iospicker/PickerProps.h |  6 ++--
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
index 2cc534f9cbf7be..50b27554c7d1d6 100644
--- a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
@@ -12,6 +12,7 @@
 #import <react/renderer/components/iospicker/PickerComponentDescriptor.h>
 #import <react/renderer/components/iospicker/PickerEventEmitter.h>
 #import <react/renderer/components/iospicker/PickerProps.h>
+#import <react/renderer/textlayoutmanager/RCTAttributedTextUtils.h>
 
 #import "FBRCTFabricComponentsPlugins.h"
 #import "RCTConversions.h"
@@ -24,12 +25,10 @@ @interface RCTPickerComponentView () <UIPickerViewAccessibilityDelegate, UIPicke
 
 @implementation RCTPickerComponentView {
   UIPickerView *_pickerView;
-  UIColor *_textColor;
-  UIFont *_font;
-  NSTextAlignment _textAlignment;
   std::vector<PickerItemsStruct> _items;
   NSInteger _selectedIndex;
   NSString *_accessibilityLabel;
+  NSDictionary<NSAttributedStringKey, id> *_textAttributes;
 }
 
 - (instancetype)initWithFrame:(CGRect)frame
@@ -47,13 +46,16 @@ - (void)setPropsToDefault
 {
   static const auto defaultProps = std::make_shared<const PickerProps>();
   _props = defaultProps;
-
   _pickerView.delegate = self;
   _pickerView.dataSource = self;
-  _textColor = [UIColor blackColor];
-  _font = [UIFont systemFontOfSize:21];
-  _textAlignment = NSTextAlignmentCenter;
   _selectedIndex = NSNotFound;
+  NSMutableParagraphStyle *const paragraphStyle = [NSMutableParagraphStyle new];
+  paragraphStyle.alignment = NSTextAlignmentCenter;
+  _textAttributes = @{
+    NSForegroundColorAttributeName : [UIColor blackColor],
+    NSFontAttributeName : [UIFont systemFontOfSize:21],
+    NSParagraphStyleAttributeName : paragraphStyle
+  };
 }
 
 - (void)prepareForRecycle
@@ -82,8 +84,8 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     _selectedIndex = newPickerProps.selectedIndex;
   }
 
-  // TODO (T75217510) - Figure out how to forward styling.
-  if (oldPickerProps.style != newPickerProps.style) {
+  if (oldPickerProps.textAttributes != newPickerProps.textAttributes) {
+    _textAttributes = RCTNSTextAttributesFromTextAttributes(newPickerProps.getEffectiveTextAttributes());
   }
 
   // TODO (T75217510) - Figure out testID.
@@ -123,7 +125,7 @@ - (NSString *)pickerView:(__unused UIPickerView *)pickerView
 
 - (CGFloat)pickerView:(__unused UIPickerView *)pickerView rowHeightForComponent:(NSInteger)__unused component
 {
-  return _font.pointSize + 19;
+  return ((UIFont *)_textAttributes[NSFontAttributeName]).pointSize + 19;
 }
 
 - (UIView *)pickerView:(UIPickerView *)pickerView
@@ -138,10 +140,16 @@ - (UIView *)pickerView:(UIPickerView *)pickerView
                                                         [pickerView rowSizeForComponent:component].height,
                                                     }}];
   }
-  label.font = _font;
-  label.textColor = RCTUIColorFromSharedColor(_items[row].textColor) ?: _textColor;
-  label.textAlignment = _textAlignment;
-  label.text = [self pickerView:pickerView titleForRow:row forComponent:component];
+  NSMutableDictionary<NSAttributedStringKey, id> *attributes = [_textAttributes mutableCopy];
+  // Color can be passed in from <Picker style={}/> or from <Picker.Item color={}/>
+  // If Picker.Item color is set, use that. Else fall back to Picker style (with black as default).
+  if (RCTUIColorFromSharedColor(_items[row].textColor)) {
+    attributes[NSForegroundColorAttributeName] = RCTUIColorFromSharedColor(_items[row].textColor);
+  }
+  label.attributedText = [[NSAttributedString alloc] initWithString:[self pickerView:pickerView
+                                                                         titleForRow:row
+                                                                        forComponent:component]
+                                                         attributes:attributes];
   return label;
 }
 
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
index 200c8253088cca..b3a06ad0029781 100644
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.cpp
@@ -18,15 +18,13 @@ PickerProps::PickerProps(
     PickerProps const &sourceProps,
     RawProps const &rawProps)
     : ViewProps(sourceProps, rawProps),
+      BaseTextProps(sourceProps, rawProps),
       items(convertRawProp(rawProps, "items", sourceProps.items, {})),
       selectedIndex(convertRawProp(
           rawProps,
           "selectedIndex",
           sourceProps.selectedIndex,
           {0})),
-      // TODO (T75217510) - This doesn't build, need to inherit from
-      // BaseTextProps? style(convertRawProp(rawProps, "style",
-      // sourceProps.style, {})),
       testID(convertRawProp(rawProps, "testID", sourceProps.testID, {})),
       accessibilityLabel(convertRawProp(
           rawProps,
@@ -36,5 +34,13 @@ PickerProps::PickerProps(
 
       };
 
+TextAttributes PickerProps::getEffectiveTextAttributes() const {
+  auto result = TextAttributes::defaultTextAttributes();
+  // Default is left aligned, but Picker wants default to be center aligned.
+  result.alignment = TextAlignment::Center;
+  result.apply(textAttributes);
+  return result;
+}
+
 } // namespace react
 } // namespace facebook
diff --git a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
index 428f9b531beeba..c87ca2fe4969a7 100644
--- a/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
+++ b/ReactCommon/react/renderer/components/picker/iospicker/PickerProps.h
@@ -16,7 +16,7 @@
 namespace facebook {
 namespace react {
 
-class PickerProps final : public ViewProps {
+class PickerProps final : public ViewProps, public BaseTextProps {
  public:
   PickerProps() = default;
   PickerProps(PickerProps const &sourceProps, RawProps const &rawProps);
@@ -25,9 +25,11 @@ class PickerProps final : public ViewProps {
 
   std::vector<PickerItemsStruct> items{};
   int selectedIndex{0};
-  TextAttributes style{};
   std::string const testID{};
   std::string const accessibilityLabel{};
+
+#pragma mark - Accessors
+  TextAttributes getEffectiveTextAttributes() const;
 };
 
 } // namespace react

From ccc4f0153db9098819d0bf728c828585132dd2f8 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 225/241] Fabric Picker Native Command support

Summary:
This adds support for a controlled  `<Picker/>` component .

Changelog: [iOS][Fabric] Fabric Picker support

Reviewed By: sammy-SC

Differential Revision: D24005475

fbshipit-source-id: c50e9918f74f6ef5cdfbfe67cb6c132c12d64916
---
 .../Picker/RCTPickerComponentView.mm          | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
index 50b27554c7d1d6..d1a2037473a78d 100644
--- a/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
+++ b/React/Fabric/Mounting/ComponentViews/Picker/RCTPickerComponentView.mm
@@ -8,6 +8,7 @@
 #import "RCTPickerComponentView.h"
 
 #import <React/RCTConvert.h>
+#import <React/RCTLog.h>
 #import <UIKit/UIKit.h>
 #import <react/renderer/components/iospicker/PickerComponentDescriptor.h>
 #import <react/renderer/components/iospicker/PickerEventEmitter.h>
@@ -75,17 +76,21 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
 {
   const auto &oldPickerProps = *std::static_pointer_cast<const PickerProps>(_props);
   const auto &newPickerProps = *std::static_pointer_cast<const PickerProps>(props);
+  bool needsToReload = false;
 
   if (oldPickerProps.items != newPickerProps.items) {
     _items = newPickerProps.items;
+    needsToReload = true;
   }
 
   if (oldPickerProps.selectedIndex != newPickerProps.selectedIndex) {
     _selectedIndex = newPickerProps.selectedIndex;
+    [self setSelectedIndex];
   }
 
   if (oldPickerProps.textAttributes != newPickerProps.textAttributes) {
     _textAttributes = RCTNSTextAttributesFromTextAttributes(newPickerProps.getEffectiveTextAttributes());
+    needsToReload = true;
   }
 
   // TODO (T75217510) - Figure out testID.
@@ -96,12 +101,33 @@ - (void)updateProps:(Props::Shared const &)props oldProps:(Props::Shared const &
     _accessibilityLabel = [NSString stringWithUTF8String:newPickerProps.accessibilityLabel.c_str()];
   }
 
+  if (needsToReload) {
+    [_pickerView reloadAllComponents];
+  }
+
   [super updateProps:props oldProps:oldProps];
 }
 
-// TODO (T75217510) - Handle Native Commands
 #pragma mark - Native Commands
 
+- (void)handleCommand:(const NSString *)commandName args:(const NSArray *)args
+{
+  if ([commandName isEqualToString:@"setNativeSelectedIndex"] && [args objectAtIndex:0]) {
+    NSNumber *selectedIndex = [args objectAtIndex:0];
+    if (_selectedIndex != selectedIndex.integerValue) {
+      [self setSelectedIndex];
+    }
+  } else {
+    RCTLogWarn(@"Attempting to send unknown command to Picker component: %@", commandName);
+  }
+}
+
+- (void)setSelectedIndex
+{
+  BOOL animated = _selectedIndex != NSNotFound; // Don't animate the initial value.
+  [_pickerView selectRow:_selectedIndex inComponent:0 animated:animated];
+}
+
 #pragma mark - UIPickerViewDataSource protocol
 
 - (NSInteger)numberOfComponentsInPickerView:(__unused UIPickerView *)pickerView

From b05d90e8bbec28c0e075a6b52c9e0aafc8d2d2a4 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 226/241] Remove type union in Picker.js

Summary:
Flow type unions don't play well with Fabric components. This diff removes a union in `Picker.js` and fixes all the flow errors.

Before this diff, all these surfaces would crash with the new Fabric Picker impl, because the impl asserts that this field is a string.

Reviewed By: sammy-SC

Differential Revision: D24236317

fbshipit-source-id: 6e646c84fcd16658aaabe5e93507f5f33b346a65
---
 Libraries/Components/Picker/Picker.js            |  8 ++++----
 .../rn-tester/js/examples/Modal/ModalExample.js  | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Libraries/Components/Picker/Picker.js b/Libraries/Components/Picker/Picker.js
index 76fa6d36f1b257..87c1f8133e4a5d 100644
--- a/Libraries/Components/Picker/Picker.js
+++ b/Libraries/Components/Picker/Picker.js
@@ -30,9 +30,9 @@ type PickerItemProps = $ReadOnly<{|
 
   /**
    * The value to be passed to picker's `onValueChange` callback when
-   * this item is selected. Can be a string or an integer.
+   * this item is selected.
    */
-  value?: ?(number | string),
+  value?: ?string,
 
   /**
    * Color of this item's text.
@@ -62,9 +62,9 @@ type PickerProps = $ReadOnly<{|
   style?: ?TextStyleProp,
 
   /**
-   * Value matching value of one of the items. Can be a string or an integer.
+   * Value matching value of one of the items.
    */
-  selectedValue?: ?(number | string),
+  selectedValue?: ?string,
 
   /**
    * Callback for when an item is selected. This is called with the following parameters:
diff --git a/packages/rn-tester/js/examples/Modal/ModalExample.js b/packages/rn-tester/js/examples/Modal/ModalExample.js
index 75dcc49b175ef6..9d8b07e63d8757 100644
--- a/packages/rn-tester/js/examples/Modal/ModalExample.js
+++ b/packages/rn-tester/js/examples/Modal/ModalExample.js
@@ -79,7 +79,7 @@ class ModalExample extends React.Component<{...}, $FlowFixMeState> {
     modalVisible: false,
     transparent: false,
     presentationStyle: 'fullScreen',
-    selectedSupportedOrientation: 0,
+    selectedSupportedOrientation: '0',
     currentOrientation: 'unknown',
   };
 
@@ -130,7 +130,7 @@ class ModalExample extends React.Component<{...}, $FlowFixMeState> {
           onRequestClose={() => this._setModalVisible(false)}
           supportedOrientations={
             supportedOrientationsPickerValues[
-              this.state.selectedSupportedOrientation
+              Number(this.state.selectedSupportedOrientation)
             ]
           }
           onOrientationChange={evt =>
@@ -222,12 +222,12 @@ class ModalExample extends React.Component<{...}, $FlowFixMeState> {
               this.setState({selectedSupportedOrientation: i})
             }
             itemStyle={styles.pickerItem}>
-            <Item label="Portrait" value={0} />
-            <Item label="Landscape" value={1} />
-            <Item label="Landscape left" value={2} />
-            <Item label="Portrait and landscape right" value={3} />
-            <Item label="Portrait and landscape" value={4} />
-            <Item label="Default supportedOrientations" value={5} />
+            <Item label="Portrait" value={'0'} />
+            <Item label="Landscape" value={'1'} />
+            <Item label="Landscape left" value={'2'} />
+            <Item label="Portrait and landscape right" value={'3'} />
+            <Item label="Portrait and landscape" value={'4'} />
+            <Item label="Default supportedOrientations" value={'5'} />
           </Picker>
         </View>
       </View>

From 3113e47b9bc92e3b0efb96db776f650848093dfc Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 227/241] Remove type union in PickeriOS/PickerNativeComponent

Summary:
This builds on the last diff to remove type a type union from Picker. This diff focuses on Picker internals.

Changelog: [JS] Remove type union in PickeriOS/PickerNativeComponent

Reviewed By: sammy-SC

Differential Revision: D24254615

fbshipit-source-id: f788a2e123135c1e8b9909870c40f53b2dea0227
---
 Libraries/Components/Picker/PickerIOS.ios.js            | 6 +++---
 Libraries/Components/Picker/RCTPickerNativeComponent.js | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Libraries/Components/Picker/PickerIOS.ios.js b/Libraries/Components/Picker/PickerIOS.ios.js
index 39417c3c23b4d2..7f294019261a85 100644
--- a/Libraries/Components/Picker/PickerIOS.ios.js
+++ b/Libraries/Components/Picker/PickerIOS.ios.js
@@ -37,7 +37,7 @@ type PickerIOSChangeEvent = SyntheticEvent<
 
 type RCTPickerIOSItemType = $ReadOnly<{|
   label: ?Label,
-  value: ?(number | string),
+  value: ?string,
   textColor: ?ProcessedColorValue,
 |}>;
 
@@ -49,7 +49,7 @@ type Props = $ReadOnly<{|
   itemStyle?: ?TextStyleProp,
   onChange?: ?(event: PickerIOSChangeEvent) => mixed,
   onValueChange?: ?(itemValue: string | number, itemIndex: number) => mixed,
-  selectedValue: ?(number | string),
+  selectedValue: ?string,
   accessibilityLabel?: ?string,
 |}>;
 
@@ -60,7 +60,7 @@ type State = {|
 
 type ItemProps = $ReadOnly<{|
   label: ?Label,
-  value?: ?(number | string),
+  value?: ?string,
   color?: ?ColorValue,
 |}>;
 
diff --git a/Libraries/Components/Picker/RCTPickerNativeComponent.js b/Libraries/Components/Picker/RCTPickerNativeComponent.js
index ca42471b6025ce..70288d33132cf6 100644
--- a/Libraries/Components/Picker/RCTPickerNativeComponent.js
+++ b/Libraries/Components/Picker/RCTPickerNativeComponent.js
@@ -28,7 +28,7 @@ type PickerIOSChangeEvent = SyntheticEvent<
 
 type RCTPickerIOSItemType = $ReadOnly<{|
   label: ?Label,
-  value: ?(number | string),
+  value: ?string,
   textColor: ?ProcessedColorValue,
 |}>;
 

From 8f45db3b9eba9d4805af8c48fbaa1122cb9601d4 Mon Sep 17 00:00:00 2001
From: Peter Argany <petetheheat@fb.com>
Date: Tue, 13 Oct 2020 11:13:34 -0700
Subject: [PATCH 228/241] RCTPicker handwritten view config

Summary: This completes the Picker stack. Use a handwritten view config to avoid calling `requireNativeComponent` in Bridgeless mode.

Differential Revision: D23663596

fbshipit-source-id: 5d0811014fd6f66956803a1db5fee8fd1119d5bc
---
 .../Picker/RCTPickerNativeComponent.js        | 17 ++++++--
 .../Components/Picker/RCTPickerViewConfig.js  | 41 +++++++++++++++++++
 2 files changed, 54 insertions(+), 4 deletions(-)
 create mode 100644 Libraries/Components/Picker/RCTPickerViewConfig.js

diff --git a/Libraries/Components/Picker/RCTPickerNativeComponent.js b/Libraries/Components/Picker/RCTPickerNativeComponent.js
index 70288d33132cf6..7fdbe9c76c80fd 100644
--- a/Libraries/Components/Picker/RCTPickerNativeComponent.js
+++ b/Libraries/Components/Picker/RCTPickerNativeComponent.js
@@ -11,12 +11,14 @@
 'use strict';
 
 const requireNativeComponent = require('../../ReactNative/requireNativeComponent');
+const ReactNativeViewConfigRegistry = require('../../Renderer/shims/ReactNativeViewConfigRegistry');
 
 import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
 import type {SyntheticEvent} from '../../Types/CoreEventTypes';
 import type {TextStyleProp} from '../../StyleSheet/StyleSheet';
 import type {ProcessedColorValue} from '../../StyleSheet/processColor';
 import codegenNativeCommands from '../../Utilities/codegenNativeCommands';
+import RCTPickerViewConfig from './RCTPickerViewConfig';
 import * as React from 'react';
 
 type PickerIOSChangeEvent = SyntheticEvent<
@@ -56,8 +58,15 @@ export const Commands: NativeCommands = codegenNativeCommands<NativeCommands>({
   supportedCommands: ['setNativeSelectedIndex'],
 });
 
-const RCTPickerNativeComponent: ComponentType = requireNativeComponent<NativeProps>(
-  'RCTPicker',
-);
+let RCTPickerNativeComponent;
+if (global.RN$Bridgeless) {
+  ReactNativeViewConfigRegistry.register('RCTPicker', () => {
+    return RCTPickerViewConfig;
+  });
+  RCTPickerNativeComponent = 'RCTPicker';
+} else {
+  RCTPickerNativeComponent = requireNativeComponent<NativeProps>('RCTPicker');
+}
 
-export default RCTPickerNativeComponent;
+// flowlint-next-line unclear-type:off
+export default ((RCTPickerNativeComponent: any): HostComponent<NativeProps>);
diff --git a/Libraries/Components/Picker/RCTPickerViewConfig.js b/Libraries/Components/Picker/RCTPickerViewConfig.js
new file mode 100644
index 00000000000000..448bc2a2b8e5cf
--- /dev/null
+++ b/Libraries/Components/Picker/RCTPickerViewConfig.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ *
+ * @flow strict-local
+ * @format
+ */
+
+'use strict';
+
+import ReactNativeViewViewConfig from '../../Components/View/ReactNativeViewViewConfig';
+import type {ReactNativeBaseComponentViewConfig} from '../../Renderer/shims/ReactNativeTypes';
+
+const RCTPickerViewConfig = {
+  uiViewClassName: 'RCTPicker',
+  bubblingEventTypes: {
+    topChange: {
+      phasedRegistrationNames: {
+        bubbled: 'onChange',
+        captured: 'onChangeCapture',
+      },
+    },
+  },
+  directEventTypes: {},
+  validAttributes: {
+    ...ReactNativeViewViewConfig.validAttributes,
+    color: {process: require('../../StyleSheet/processColor')},
+    fontFamily: true,
+    fontSize: true,
+    fontStyle: true,
+    fontWeight: true,
+    items: true,
+    onChange: true,
+    selectedIndex: true,
+    textAlign: true,
+  },
+};
+
+module.exports = (RCTPickerViewConfig: ReactNativeBaseComponentViewConfig<>);

From 42d232901c5b42d74b7f6f588baced8db742f05d Mon Sep 17 00:00:00 2001
From: Scott Kyle <skyle@fb.com>
Date: Tue, 13 Oct 2020 15:35:51 -0700
Subject: [PATCH 229/241] Fix ASAN crash in RCTMessageThread

Summary:
This should fix a race condition uncovered by ASAN build that results in `m_shutdown` being referenced after destruction.

This mirrors a similar fix made in react-native-macos: https://github.com/microsoft/react-native-macos/commit/ea7767a211e5d1e5b18171c79404553b712539c7

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24263156

fbshipit-source-id: 5fb1e7053c107dfb7050242fce8fcf0435e5592c
---
 React/CxxBridge/RCTMessageThread.h  |  4 +++-
 React/CxxBridge/RCTMessageThread.mm | 14 +++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/React/CxxBridge/RCTMessageThread.h b/React/CxxBridge/RCTMessageThread.h
index ecdee6d6cc7bd0..b15c536d0a14e0 100644
--- a/React/CxxBridge/RCTMessageThread.h
+++ b/React/CxxBridge/RCTMessageThread.h
@@ -5,6 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <memory>
 #import <string>
 
 #import <Foundation/Foundation.h>
@@ -15,7 +16,8 @@
 namespace facebook {
 namespace react {
 
-class RCTMessageThread : public MessageQueueThread {
+class RCTMessageThread : public MessageQueueThread,
+                         public std::enable_shared_from_this<RCTMessageThread> {
  public:
   RCTMessageThread(NSRunLoop *runLoop, RCTJavaScriptCompleteBlock errorBlock);
   ~RCTMessageThread() override;
diff --git a/React/CxxBridge/RCTMessageThread.mm b/React/CxxBridge/RCTMessageThread.mm
index f29e47dd032350..c340fa7b737a2b 100644
--- a/React/CxxBridge/RCTMessageThread.mm
+++ b/React/CxxBridge/RCTMessageThread.mm
@@ -31,6 +31,7 @@
 
 RCTMessageThread::~RCTMessageThread()
 {
+  RCTAssert(m_shutdown, @"RCTMessageThread: quitSynchronous() not called before destructor");
   CFRelease(m_cfRunLoop);
 }
 
@@ -76,10 +77,9 @@
   if (m_shutdown) {
     return;
   }
-
-  runAsync([this, func = std::make_shared<std::function<void()>>(std::move(func))] {
-    if (!m_shutdown) {
-      tryFunc(*func);
+  runAsync([sharedThis = shared_from_this(), func = std::make_shared<std::function<void()>>(std::move(func))] {
+    if (!sharedThis->m_shutdown) {
+      sharedThis->tryFunc(*func);
     }
   });
 }
@@ -89,9 +89,9 @@
   if (m_shutdown) {
     return;
   }
-  runSync([this, func = std::move(func)] {
-    if (!m_shutdown) {
-      tryFunc(func);
+  runSync([sharedThis = shared_from_this(), func = std::move(func)] {
+    if (!sharedThis->m_shutdown) {
+      sharedThis->tryFunc(func);
     }
   });
 }

From d5076c6c8f93b915fa18f6eed777b4927cf51e16 Mon Sep 17 00:00:00 2001
From: Joshua Gross <joshuagross@fb.com>
Date: Tue, 13 Oct 2020 23:58:35 -0700
Subject: [PATCH 230/241] Fix some JNI table leaks, more aggressively clean up
 memory

Summary:
There are a few places where we have JNI table ref leaks, and more places where we can aggressively clean up smart pointers immediately instead of waiting for them to be cleaned up at some later point.

In theory these smart pointers should be cleaned up immediately, but in cases where many components are being measured at once, the JNI table could grow until all measure calls are done. In extreme cases this
could cause a crash, which I want to avoid. At the very least, freeing memory more aggressively in this case can't hurt.

Changelog: [Internal]

Reviewed By: shergin

Differential Revision: D24293775

fbshipit-source-id: 159741ba955e5a6fe02caf6e65d1e4d6d4afadee
---
 .../slider/SliderMeasurementsManager.cpp      | 10 +++++++--
 .../AndroidTextInputComponentDescriptor.h     |  2 ++
 .../textlayoutmanager/TextLayoutManager.cpp   | 22 +++++++++++++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp b/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp
index 0f7322ad0efbbf..24bc977fbad790 100644
--- a/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp
+++ b/ReactCommon/react/renderer/components/slider/platform/android/react/renderer/components/slider/SliderMeasurementsManager.cpp
@@ -59,8 +59,14 @@ Size SliderMeasurementsManager::measure(
       minimumSize.height,
       maximumSize.height));
 
-  std::lock_guard<std::mutex> lock(mutex_);
-  cachedMeasurement_ = measurement;
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  componentName.reset();
+
+  {
+    std::lock_guard<std::mutex> lock(mutex_);
+    cachedMeasurement_ = measurement;
+  }
+
   return measurement;
 }
 
diff --git a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
index 3918684ed6015e..26abeff7b997ab 100644
--- a/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
+++ b/ReactCommon/react/renderer/components/textinput/androidtextinput/react/renderer/components/androidtextinput/AndroidTextInputComponentDescriptor.h
@@ -62,6 +62,8 @@ class AndroidTextInputComponentDescriptor final
         theme[YGEdgeBottom] =
             (YGValue){defaultTextInputPadding[3], YGUnitPoint};
         surfaceIdToThemePaddingMap_.emplace(std::make_pair(surfaceId, theme));
+        env->ReleaseFloatArrayElements(
+            defaultTextInputPaddingArray, defaultTextInputPadding, JNI_ABORT);
       }
       env->DeleteLocalRef(defaultTextInputPaddingArray);
     }
diff --git a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
index be0201dec74d43..56a72d3881fed0 100644
--- a/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
+++ b/ReactCommon/react/renderer/textlayoutmanager/platform/android/react/renderer/textlayoutmanager/TextLayoutManager.cpp
@@ -92,6 +92,13 @@ TextMeasurement TextLayoutManager::measureCachedSpannableById(
   // though it's 0 length
   env->DeleteLocalRef(attachmentPositions);
 
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  componentName.reset();
+  attributedStringRM.reset();
+  attributedStringRNM.reset();
+  paragraphAttributesRM.reset();
+  paragraphAttributesRNM.reset();
+
   // TODO: currently we do not support attachments for cached IDs - should we?
   auto attachments = TextMeasurement::Attachments{};
 
@@ -139,6 +146,12 @@ LinesMeasurements TextLayoutManager::measureLines(
     lineMeasurements.push_back(LineMeasurement(data));
   }
 
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  attributedStringRM.reset();
+  attributedStringRNM.reset();
+  paragraphAttributesRM.reset();
+  paragraphAttributesRNM.reset();
+
   return lineMeasurements;
 }
 
@@ -222,8 +235,17 @@ TextMeasurement TextLayoutManager::doMeasure(
   }
 
   // Clean up allocated ref
+  env->ReleaseFloatArrayElements(
+      attachmentPositions, attachmentData, JNI_ABORT);
   env->DeleteLocalRef(attachmentPositions);
 
+  // Explicitly release smart pointers to free up space faster in JNI tables
+  componentName.reset();
+  attributedStringRM.reset();
+  attributedStringRNM.reset();
+  paragraphAttributesRM.reset();
+  paragraphAttributesRNM.reset();
+
   return TextMeasurement{size, attachments};
 }
 

From ea93151f21003df6f65dd173dd5dcb3135b0ae94 Mon Sep 17 00:00:00 2001
From: Lulu Wu <luluwu@fb.com>
Date: Wed, 14 Oct 2020 02:37:51 -0700
Subject: [PATCH 231/241] Make RCTEventDispatcher TurboModule-compatible

Summary:
This diff ended up being a bit more complicated than I anticipated, since the source files in `ReactInternal` were depending on `RCTEventDispatcher`. I made the following changes:
1. Make `RCTEventDispatcher` a `protocol`, keep it in `ReactInternal`.
2. Rename the `RCTEventDispatcher` NativeModule to `RCTEventDispatcherModule`, make it conform to the `RCTEventEmitter` `protocol`, and move it to `CoreModules`.
3. Where necessary, replace categories of `RCTEventDispatcher` with functions.

Changelog:
[iOS][Added] - Make RCTEventDispatcher TurboModule-comaptible

Reviewed By: fkgozali

Differential Revision: D18439488

fbshipit-source-id: b3da15c29459fddf884519f33b0c3b8c036b5539
---
 Libraries/Image/RCTImageView.mm               |   1 -
 Libraries/LinkingIOS/RCTLinkingManager.mm     |   1 -
 .../Drivers/RCTEventAnimation.h               |   2 +-
 .../NativeAnimation/RCTNativeAnimatedModule.h |   2 +-
 .../RCTNativeAnimatedNodesManager.h           |   1 +
 .../RCTNativeAnimatedTurboModule.h            |   2 +-
 Libraries/Network/RCTNetworking.mm            |   1 -
 .../RCTPushNotificationManager.mm             |   1 -
 Libraries/Settings/RCTSettingsManager.mm      |   2 +-
 .../Text/TextInput/RCTBaseTextInputView.h     |   1 -
 .../Text/TextInput/RCTBaseTextInputView.m     |   4 +-
 React/Base/RCTBridge.h                        |   1 -
 React/Base/RCTBridge.m                        |   1 -
 React/Base/RCTComponentEvent.h                |   2 +-
 React/Base/RCTEventDispatcher.m               | 219 +----------------
 ...patcher.h => RCTEventDispatcherProtocol.h} |  22 +-
 React/Base/RCTRootView.m                      |   1 -
 React/Base/RCTTouchEvent.h                    |   2 +-
 React/Base/RCTTouchHandler.m                  |   6 +-
 React/CoreModules/BUCK                        |   3 +
 React/CoreModules/CoreModulesPlugins.h        |   1 +
 React/CoreModules/CoreModulesPlugins.mm       |   1 +
 React/CoreModules/RCTAccessibilityManager.mm  |   2 +-
 React/CoreModules/RCTAppState.mm              |   2 +-
 React/CoreModules/RCTDevSettings.mm           |   2 +-
 React/CoreModules/RCTDeviceInfo.mm            |   2 +-
 React/CoreModules/RCTEventDispatcher.h        |  17 ++
 React/CoreModules/RCTEventDispatcher.mm       | 232 ++++++++++++++++++
 React/CoreModules/RCTKeyboardObserver.mm      |   2 +-
 React/CoreModules/RCTRedBox.mm                |   2 +-
 React/CoreModules/RCTStatusBarManager.mm      |   2 +-
 React/Modules/RCTUIManager.m                  |   2 +-
 React/Views/RCTDatePickerManager.m            |   1 -
 React/Views/RCTSegmentedControl.m             |   1 -
 React/Views/RCTSliderManager.m                |   1 -
 React/Views/RCTSwitch.m                       |   1 -
 React/Views/RCTSwitchManager.m                |   1 -
 React/Views/RCTViewManager.h                  |   2 +-
 React/Views/RCTViewManager.m                  |   1 -
 React/Views/RCTWrapperViewController.m        |   2 -
 React/Views/ScrollView/RCTScrollEvent.h       |   2 +-
 React/Views/ScrollView/RCTScrollView.h        |  14 +-
 React/Views/ScrollView/RCTScrollView.m        |  12 +-
 .../RCTLegacyViewManagerInteropCoordinator.mm |   1 +
 packages/rn-tester/RCTTest/RCTTestModule.mm   |   2 +-
 .../RCTRootViewIntegrationTests.m             |   2 +-
 46 files changed, 301 insertions(+), 284 deletions(-)
 rename React/Base/{RCTEventDispatcher.h => RCTEventDispatcherProtocol.h} (95%)
 create mode 100644 React/CoreModules/RCTEventDispatcher.h
 create mode 100644 React/CoreModules/RCTEventDispatcher.mm

diff --git a/Libraries/Image/RCTImageView.mm b/Libraries/Image/RCTImageView.mm
index 2b5fce147f653b..15609120223668 100644
--- a/Libraries/Image/RCTImageView.mm
+++ b/Libraries/Image/RCTImageView.mm
@@ -9,7 +9,6 @@
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
 #import <React/RCTImageBlurUtils.h>
 #import <React/RCTImageSource.h>
 #import <React/RCTImageUtils.h>
diff --git a/Libraries/LinkingIOS/RCTLinkingManager.mm b/Libraries/LinkingIOS/RCTLinkingManager.mm
index b1171f6ecae8ce..355679b2824017 100644
--- a/Libraries/LinkingIOS/RCTLinkingManager.mm
+++ b/Libraries/LinkingIOS/RCTLinkingManager.mm
@@ -9,7 +9,6 @@
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
-#import <React/RCTEventDispatcher.h>
 #import <React/RCTUtils.h>
 #import <React/RCTLog.h>
 
diff --git a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
index cd06b1697add18..c63c1f4c643c08 100644
--- a/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
+++ b/Libraries/NativeAnimation/Drivers/RCTEventAnimation.h
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 #import "RCTValueAnimatedNode.h"
 
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
index fde319b0eaef98..13b40fd8ae22c2 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedModule.h
@@ -6,7 +6,7 @@
  */
 
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTUIManager.h>
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
index a3e350842683f4..be7445686931bd 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedNodesManager.h
@@ -9,6 +9,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTSurfacePresenterStub.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 @protocol RCTValueAnimatedNodeObserver;
 
diff --git a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
index 71f40200c2328f..2da04a1277eb1f 100644
--- a/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
+++ b/Libraries/NativeAnimation/RCTNativeAnimatedTurboModule.h
@@ -6,7 +6,7 @@
  */
 
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTSurfacePresenterStub.h>
 #import <React/RCTUIManager.h>
diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index c4dbf8a7bf3364..c6fbe7092a72ba 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -11,7 +11,6 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTAssert.h>
 #import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
 #import <React/RCTLog.h>
 #import <React/RCTNetworkTask.h>
 #import <React/RCTNetworking.h>
diff --git a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
index 02fb7e4214bdcb..aa075bb6bfa1e6 100644
--- a/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
+++ b/Libraries/PushNotificationIOS/RCTPushNotificationManager.mm
@@ -12,7 +12,6 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
 #import <React/RCTUtils.h>
 
 #import "RCTPushNotificationPlugins.h"
diff --git a/Libraries/Settings/RCTSettingsManager.mm b/Libraries/Settings/RCTSettingsManager.mm
index 2f6645f24d6dd0..8628857bc8aad2 100644
--- a/Libraries/Settings/RCTSettingsManager.mm
+++ b/Libraries/Settings/RCTSettingsManager.mm
@@ -10,7 +10,7 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTUtils.h>
 
 #import "RCTSettingsPlugins.h"
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.h b/Libraries/Text/TextInput/RCTBaseTextInputView.h
index d7fc54bed85dab..d73f082cbd8986 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.h
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.h
@@ -13,7 +13,6 @@
 #import "RCTBackedTextInputViewProtocol.h"
 
 @class RCTBridge;
-@class RCTEventDispatcher;
 @class RCTTextAttributes;
 @class RCTTextSelection;
 
diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 01ab7f19d12267..d619e5b5640a14 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -9,7 +9,7 @@
 
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTUIManager.h>
 #import <React/RCTUtils.h>
 #import <React/UIView+React.h>
@@ -21,7 +21,7 @@
 
 @implementation RCTBaseTextInputView {
   __weak RCTBridge *_bridge;
-  __weak RCTEventDispatcher *_eventDispatcher;
+  __weak id<RCTEventDispatcherProtocol> _eventDispatcher;
   BOOL _hasInputAccesoryView;
   NSString *_Nullable _predictedText;
   BOOL _didMoveToWindow;
diff --git a/React/Base/RCTBridge.h b/React/Base/RCTBridge.h
index 55265010e0945d..1331f5009cbacf 100644
--- a/React/Base/RCTBridge.h
+++ b/React/Base/RCTBridge.h
@@ -15,7 +15,6 @@
 
 @class JSValue;
 @class RCTBridge;
-@class RCTEventDispatcher;
 @class RCTPerformanceLogger;
 
 /**
diff --git a/React/Base/RCTBridge.m b/React/Base/RCTBridge.m
index 7d5c9cd414b151..2429d58f86b00e 100644
--- a/React/Base/RCTBridge.m
+++ b/React/Base/RCTBridge.m
@@ -11,7 +11,6 @@
 #import <objc/runtime.h>
 
 #import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
 #if RCT_ENABLE_INSPECTOR
 #import "RCTInspectorDevServerHelper.h"
 #endif
diff --git a/React/Base/RCTComponentEvent.h b/React/Base/RCTComponentEvent.h
index cad756234b21e4..0467f8c50f3787 100644
--- a/React/Base/RCTComponentEvent.h
+++ b/React/Base/RCTComponentEvent.h
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/React/Base/RCTEventDispatcher.m b/React/Base/RCTEventDispatcher.m
index dfb613657600e8..9da63c3af1190c 100644
--- a/React/Base/RCTEventDispatcher.m
+++ b/React/Base/RCTEventDispatcher.m
@@ -5,14 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#import "RCTEventDispatcher.h"
-
-#import "RCTAssert.h"
-#import "RCTBridge+Private.h"
-#import "RCTBridge.h"
-#import "RCTComponentEvent.h"
-#import "RCTProfile.h"
-#import "RCTUtils.h"
+#import "RCTEventDispatcherProtocol.h"
 
 const NSInteger RCTTextUpdateLagWarningThreshold = 3;
 
@@ -27,217 +20,11 @@
   return eventName;
 }
 
-static NSNumber *RCTGetEventID(NSNumber *viewTag, NSString *eventName, uint16_t coalescingKey)
-{
-  return @(viewTag.intValue | (((uint64_t)eventName.hash & 0xFFFF) << 32) | (((uint64_t)coalescingKey) << 48));
-}
-
-static uint16_t RCTUniqueCoalescingKeyGenerator = 0;
-
-@implementation RCTEventDispatcher {
-  // We need this lock to protect access to _events, _eventQueue and _eventsDispatchScheduled. It's filled in on main
-  // thread and consumed on js thread.
-  NSLock *_eventQueueLock;
-  // We have this id -> event mapping so we coalesce effectively.
-  NSMutableDictionary<NSNumber *, id<RCTEvent>> *_events;
-  // This array contains ids of events in order they come in, so we can emit them to JS in the exact same order.
-  NSMutableArray<NSNumber *> *_eventQueue;
-  BOOL _eventsDispatchScheduled;
-  NSHashTable<id<RCTEventDispatcherObserver>> *_observers;
-  NSLock *_observersLock;
-}
-
-@synthesize bridge = _bridge;
-@synthesize dispatchToJSThread = _dispatchToJSThread;
-@synthesize invokeJS = _invokeJS;
-@synthesize invokeJSWithModuleDotMethod = _invokeJSWithModuleDotMethod;
-
-RCT_EXPORT_MODULE()
-
-- (void)setBridge:(RCTBridge *)bridge
-{
-  _bridge = bridge;
-  _events = [NSMutableDictionary new];
-  _eventQueue = [NSMutableArray new];
-  _eventQueueLock = [NSLock new];
-  _eventsDispatchScheduled = NO;
-  _observers = [NSHashTable weakObjectsHashTable];
-  _observersLock = [NSLock new];
-}
-
-- (void)sendAppEventWithName:(NSString *)name body:(id)body
-{
-  if (_bridge) {
-    [_bridge enqueueJSCall:@"RCTNativeAppEventEmitter"
-                    method:@"emit"
-                      args:body ? @[ name, body ] : @[ name ]
-                completion:NULL];
-  } else {
-    _invokeJS(@"RCTNativeAppEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
-  }
-}
-
-- (void)sendDeviceEventWithName:(NSString *)name body:(id)body
-{
-  if (_bridge) {
-    [_bridge enqueueJSCall:@"RCTDeviceEventEmitter"
-                    method:@"emit"
-                      args:body ? @[ name, body ] : @[ name ]
-                completion:NULL];
-  } else {
-    _invokeJS(@"RCTDeviceEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
-  }
-}
-
-- (void)sendTextEventWithType:(RCTTextEventType)type
-                     reactTag:(NSNumber *)reactTag
-                         text:(NSString *)text
-                          key:(NSString *)key
-                   eventCount:(NSInteger)eventCount
-{
-  static NSString *events[] = {@"focus", @"blur", @"change", @"submitEditing", @"endEditing", @"keyPress"};
-
-  NSMutableDictionary *body = [[NSMutableDictionary alloc] initWithDictionary:@{
-    @"eventCount" : @(eventCount),
-  }];
-
-  if (text) {
-    body[@"text"] = text;
-  }
-
-  if (key) {
-    if (key.length == 0) {
-      key = @"Backspace"; // backspace
-    } else {
-      switch ([key characterAtIndex:0]) {
-        case '\t':
-          key = @"Tab";
-          break;
-        case '\n':
-          key = @"Enter";
-        default:
-          break;
-      }
-    }
-    body[@"key"] = key;
-  }
-
-  RCTComponentEvent *event = [[RCTComponentEvent alloc] initWithName:events[type] viewTag:reactTag body:body];
-  [self sendEvent:event];
-}
-
-- (void)sendEvent:(id<RCTEvent>)event
-{
-  [_observersLock lock];
-
-  for (id<RCTEventDispatcherObserver> observer in _observers) {
-    [observer eventDispatcherWillDispatchEvent:event];
-  }
-
-  [_observersLock unlock];
-
-  [_eventQueueLock lock];
-
-  NSNumber *eventID;
-  if (event.canCoalesce) {
-    eventID = RCTGetEventID(event.viewTag, event.eventName, event.coalescingKey);
-    id<RCTEvent> previousEvent = _events[eventID];
-    if (previousEvent) {
-      event = [previousEvent coalesceWithEvent:event];
-    } else {
-      [_eventQueue addObject:eventID];
-    }
-  } else {
-    id<RCTEvent> previousEvent = _events[eventID];
-    eventID = RCTGetEventID(event.viewTag, event.eventName, RCTUniqueCoalescingKeyGenerator++);
-    RCTAssert(
-        previousEvent == nil,
-        @"Got event %@ which cannot be coalesced, but has the same eventID %@ as the previous event %@",
-        event,
-        eventID,
-        previousEvent);
-    [_eventQueue addObject:eventID];
-  }
-
-  _events[eventID] = event;
-
-  BOOL scheduleEventsDispatch = NO;
-  if (!_eventsDispatchScheduled) {
-    _eventsDispatchScheduled = YES;
-    scheduleEventsDispatch = YES;
-  }
-
-  // We have to release the lock before dispatching block with events,
-  // since dispatchBlock: can be executed synchronously on the same queue.
-  // (This is happening when chrome debugging is turned on.)
-  [_eventQueueLock unlock];
-
-  if (scheduleEventsDispatch) {
-    if (_bridge) {
-      [_bridge
-          dispatchBlock:^{
-            [self flushEventsQueue];
-          }
-                  queue:RCTJSThread];
-    } else if (_dispatchToJSThread) {
-      _dispatchToJSThread(^{
-        [self flushEventsQueue];
-      });
-    }
-  }
-}
-
-- (void)addDispatchObserver:(id<RCTEventDispatcherObserver>)observer
-{
-  [_observersLock lock];
-  [_observers addObject:observer];
-  [_observersLock unlock];
-}
-
-- (void)removeDispatchObserver:(id<RCTEventDispatcherObserver>)observer
-{
-  [_observersLock lock];
-  [_observers removeObject:observer];
-  [_observersLock unlock];
-}
-
-- (void)dispatchEvent:(id<RCTEvent>)event
-{
-  if (_bridge) {
-    [_bridge enqueueJSCall:[[event class] moduleDotMethod] args:[event arguments]];
-  } else {
-    _invokeJSWithModuleDotMethod([[event class] moduleDotMethod], [event arguments]);
-  }
-}
-
-- (dispatch_queue_t)methodQueue
-{
-  return RCTJSThread;
-}
-
-// js thread only (which surprisingly can be the main thread, depends on used JS executor)
-- (void)flushEventsQueue
-{
-  [_eventQueueLock lock];
-  NSDictionary *events = _events;
-  _events = [NSMutableDictionary new];
-  NSMutableArray *eventQueue = _eventQueue;
-  _eventQueue = [NSMutableArray new];
-  _eventsDispatchScheduled = NO;
-  [_eventQueueLock unlock];
-
-  for (NSNumber *eventId in eventQueue) {
-    [self dispatchEvent:events[eventId]];
-  }
-}
-
-@end
-
 @implementation RCTBridge (RCTEventDispatcher)
 
-- (RCTEventDispatcher *)eventDispatcher
+- (id<RCTEventDispatcherProtocol>)eventDispatcher
 {
-  return [self moduleForClass:[RCTEventDispatcher class]];
+  return [self moduleForName:@"EventDispatcher" lazilyLoadIfNecessary:YES];
 }
 
 @end
diff --git a/React/Base/RCTEventDispatcher.h b/React/Base/RCTEventDispatcherProtocol.h
similarity index 95%
rename from React/Base/RCTEventDispatcher.h
rename to React/Base/RCTEventDispatcherProtocol.h
index dfaba98c2cf443..0c7039277264eb 100644
--- a/React/Base/RCTEventDispatcher.h
+++ b/React/Base/RCTEventDispatcherProtocol.h
@@ -10,15 +10,6 @@
 #import <React/RCTBridge.h>
 #import <React/RCTJSInvokerModule.h>
 
-typedef NS_ENUM(NSInteger, RCTTextEventType) {
-  RCTTextEventTypeFocus,
-  RCTTextEventTypeBlur,
-  RCTTextEventTypeChange,
-  RCTTextEventTypeSubmit,
-  RCTTextEventTypeEnd,
-  RCTTextEventTypeKeyPress
-};
-
 /**
  * The threshold at which text inputs will start warning that the JS thread
  * has fallen behind (resulting in poor input performance, missed keys, etc.)
@@ -32,6 +23,15 @@ RCT_EXTERN const NSInteger RCTTextUpdateLagWarningThreshold;
  */
 RCT_EXTERN NSString *RCTNormalizeInputEventName(NSString *eventName);
 
+typedef NS_ENUM(NSInteger, RCTTextEventType) {
+  RCTTextEventTypeFocus,
+  RCTTextEventTypeBlur,
+  RCTTextEventTypeChange,
+  RCTTextEventTypeSubmit,
+  RCTTextEventTypeEnd,
+  RCTTextEventTypeKeyPress
+};
+
 @protocol RCTEvent <NSObject>
 @required
 
@@ -80,7 +80,7 @@ RCT_EXTERN NSString *RCTNormalizeInputEventName(NSString *eventName);
  * This class wraps the -[RCTBridge enqueueJSCall:args:] method, and
  * provides some convenience methods for generating event calls.
  */
-@interface RCTEventDispatcher : NSObject <RCTBridgeModule, RCTJSDispatcherModule, RCTJSInvokerModule>
+@protocol RCTEventDispatcherProtocol <RCTBridgeModule, RCTJSDispatcherModule, RCTJSInvokerModule>
 
 /**
  * Deprecated, do not use.
@@ -123,6 +123,6 @@ RCT_EXTERN NSString *RCTNormalizeInputEventName(NSString *eventName);
 
 @interface RCTBridge (RCTEventDispatcher)
 
-- (RCTEventDispatcher *)eventDispatcher;
+- (id<RCTEventDispatcherProtocol>)eventDispatcher;
 
 @end
diff --git a/React/Base/RCTRootView.m b/React/Base/RCTRootView.m
index d9fbc37b38dfae..62bdd7585779f8 100644
--- a/React/Base/RCTRootView.m
+++ b/React/Base/RCTRootView.m
@@ -15,7 +15,6 @@
 #import "RCTBridge+Private.h"
 #import "RCTBridge.h"
 #import "RCTConstants.h"
-#import "RCTEventDispatcher.h"
 #import "RCTKeyCommands.h"
 #import "RCTLog.h"
 #import "RCTPerformanceLogger.h"
diff --git a/React/Base/RCTTouchEvent.h b/React/Base/RCTTouchEvent.h
index 99cc6d435a1573..9f3cc4f9ff388a 100644
--- a/React/Base/RCTTouchEvent.h
+++ b/React/Base/RCTTouchEvent.h
@@ -7,7 +7,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 /**
  * Represents a touch event, which may be composed of several touches (one for every finger).
diff --git a/React/Base/RCTTouchHandler.m b/React/Base/RCTTouchHandler.m
index 8361fdf55c7e95..fc32afb0a79cfc 100644
--- a/React/Base/RCTTouchHandler.m
+++ b/React/Base/RCTTouchHandler.m
@@ -11,7 +11,7 @@
 
 #import "RCTAssert.h"
 #import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
+#import "RCTEventDispatcherProtocol.h"
 #import "RCTLog.h"
 #import "RCTSurfaceView.h"
 #import "RCTTouchEvent.h"
@@ -25,7 +25,7 @@ @interface RCTTouchHandler () <UIGestureRecognizerDelegate>
 // TODO: this class behaves a lot like a module, and could be implemented as a
 // module if we were to assume that modules and RootViews had a 1:1 relationship
 @implementation RCTTouchHandler {
-  __weak RCTEventDispatcher *_eventDispatcher;
+  __weak id<RCTEventDispatcherProtocol> _eventDispatcher;
 
   /**
    * Arrays managed in parallel tracking native touch object along with the
@@ -47,7 +47,7 @@ - (instancetype)initWithBridge:(RCTBridge *)bridge
   RCTAssertParam(bridge);
 
   if ((self = [super initWithTarget:nil action:NULL])) {
-    _eventDispatcher = [bridge moduleForClass:[RCTEventDispatcher class]];
+    _eventDispatcher = bridge.eventDispatcher;
 
     _nativeTouches = [NSMutableOrderedSet new];
     _reactTouches = [NSMutableArray new];
diff --git a/React/CoreModules/BUCK b/React/CoreModules/BUCK
index 2170d80b1f9253..d1bac10dab96eb 100644
--- a/React/CoreModules/BUCK
+++ b/React/CoreModules/BUCK
@@ -117,6 +117,9 @@ rn_apple_library(
         ) + react_module_plugin_providers(
             name = "DevSplitBundleLoader",
             native_class_func = "RCTDevSplitBundleLoaderCls",
+        ) + react_module_plugin_providers(
+            name = "EventDispatcher",
+            native_class_func = "RCTEventDispatcherCls",
         ),
     plugins_header = "FBCoreModulesPlugins.h",
     preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_preprocessor_flags_for_build_mode() + rn_extra_build_flags() + [
diff --git a/React/CoreModules/CoreModulesPlugins.h b/React/CoreModules/CoreModulesPlugins.h
index b8fa8e9f0767ed..0dd21309bceedd 100644
--- a/React/CoreModules/CoreModulesPlugins.h
+++ b/React/CoreModules/CoreModulesPlugins.h
@@ -53,6 +53,7 @@ Class RCTWebSocketExecutorCls(void) __attribute__((used));
 Class RCTWebSocketModuleCls(void) __attribute__((used));
 Class RCTDevLoadingViewCls(void) __attribute__((used));
 Class RCTDevSplitBundleLoaderCls(void) __attribute__((used));
+Class RCTEventDispatcherCls(void) __attribute__((used));
 
 #ifdef __cplusplus
 }
diff --git a/React/CoreModules/CoreModulesPlugins.mm b/React/CoreModules/CoreModulesPlugins.mm
index de47e923f813d7..c2d1b268b4fa6a 100644
--- a/React/CoreModules/CoreModulesPlugins.mm
+++ b/React/CoreModules/CoreModulesPlugins.mm
@@ -42,6 +42,7 @@ Class RCTCoreModulesClassProvider(const char *name) {
     {"WebSocketModule", RCTWebSocketModuleCls},
     {"DevLoadingView", RCTDevLoadingViewCls},
     {"DevSplitBundleLoader", RCTDevSplitBundleLoaderCls},
+    {"EventDispatcher", RCTEventDispatcherCls},
   };
 
   auto p = sCoreModuleClassMap.find(name);
diff --git a/React/CoreModules/RCTAccessibilityManager.mm b/React/CoreModules/RCTAccessibilityManager.mm
index 3f6098e66aba7e..fc1741c21ee7e4 100644
--- a/React/CoreModules/RCTAccessibilityManager.mm
+++ b/React/CoreModules/RCTAccessibilityManager.mm
@@ -10,7 +10,7 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge.h>
 #import <React/RCTConvert.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
 
diff --git a/React/CoreModules/RCTAppState.mm b/React/CoreModules/RCTAppState.mm
index b0dc10bce5ad6d..5fc28ef71c875f 100644
--- a/React/CoreModules/RCTAppState.mm
+++ b/React/CoreModules/RCTAppState.mm
@@ -10,7 +10,7 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTAssert.h>
 #import <React/RCTBridge.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTUtils.h>
 
 #import "CoreModulesPlugins.h"
diff --git a/React/CoreModules/RCTDevSettings.mm b/React/CoreModules/RCTDevSettings.mm
index 4bf03630201fe0..4e11bd3c263669 100644
--- a/React/CoreModules/RCTDevSettings.mm
+++ b/React/CoreModules/RCTDevSettings.mm
@@ -12,7 +12,7 @@
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTBridgeModule.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTProfile.h>
 #import <React/RCTReloadCommand.h>
diff --git a/React/CoreModules/RCTDeviceInfo.mm b/React/CoreModules/RCTDeviceInfo.mm
index 829821acc573ad..d70f6310362a56 100644
--- a/React/CoreModules/RCTDeviceInfo.mm
+++ b/React/CoreModules/RCTDeviceInfo.mm
@@ -11,7 +11,7 @@
 #import <React/RCTAccessibilityManager.h>
 #import <React/RCTAssert.h>
 #import <React/RCTConstants.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTUIUtils.h>
 #import <React/RCTUtils.h>
 
diff --git a/React/CoreModules/RCTEventDispatcher.h b/React/CoreModules/RCTEventDispatcher.h
new file mode 100644
index 00000000000000..e15c20723252dd
--- /dev/null
+++ b/React/CoreModules/RCTEventDispatcher.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import <UIKit/UIKit.h>
+
+#import <React/RCTBridge.h>
+#import <React/RCTEventDispatcherProtocol.h>
+/**
+ * This class wraps the -[RCTBridge enqueueJSCall:args:] method, and
+ * provides some convenience methods for generating event calls.
+ */
+@interface RCTEventDispatcher : NSObject <RCTEventDispatcherProtocol>
+@end
diff --git a/React/CoreModules/RCTEventDispatcher.mm b/React/CoreModules/RCTEventDispatcher.mm
new file mode 100644
index 00000000000000..180815b964bb1d
--- /dev/null
+++ b/React/CoreModules/RCTEventDispatcher.mm
@@ -0,0 +1,232 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#import "RCTEventDispatcher.h"
+
+#import <React/RCTAssert.h>
+#import <React/RCTBridge+Private.h>
+#import <React/RCTBridge.h>
+#import <React/RCTComponentEvent.h>
+#import <React/RCTProfile.h>
+#import <React/RCTUtils.h>
+#import <ReactCommon/RCTTurboModule.h>
+
+#import "CoreModulesPlugins.h"
+
+static NSNumber *RCTGetEventID(NSNumber *viewTag, NSString *eventName, uint16_t coalescingKey)
+{
+  return @(viewTag.intValue | (((uint64_t)eventName.hash & 0xFFFF) << 32) | (((uint64_t)coalescingKey) << 48));
+}
+
+static uint16_t RCTUniqueCoalescingKeyGenerator = 0;
+
+@interface RCTEventDispatcher () <RCTTurboModule>
+@end
+
+@implementation RCTEventDispatcher {
+  // We need this lock to protect access to _events, _eventQueue and _eventsDispatchScheduled. It's filled in on main
+  // thread and consumed on js thread.
+  NSLock *_eventQueueLock;
+  // We have this id -> event mapping so we coalesce effectively.
+  NSMutableDictionary<NSNumber *, id<RCTEvent>> *_events;
+  // This array contains ids of events in order they come in, so we can emit them to JS in the exact same order.
+  NSMutableArray<NSNumber *> *_eventQueue;
+  BOOL _eventsDispatchScheduled;
+  NSHashTable<id<RCTEventDispatcherObserver>> *_observers;
+  NSLock *_observersLock;
+}
+
+@synthesize bridge = _bridge;
+@synthesize dispatchToJSThread = _dispatchToJSThread;
+@synthesize invokeJS = _invokeJS;
+@synthesize invokeJSWithModuleDotMethod = _invokeJSWithModuleDotMethod;
+
+RCT_EXPORT_MODULE()
+
+- (void)setBridge:(RCTBridge *)bridge
+{
+  _bridge = bridge;
+  _events = [NSMutableDictionary new];
+  _eventQueue = [NSMutableArray new];
+  _eventQueueLock = [NSLock new];
+  _eventsDispatchScheduled = NO;
+  _observers = [NSHashTable weakObjectsHashTable];
+  _observersLock = [NSLock new];
+}
+
+- (void)sendAppEventWithName:(NSString *)name body:(id)body
+{
+  if (_bridge) {
+    [_bridge enqueueJSCall:@"RCTNativeAppEventEmitter"
+                    method:@"emit"
+                      args:body ? @[ name, body ] : @[ name ]
+                completion:NULL];
+  } else {
+    _invokeJS(@"RCTNativeAppEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
+  }
+}
+
+- (void)sendDeviceEventWithName:(NSString *)name body:(id)body
+{
+  if (_bridge) {
+    [_bridge enqueueJSCall:@"RCTDeviceEventEmitter"
+                    method:@"emit"
+                      args:body ? @[ name, body ] : @[ name ]
+                completion:NULL];
+  } else {
+    _invokeJS(@"RCTDeviceEventEmitter", @"emit", body ? @[ name, body ] : @[ name ]);
+  }
+}
+
+- (void)sendTextEventWithType:(RCTTextEventType)type
+                     reactTag:(NSNumber *)reactTag
+                         text:(NSString *)text
+                          key:(NSString *)key
+                   eventCount:(NSInteger)eventCount
+{
+  static NSString *events[] = {@"focus", @"blur", @"change", @"submitEditing", @"endEditing", @"keyPress"};
+
+  NSMutableDictionary *body = [[NSMutableDictionary alloc] initWithDictionary:@{
+    @"eventCount" : @(eventCount),
+  }];
+
+  if (text) {
+    body[@"text"] = text;
+  }
+
+  if (key) {
+    if (key.length == 0) {
+      key = @"Backspace"; // backspace
+    } else {
+      switch ([key characterAtIndex:0]) {
+        case '\t':
+          key = @"Tab";
+          break;
+        case '\n':
+          key = @"Enter";
+        default:
+          break;
+      }
+    }
+    body[@"key"] = key;
+  }
+
+  RCTComponentEvent *event = [[RCTComponentEvent alloc] initWithName:events[type] viewTag:reactTag body:body];
+  [self sendEvent:event];
+}
+
+- (void)sendEvent:(id<RCTEvent>)event
+{
+  [_observersLock lock];
+
+  for (id<RCTEventDispatcherObserver> observer in _observers) {
+    [observer eventDispatcherWillDispatchEvent:event];
+  }
+
+  [_observersLock unlock];
+
+  [_eventQueueLock lock];
+
+  NSNumber *eventID;
+  if (event.canCoalesce) {
+    eventID = RCTGetEventID(event.viewTag, event.eventName, event.coalescingKey);
+    id<RCTEvent> previousEvent = _events[eventID];
+    if (previousEvent) {
+      event = [previousEvent coalesceWithEvent:event];
+    } else {
+      [_eventQueue addObject:eventID];
+    }
+  } else {
+    id<RCTEvent> previousEvent = _events[eventID];
+    eventID = RCTGetEventID(event.viewTag, event.eventName, RCTUniqueCoalescingKeyGenerator++);
+    RCTAssert(
+        previousEvent == nil,
+        @"Got event %@ which cannot be coalesced, but has the same eventID %@ as the previous event %@",
+        event,
+        eventID,
+        previousEvent);
+    [_eventQueue addObject:eventID];
+  }
+
+  _events[eventID] = event;
+
+  BOOL scheduleEventsDispatch = NO;
+  if (!_eventsDispatchScheduled) {
+    _eventsDispatchScheduled = YES;
+    scheduleEventsDispatch = YES;
+  }
+
+  // We have to release the lock before dispatching block with events,
+  // since dispatchBlock: can be executed synchronously on the same queue.
+  // (This is happening when chrome debugging is turned on.)
+  [_eventQueueLock unlock];
+
+  if (scheduleEventsDispatch) {
+    if (_bridge) {
+      [_bridge
+          dispatchBlock:^{
+            [self flushEventsQueue];
+          }
+                  queue:RCTJSThread];
+    } else if (_dispatchToJSThread) {
+      _dispatchToJSThread(^{
+        [self flushEventsQueue];
+      });
+    }
+  }
+}
+
+- (void)addDispatchObserver:(id<RCTEventDispatcherObserver>)observer
+{
+  [_observersLock lock];
+  [_observers addObject:observer];
+  [_observersLock unlock];
+}
+
+- (void)removeDispatchObserver:(id<RCTEventDispatcherObserver>)observer
+{
+  [_observersLock lock];
+  [_observers removeObject:observer];
+  [_observersLock unlock];
+}
+
+- (void)dispatchEvent:(id<RCTEvent>)event
+{
+  if (_bridge) {
+    [_bridge enqueueJSCall:[[event class] moduleDotMethod] args:[event arguments]];
+  } else {
+    _invokeJSWithModuleDotMethod([[event class] moduleDotMethod], [event arguments]);
+  }
+}
+
+- (dispatch_queue_t)methodQueue
+{
+  return RCTJSThread;
+}
+
+// js thread only (which surprisingly can be the main thread, depends on used JS executor)
+- (void)flushEventsQueue
+{
+  [_eventQueueLock lock];
+  NSDictionary *events = _events;
+  _events = [NSMutableDictionary new];
+  NSMutableArray *eventQueue = _eventQueue;
+  _eventQueue = [NSMutableArray new];
+  _eventsDispatchScheduled = NO;
+  [_eventQueueLock unlock];
+
+  for (NSNumber *eventId in eventQueue) {
+    [self dispatchEvent:events[eventId]];
+  }
+}
+
+@end
+
+Class RCTEventDispatcherCls(void)
+{
+  return RCTEventDispatcher.class;
+}
diff --git a/React/CoreModules/RCTKeyboardObserver.mm b/React/CoreModules/RCTKeyboardObserver.mm
index 93c853f7acc423..072df8ce3d7efe 100644
--- a/React/CoreModules/RCTKeyboardObserver.mm
+++ b/React/CoreModules/RCTKeyboardObserver.mm
@@ -8,7 +8,7 @@
 #import "RCTKeyboardObserver.h"
 
 #import <FBReactNativeSpec/FBReactNativeSpec.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 #import "CoreModulesPlugins.h"
 
diff --git a/React/CoreModules/RCTRedBox.mm b/React/CoreModules/RCTRedBox.mm
index 9fec829b0157e2..64c9e33289460b 100644
--- a/React/CoreModules/RCTRedBox.mm
+++ b/React/CoreModules/RCTRedBox.mm
@@ -12,7 +12,7 @@
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
 #import <React/RCTErrorInfo.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTJSStackFrame.h>
 #import <React/RCTRedBoxExtraDataViewController.h>
 #import <React/RCTRedBoxSetEnabled.h>
diff --git a/React/CoreModules/RCTStatusBarManager.mm b/React/CoreModules/RCTStatusBarManager.mm
index 4104a7081512c0..c40fdd4379e03e 100644
--- a/React/CoreModules/RCTStatusBarManager.mm
+++ b/React/CoreModules/RCTStatusBarManager.mm
@@ -8,7 +8,7 @@
 #import "RCTStatusBarManager.h"
 #import "CoreModulesPlugins.h"
 
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTUtils.h>
 
diff --git a/React/Modules/RCTUIManager.m b/React/Modules/RCTUIManager.m
index 8f43fd3f3b1c04..b6dfefa3e60d4c 100644
--- a/React/Modules/RCTUIManager.m
+++ b/React/Modules/RCTUIManager.m
@@ -17,7 +17,7 @@
 #import "RCTComponentData.h"
 #import "RCTConvert.h"
 #import "RCTDefines.h"
-#import "RCTEventDispatcher.h"
+#import "RCTEventDispatcherProtocol.h"
 #import "RCTLayoutAnimation.h"
 #import "RCTLayoutAnimationGroup.h"
 #import "RCTLog.h"
diff --git a/React/Views/RCTDatePickerManager.m b/React/Views/RCTDatePickerManager.m
index 198a4ef77ef772..38f662463f6b3a 100644
--- a/React/Views/RCTDatePickerManager.m
+++ b/React/Views/RCTDatePickerManager.m
@@ -10,7 +10,6 @@
 #import <React/RCTUIManager.h>
 #import "RCTBridge.h"
 #import "RCTDatePicker.h"
-#import "RCTEventDispatcher.h"
 #import "UIView+React.h"
 
 @implementation RCTConvert (UIDatePicker)
diff --git a/React/Views/RCTSegmentedControl.m b/React/Views/RCTSegmentedControl.m
index 10c1c745a59964..1ffdb59921a383 100644
--- a/React/Views/RCTSegmentedControl.m
+++ b/React/Views/RCTSegmentedControl.m
@@ -8,7 +8,6 @@
 #import "RCTSegmentedControl.h"
 
 #import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
 #import "UIView+React.h"
 
 @implementation RCTSegmentedControl
diff --git a/React/Views/RCTSliderManager.m b/React/Views/RCTSliderManager.m
index a3a6795957505a..e2c2810110214b 100644
--- a/React/Views/RCTSliderManager.m
+++ b/React/Views/RCTSliderManager.m
@@ -8,7 +8,6 @@
 #import "RCTSliderManager.h"
 
 #import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
 #import "RCTSlider.h"
 #import "UIView+React.h"
 
diff --git a/React/Views/RCTSwitch.m b/React/Views/RCTSwitch.m
index 80475480d13801..8abd4d5afba92b 100644
--- a/React/Views/RCTSwitch.m
+++ b/React/Views/RCTSwitch.m
@@ -7,7 +7,6 @@
 
 #import "RCTSwitch.h"
 
-#import "RCTEventDispatcher.h"
 #import "UIView+React.h"
 
 @implementation RCTSwitch
diff --git a/React/Views/RCTSwitchManager.m b/React/Views/RCTSwitchManager.m
index 2ea446fac9f5dc..f37df49c4dfadc 100644
--- a/React/Views/RCTSwitchManager.m
+++ b/React/Views/RCTSwitchManager.m
@@ -9,7 +9,6 @@
 
 #import <React/RCTUIManager.h>
 #import "RCTBridge.h"
-#import "RCTEventDispatcher.h"
 #import "RCTSwitch.h"
 #import "UIView+React.h"
 
diff --git a/React/Views/RCTViewManager.h b/React/Views/RCTViewManager.h
index b35ceb23f73239..5c1eba4d80a935 100644
--- a/React/Views/RCTViewManager.h
+++ b/React/Views/RCTViewManager.h
@@ -10,7 +10,7 @@
 #import <React/RCTBridgeModule.h>
 #import <React/RCTConvert.h>
 #import <React/RCTDefines.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/UIView+React.h>
 
diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
index ee6c41fee1cc2b..48dcd0a06ce4a3 100644
--- a/React/Views/RCTViewManager.m
+++ b/React/Views/RCTViewManager.m
@@ -11,7 +11,6 @@
 #import "RCTBridge.h"
 #import "RCTConvert+Transform.h"
 #import "RCTConvert.h"
-#import "RCTEventDispatcher.h"
 #import "RCTLog.h"
 #import "RCTShadowView.h"
 #import "RCTUIManager.h"
diff --git a/React/Views/RCTWrapperViewController.m b/React/Views/RCTWrapperViewController.m
index fc9eaa6c507275..20dd2101e9180a 100644
--- a/React/Views/RCTWrapperViewController.m
+++ b/React/Views/RCTWrapperViewController.m
@@ -10,14 +10,12 @@
 #import <UIKit/UIScrollView.h>
 
 #import "RCTAutoInsetsProtocol.h"
-#import "RCTEventDispatcher.h"
 #import "RCTUtils.h"
 #import "UIView+React.h"
 
 @implementation RCTWrapperViewController {
   UIView *_wrapperView;
   UIView *_contentView;
-  RCTEventDispatcher *_eventDispatcher;
   CGFloat _previousTopLayoutLength;
   CGFloat _previousBottomLayoutLength;
 
diff --git a/React/Views/ScrollView/RCTScrollEvent.h b/React/Views/ScrollView/RCTScrollEvent.h
index 8494f0e6e8035e..29a645d30c697e 100644
--- a/React/Views/ScrollView/RCTScrollEvent.h
+++ b/React/Views/ScrollView/RCTScrollEvent.h
@@ -6,7 +6,7 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 
 @interface RCTScrollEvent : NSObject <RCTEvent>
 
diff --git a/React/Views/ScrollView/RCTScrollView.h b/React/Views/ScrollView/RCTScrollView.h
index d5ac000284e4fa..4a508ee1e9d8a2 100644
--- a/React/Views/ScrollView/RCTScrollView.h
+++ b/React/Views/ScrollView/RCTScrollView.h
@@ -8,7 +8,8 @@
 #import <UIKit/UIScrollView.h>
 
 #import <React/RCTAutoInsetsProtocol.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTDefines.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTScrollableProtocol.h>
 #import <React/RCTView.h>
 
@@ -16,7 +17,7 @@
 
 @interface RCTScrollView : RCTView <UIScrollViewDelegate, RCTScrollableProtocol, RCTAutoInsetsProtocol>
 
-- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher NS_DESIGNATED_INITIALIZER;
 
 /**
  * The `RCTScrollView` may have at most one single subview. This will ensure
@@ -71,11 +72,4 @@
 
 @end
 
-@interface RCTEventDispatcher (RCTScrollView)
-
-/**
- * Send a fake scroll event.
- */
-- (void)sendFakeScrollEvent:(NSNumber *)reactTag;
-
-@end
+RCT_EXTERN void RCTSendFakeScrollEvent(id<RCTEventDispatcherProtocol> eventDispatcher, NSNumber *reactTag);
diff --git a/React/Views/ScrollView/RCTScrollView.m b/React/Views/ScrollView/RCTScrollView.m
index 8bdb3bb461d267..c52f449c730015 100644
--- a/React/Views/ScrollView/RCTScrollView.m
+++ b/React/Views/ScrollView/RCTScrollView.m
@@ -261,7 +261,7 @@ @interface RCTScrollView () <RCTUIManagerObserver>
 @end
 
 @implementation RCTScrollView {
-  RCTEventDispatcher *_eventDispatcher;
+  id<RCTEventDispatcherProtocol> _eventDispatcher;
   CGRect _prevFirstVisibleFrame;
   __weak UIView *_firstVisibleView;
   RCTCustomScrollView *_scrollView;
@@ -275,7 +275,7 @@ @implementation RCTScrollView {
   NSHashTable *_scrollListeners;
 }
 
-- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
+- (instancetype)initWithEventDispatcher:(id<RCTEventDispatcherProtocol>)eventDispatcher
 {
   RCTAssertParam(eventDispatcher);
 
@@ -1022,9 +1022,7 @@ - (void)sendScrollEventWithName:(NSString *)eventName
 
 @end
 
-@implementation RCTEventDispatcher (RCTScrollView)
-
-- (void)sendFakeScrollEvent:(NSNumber *)reactTag
+void RCTSendFakeScrollEvent(id<RCTEventDispatcherProtocol> eventDispatcher, NSNumber *reactTag)
 {
   // Use the selector here in case the onScroll block property is ever renamed
   NSString *eventName = NSStringFromSelector(@selector(onScroll));
@@ -1037,7 +1035,5 @@ - (void)sendFakeScrollEvent:(NSNumber *)reactTag
                                                           scrollViewZoomScale:0
                                                                      userData:nil
                                                                 coalescingKey:0];
-  [self sendEvent:fakeScrollEvent];
+  [eventDispatcher sendEvent:fakeScrollEvent];
 }
-
-@end
diff --git a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
index d8f1b4abf4ed7b..3e962334bf9c7f 100644
--- a/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
+++ b/ReactCommon/react/renderer/components/legacyviewmanagerinterop/RCTLegacyViewManagerInteropCoordinator.mm
@@ -9,6 +9,7 @@
 #include <React/RCTBridge+Private.h>
 #include <React/RCTBridgeMethod.h>
 #include <React/RCTComponentData.h>
+#include <React/RCTEventDispatcherProtocol.h>
 #include <React/RCTFollyConvert.h>
 #include <React/RCTModuleData.h>
 #include <React/RCTUIManager.h>
diff --git a/packages/rn-tester/RCTTest/RCTTestModule.mm b/packages/rn-tester/RCTTest/RCTTestModule.mm
index a0bfe8e1390f33..33e5f090983ebd 100644
--- a/packages/rn-tester/RCTTest/RCTTestModule.mm
+++ b/packages/rn-tester/RCTTest/RCTTestModule.mm
@@ -8,7 +8,7 @@
 #import "RCTTestModule.h"
 
 #import <React/RCTAssert.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTLog.h>
 #import <React/RCTUIManager.h>
 #import <ReactCommon/RCTTurboModule.h>
diff --git a/packages/rn-tester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m b/packages/rn-tester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
index 690f86493a5e46..a6d374f935a2c7 100644
--- a/packages/rn-tester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
+++ b/packages/rn-tester/RNTesterIntegrationTests/RCTRootViewIntegrationTests.m
@@ -9,7 +9,7 @@
 #import <XCTest/XCTest.h>
 
 #import <RCTTest/RCTTestRunner.h>
-#import <React/RCTEventDispatcher.h>
+#import <React/RCTEventDispatcherProtocol.h>
 #import <React/RCTRootView.h>
 #import <React/RCTRootViewDelegate.h>
 

From cd6ebcdd82f23fe0d867c4c8e0267617bb6c05d6 Mon Sep 17 00:00:00 2001
From: Paige Sun <paigesun@fb.com>
Date: Wed, 14 Oct 2020 03:12:50 -0700
Subject: [PATCH 232/241] Set MobileConfig for Fabric logging in FBReactModule

Summary: Changelog: [RN][iOS] Allow gate to be set for Fabric logging from the React Module

Reviewed By: fkgozali

Differential Revision: D24256546

fbshipit-source-id: 7b290efb9abd3035559f743e6e5b6701e02053e1
---
 Libraries/Image/RCTImageLoader.mm                    | 12 ++++++++++++
 .../Image/RCTImageLoaderWithAttributionProtocol.h    |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/Libraries/Image/RCTImageLoader.mm b/Libraries/Image/RCTImageLoader.mm
index 723b64dbe6184b..6ff74f17f15c81 100644
--- a/Libraries/Image/RCTImageLoader.mm
+++ b/Libraries/Image/RCTImageLoader.mm
@@ -38,6 +38,18 @@ void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled)
   imagePerfInstrumentationEnabled = enabled;
 }
 
+static BOOL (^getImagePerfInstrumentationForFabricEnabled)() = (^BOOL () {
+  return NO;
+});
+
+BOOL RCTGetImageLoadingPerfInstrumentationForFabricEnabled() {
+  return getImagePerfInstrumentationForFabricEnabled();
+}
+
+void RCTSetImageLoadingPerfInstrumentationForFabricEnabledBlock(BOOL (^getMobileConfigEnabled)()) {
+  getImagePerfInstrumentationForFabricEnabled = getMobileConfigEnabled;
+}
+
 static NSInteger RCTImageBytesForImage(UIImage *image)
 {
   NSInteger singleImageBytes = image.size.width * image.size.height * image.scale * image.scale * 4;
diff --git a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
index 44f4ee849a4a75..ee546a9b72357d 100644
--- a/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
+++ b/Libraries/Image/RCTImageLoaderWithAttributionProtocol.h
@@ -16,6 +16,9 @@ RCT_EXTERN BOOL RCTImageLoadingPerfInstrumentationEnabled(void);
 RCT_EXTERN void RCTEnableImageLoadingInstrumentation(BOOL enabled);
 RCT_EXTERN void RCTEnableImageLoadingPerfInstrumentation(BOOL enabled);
 
+RCT_EXTERN BOOL RCTGetImageLoadingPerfInstrumentationForFabricEnabled();
+RCT_EXTERN void RCTSetImageLoadingPerfInstrumentationForFabricEnabledBlock(BOOL (^getEnabled)());
+
 @protocol RCTImageLoaderWithAttributionProtocol<RCTImageLoaderProtocol, RCTImageLoaderInstrumentableProtocol>
 
 // TODO (T61325135): Remove C++ checks

From 38eb3f8dcb4a2a1e24d27916e23330537336dfc6 Mon Sep 17 00:00:00 2001
From: Paige Sun <paigesun@fb.com>
Date: Wed, 14 Oct 2020 11:23:04 -0700
Subject: [PATCH 233/241] Fix: Set image loader module name synchronously

Summary: Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24290066

fbshipit-source-id: e2bad9ed8c126c7b49356bc7a2c1114160149fd3
---
 .../imagemanager/platform/ios/RCTImageManager.mm  | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
index 08e0c255885d3f..b0062c9c192e62 100644
--- a/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
+++ b/ReactCommon/react/renderer/imagemanager/platform/ios/RCTImageManager.mm
@@ -49,6 +49,13 @@ - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfa
   auto sharedCancelationFunction = SharedFunction<>();
   imageRequest.setCancelationFunction(sharedCancelationFunction);
 
+  NSURLRequest *request = NSURLRequestFromImageSource(imageSource);
+  BOOL hasModuleName = [self->_imageLoader respondsToSelector:@selector(loaderModuleNameForRequestUrl:)];
+  NSString *moduleName = hasModuleName ? [self->_imageLoader loaderModuleNameForRequestUrl:request.URL] : nil;
+  std::string moduleCString =
+      std::string([moduleName UTF8String], [moduleName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
+  telemetry->setLoaderModuleName(moduleCString);
+
   /*
    * Even if an image is being loaded asynchronously on some other background thread, some other preparation
    * work (such as creating an `NSURLRequest` object and some obscure logic inside `RCTImageLoader`) can take a couple
@@ -60,14 +67,6 @@ - (ImageRequest)requestImage:(ImageSource)imageSource surfaceId:(SurfaceId)surfa
    * T46024425 for more details.
    */
   dispatch_async(_backgroundSerialQueue, ^{
-    NSURLRequest *request = NSURLRequestFromImageSource(imageSource);
-
-    BOOL hasModuleName = [self->_imageLoader respondsToSelector:@selector(loaderModuleNameForRequestUrl:)];
-    NSString *moduleName = hasModuleName ? [self->_imageLoader loaderModuleNameForRequestUrl:request.URL] : nil;
-    std::string moduleCString =
-        std::string([moduleName UTF8String], [moduleName lengthOfBytesUsingEncoding:NSUTF8StringEncoding]);
-    telemetry->setLoaderModuleName(moduleCString);
-
     auto completionBlock = ^(NSError *error, UIImage *image, id metadata) {
       auto observerCoordinator = weakObserverCoordinator.lock();
       if (!observerCoordinator) {

From fb14fd42b3a35b9f587631952f5329c8ae27a4b6 Mon Sep 17 00:00:00 2001
From: Lorenzo Sciandra <notkelset@kelset.dev>
Date: Wed, 14 Oct 2020 12:03:36 -0700
Subject: [PATCH 234/241] Chore: Upgrade Detox to 16.7.2 (#30084)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
With Xcode 12 being the latest, Detox 15.x has issues - in particular, it means that if you try to `yarn install` the dependencies for the repo, you'll be greeted by this error:

```bash
error /<stuff>/react-native/node_modules/detox: Command failed.
Exit code: 1
Command: node scripts/postinstall.js
Arguments:
Directory: /<stuff>/react-native/node_modules/detox
Output:
/<stuff>/Library/Detox/ios/5824c837515589f21c08f09b716a6eda088aa31f was found, but could not find Detox.framework inside it. This means that the Detox framework build process was interrupted.
         deleting /<stuff>/Library/Detox/ios/5824c837515589f21c08f09b716a6eda088aa31f and trying to rebuild.
Extracting Detox sources...
Building Detox.framework from /<stuff>/Developer/OSS/react-native/node_modules/detox/ios_src...
child_process.js:637
    throw err;
    ^
```

With the {emoji:1f44d} of hramos & alloy I've prep'd up a small defensive PR that can be quickly merged before cutting 0.64, that bumps the version of Detox from 15.4.4 to the highest version available within the reach of "no breaking changes" in changelog.

The main reason why with 16.x this error doesn't happen is that from [16.0.0](https://github.com/wix/Detox/releases/tag/16.0.0):

> Detox now comes as a prebuilt framework on iOS, thus lowering npm install times and saving some build issues that happen due to unexpected Xcode setups.

It would have been better to update directly to latest (at the time of writing 17.7.1) but there are at least two versions that had changelogs that seem to involve bigger changes:

* https://github.com/wix/Detox/releases/tag/17.4.7
* https://github.com/wix/Detox/releases/tag/16.8.0

Hopefully CI will will show that the bump doesn't break any test �

## Changelog

<!-- Help reviewers and the release process by writing your own changelog entry. For an example, see:
https://github.com/facebook/react-native/wiki/Changelog
-->

[Internal] [Changed] - Bumped Detox in the repo to 16.7.2 for Xcode 12 compatibility

Pull Request resolved: https://github.com/facebook/react-native/pull/30084

Test Plan: Running yarn in the main repo with Node 14 & Xcode 12, without this change, will cause the error copy-pasted above. After upgrading to this version, the error disappear.

Reviewed By: cpojer

Differential Revision: D24293226

Pulled By: hramos

fbshipit-source-id: 2b4d23b033be621274966262ec19200bee44df58
---
 packages/rn-tester/package.json |  2 +-
 repo-config/package.json        |  2 +-
 yarn.lock                       | 29 +++++++++++++++--------------
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/packages/rn-tester/package.json b/packages/rn-tester/package.json
index ba5cec706139d5..189b0e3824743b 100644
--- a/packages/rn-tester/package.json
+++ b/packages/rn-tester/package.json
@@ -19,7 +19,7 @@
   },
   "devDependencies": {
     "connect": "^3.6.5",
-    "detox": "15.4.4",
+    "detox": "16.7.2",
     "ws": "^6.1.4"
   }
 }
diff --git a/repo-config/package.json b/repo-config/package.json
index 785bcfbb1578d5..f937aacf7e5eef 100644
--- a/repo-config/package.json
+++ b/repo-config/package.json
@@ -18,7 +18,7 @@
     "clang-format": "^1.2.4",
     "connect": "^3.6.5",
     "coveralls": "^3.0.2",
-    "detox": "15.4.4",
+    "detox": "16.7.2",
     "eslint": "6.8.0",
     "eslint-config-fb-strict": "^24.9.0",
     "eslint-config-fbjs": "2.1.0",
diff --git a/yarn.lock b/yarn.lock
index a6ac71b916bf86..f1457aa090f4e7 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1723,10 +1723,10 @@ big-integer@^1.6.7:
   resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.36.tgz#78631076265d4ae3555c04f85e7d9d2f3a071a36"
   integrity sha512-t70bfa7HYEA1D9idDbmuv7YbsbVkQ+Hp+8KFSul4aE5e/i1bjCNIRYJZlA8Q8p0r9T8cF/RVvwUgRA//FydEyg==
 
-bluebird@3.5.x:
-  version "3.5.2"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.2.tgz#1be0908e054a751754549c270489c1505d4ab15a"
-  integrity sha512-dhHTWMI7kMx5whMQntl7Vr9C6BvV10lFXDAasnqnrMYhXVCzzk6IO9Fo2L75jXHT07WrOngL1WDXOp+yYS91Yg==
+bluebird@^3.5.4:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
 
 bplist-creator@0.0.7:
   version "0.0.7"
@@ -2387,16 +2387,17 @@ detect-newline@^3.0.0:
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-3.1.0.tgz#576f5dfc63ae1a192ff192d8ad3af6308991b651"
   integrity sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==
 
-detox@15.4.4:
-  version "15.4.4"
-  resolved "https://registry.yarnpkg.com/detox/-/detox-15.4.4.tgz#0f56b0eb9dd81b65e9bd6b3a8730f323dd6cd897"
-  integrity sha512-mbsw/REE3yDuq+0fbPZSktfV5OVO/80LMHsistgKUcBEEM3BrwLkZsji8a7syJj9tiDo+SsUjEzXGhQwDLlitA==
+detox@16.7.2:
+  version "16.7.2"
+  resolved "https://registry.yarnpkg.com/detox/-/detox-16.7.2.tgz#531c98416adf52d4ba95601b669969acadafb970"
+  integrity sha512-+837eRgk4xOewXmeF5H6vOTn0RbKUFIyCi5UsTXEhvplsMk+KrrqfKik2j8fvubJkByry7HqIN/JF9jKe+meIQ==
   dependencies:
     "@babel/core" "^7.4.5"
     bunyan "^1.8.12"
     bunyan-debug-stream "^1.1.0"
     chalk "^2.4.2"
     child-process-promise "^2.2.0"
+    find-up "^4.1.0"
     fs-extra "^4.0.2"
     funpermaproxy "^1.0.1"
     get-port "^2.1.0"
@@ -2407,7 +2408,7 @@ detox@15.4.4:
     sanitize-filename "^1.6.1"
     shell-utils "^1.0.9"
     tail "^2.0.0"
-    telnet-client "0.15.3"
+    telnet-client "1.2.8"
     tempfile "^2.0.0"
     which "^1.3.1"
     ws "^3.3.1"
@@ -6781,12 +6782,12 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-telnet-client@0.15.3:
-  version "0.15.3"
-  resolved "https://registry.yarnpkg.com/telnet-client/-/telnet-client-0.15.3.tgz#99ec754e4acf6fa51dc69898f574df3c2550712e"
-  integrity sha512-GSfdzQV0BKIYsmeXq7bJFJ2wHeJud6icaIxCUf6QCGQUD6R0BBGbT1+yLDhq67JRdgRpwyPwUbV7JxFeRrZomQ==
+telnet-client@1.2.8:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/telnet-client/-/telnet-client-1.2.8.tgz#946c0dadc8daa3f19bb40a3e898cb870403a4ca4"
+  integrity sha512-W+w4k3QAmULVNhBVT2Fei369kGZCh/TH25M7caJAXW+hLxwoQRuw0di3cX4l0S9fgH3Mvq7u+IFMoBDpEw/eIg==
   dependencies:
-    bluebird "3.5.x"
+    bluebird "^3.5.4"
 
 temp-dir@^1.0.0:
   version "1.0.0"

From 82187bfb6b54fdffc5dadaa56e8bf97d2209708a Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Wed, 14 Oct 2020 21:03:11 -0700
Subject: [PATCH 235/241] Dispatch events even when there are no listeners

Summary:
## Rationale
For every 1 call to RCTNetworking.sendRequest, we execute 6 calls to RCTNetworking.addListener. This is followed by at least one call to RCTNetworking.removeListeners. Aside from incrementing and decrementing the `_listeners` integer, these two methods accomplish nothing else: RCTNetworking doesn't implement the `startObserving` and `stopObserving` methods.

This diff makes RCTEventEmitter dispatch events without looking at the listeners integer. In the future, this will allow us to stop making these ~8 unnecessary NativeModule calls for every Network request we send.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24272560

fbshipit-source-id: 7996eba5abfa4669a89c43a3ffa536c0faa214a8
---
 Libraries/Network/RCTNetworking.mm |  2 +-
 React/Modules/RCTEventEmitter.h    |  2 ++
 React/Modules/RCTEventEmitter.m    | 27 +++++++++++++++++++++++++--
 3 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Libraries/Network/RCTNetworking.mm b/Libraries/Network/RCTNetworking.mm
index c6fbe7092a72ba..edbbe814e6e57f 100644
--- a/Libraries/Network/RCTNetworking.mm
+++ b/Libraries/Network/RCTNetworking.mm
@@ -159,7 +159,7 @@ @implementation RCTNetworking
 
 - (instancetype)initWithHandlersProvider:(NSArray<id<RCTURLRequestHandler>> * (^)(void))getHandlers
 {
-  if (self = [super init]) {
+  if (self = [super initWithDisabledObservation]) {
     _handlersProvider = getHandlers;
   }
   return self;
diff --git a/React/Modules/RCTEventEmitter.h b/React/Modules/RCTEventEmitter.h
index f04d50f02418e4..f72f53909f4ba5 100644
--- a/React/Modules/RCTEventEmitter.h
+++ b/React/Modules/RCTEventEmitter.h
@@ -16,6 +16,8 @@
 
 @property (nonatomic, weak) RCTBridge *bridge;
 
+- (instancetype)initWithDisabledObservation;
+
 /**
  * Override this method to return an array of supported event names. Attempting
  * to observe or send an event that isn't included in this list will result in
diff --git a/React/Modules/RCTEventEmitter.m b/React/Modules/RCTEventEmitter.m
index 6e5a6ff37e7f5d..c3cc596e13ca18 100644
--- a/React/Modules/RCTEventEmitter.m
+++ b/React/Modules/RCTEventEmitter.m
@@ -12,6 +12,7 @@
 
 @implementation RCTEventEmitter {
   NSInteger _listenerCount;
+  BOOL _observationDisabled;
 }
 
 @synthesize invokeJS = _invokeJS;
@@ -32,6 +33,13 @@ + (void)initialize
   }
 }
 
+- (instancetype)initWithDisabledObservation
+{
+  self = [super init];
+  _observationDisabled = YES;
+  return self;
+}
+
 - (NSArray<NSString *> *)supportedEvents
 {
   return nil;
@@ -56,12 +64,15 @@ - (void)sendEventWithName:(NSString *)eventName body:(id)body
         [self class],
         [[self supportedEvents] componentsJoinedByString:@"`, `"]);
   }
-  if (_listenerCount > 0 && _bridge) {
+
+  BOOL shouldEmitEvent = (_observationDisabled || _listenerCount > 0);
+
+  if (shouldEmitEvent && _bridge) {
     [_bridge enqueueJSCall:@"RCTDeviceEventEmitter"
                     method:@"emit"
                       args:body ? @[ eventName, body ] : @[ eventName ]
                 completion:NULL];
-  } else if (_listenerCount > 0 && _invokeJS) {
+  } else if (shouldEmitEvent && _invokeJS) {
     _invokeJS(@"RCTDeviceEventEmitter", @"emit", body ? @[ eventName, body ] : @[ eventName ]);
   } else {
     RCTLogWarn(@"Sending `%@` with no listeners registered.", eventName);
@@ -80,6 +91,10 @@ - (void)stopObserving
 
 - (void)invalidate
 {
+  if (_observationDisabled) {
+    return;
+  }
+
   if (_listenerCount > 0) {
     [self stopObserving];
   }
@@ -87,6 +102,10 @@ - (void)invalidate
 
 RCT_EXPORT_METHOD(addListener : (NSString *)eventName)
 {
+  if (_observationDisabled) {
+    return;
+  }
+
   if (RCT_DEBUG && ![[self supportedEvents] containsObject:eventName]) {
     RCTLogError(
         @"`%@` is not a supported event type for %@. Supported events are: `%@`",
@@ -102,6 +121,10 @@ - (void)invalidate
 
 RCT_EXPORT_METHOD(removeListeners : (double)count)
 {
+  if (_observationDisabled) {
+    return;
+  }
+
   int currentCount = (int)count;
   if (RCT_DEBUG && currentCount > _listenerCount) {
     RCTLogError(@"Attempted to remove more %@ listeners than added", [self class]);

From dabca52f77799bcdedb6b0ec44b1f6297483a46d Mon Sep 17 00:00:00 2001
From: Ramanpreet Nara <ramanpreet@fb.com>
Date: Wed, 14 Oct 2020 21:03:11 -0700
Subject: [PATCH 236/241] Stop calling RCTNetworking.(add|remove)Listeners?

Summary:
RCTNetworking.startObserving and RCTNetworking.stopObserving don't exist. The main purpose of RCTEventEmitter.addListener is to call these methods, and increment the `_listeners` counter, so that we can start dispatching events when `_listeners > 0`. In D24272560, I made RCTEventEmitter dispatch events even when _listeners <= 0. This is sufficient for us to stop calling these two RCTNetworking methods entirely.

Changelog: [Internal]

Reviewed By: fkgozali

Differential Revision: D24272663

fbshipit-source-id: de9c968bc71e6e6d69a22b934644e6dfa3266b3f
---
 Libraries/EventEmitter/NativeEventEmitter.js | 22 ++++++++++++++++----
 Libraries/Network/RCTNetworking.ios.js       |  9 +++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/Libraries/EventEmitter/NativeEventEmitter.js b/Libraries/EventEmitter/NativeEventEmitter.js
index e04bc5f95d06c5..298a3eea2f8831 100644
--- a/Libraries/EventEmitter/NativeEventEmitter.js
+++ b/Libraries/EventEmitter/NativeEventEmitter.js
@@ -22,15 +22,29 @@ type NativeModule = {
   ...
 };
 
+type NativeEventEmitterOptions = $ReadOnly<{|
+  __SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: boolean,
+|}>;
+
+const DEFAULT_NATIVE_EVENT_EMITTER_OPTIONS = {
+  __SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: false,
+};
+
 /**
  * Abstract base class for implementing event-emitting modules. This implements
  * a subset of the standard EventEmitter node module API.
  */
 export default class NativeEventEmitter extends EventEmitter {
   _nativeModule: ?NativeModule;
+  _disableCallsIntoModule: boolean;
 
-  constructor(nativeModule: ?NativeModule) {
+  constructor(
+    nativeModule: ?NativeModule,
+    options: NativeEventEmitterOptions = DEFAULT_NATIVE_EVENT_EMITTER_OPTIONS,
+  ) {
     super(RCTDeviceEventEmitter.sharedSubscriber);
+    this._disableCallsIntoModule =
+      options.__SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED;
     if (Platform.OS === 'ios') {
       invariant(nativeModule, 'Native module cannot be null.');
       this._nativeModule = nativeModule;
@@ -42,7 +56,7 @@ export default class NativeEventEmitter extends EventEmitter {
     listener: Function,
     context: ?Object,
   ): EventSubscription {
-    if (this._nativeModule != null) {
+    if (this._nativeModule != null && !this._disableCallsIntoModule) {
       this._nativeModule.addListener(eventType);
     }
     return super.addListener(eventType, listener, context);
@@ -51,14 +65,14 @@ export default class NativeEventEmitter extends EventEmitter {
   removeAllListeners(eventType: string) {
     invariant(eventType, 'eventType argument is required.');
     const count = this.listenerCount(eventType);
-    if (this._nativeModule != null) {
+    if (this._nativeModule != null && !this._disableCallsIntoModule) {
       this._nativeModule.removeListeners(count);
     }
     super.removeAllListeners(eventType);
   }
 
   removeSubscription(subscription: EventSubscription) {
-    if (this._nativeModule != null) {
+    if (this._nativeModule != null && !this._disableCallsIntoModule) {
       this._nativeModule.removeListeners(1);
     }
     super.removeSubscription(subscription);
diff --git a/Libraries/Network/RCTNetworking.ios.js b/Libraries/Network/RCTNetworking.ios.js
index 92ef33394316a3..bc1081aab357d6 100644
--- a/Libraries/Network/RCTNetworking.ios.js
+++ b/Libraries/Network/RCTNetworking.ios.js
@@ -18,7 +18,14 @@ import type {RequestBody} from './convertRequestBody';
 
 class RCTNetworking extends NativeEventEmitter {
   constructor() {
-    super(NativeNetworkingIOS);
+    const disableCallsIntoModule =
+      typeof global.__disableRCTNetworkingExtraneousModuleCalls === 'function'
+        ? global.__disableRCTNetworkingExtraneousModuleCalls()
+        : false;
+
+    super(NativeNetworkingIOS, {
+      __SECRET_DISABLE_CALLS_INTO_MODULE_DO_NOT_USE_OR_YOU_WILL_BE_FIRED: disableCallsIntoModule,
+    });
   }
 
   sendRequest(

From 50b0b814ffeb0eafebbf35b65b869a9f3072191c Mon Sep 17 00:00:00 2001
From: Adam Gleitman <adam.gleitman@gmail.com>
Date: Fri, 24 Sep 2021 20:08:16 -0700
Subject: [PATCH 237/241] Update RNTester Podfile.lock

---
 packages/rn-tester/Podfile.lock | 56 ++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/packages/rn-tester/Podfile.lock b/packages/rn-tester/Podfile.lock
index e97136c80daade..ba4487eea52c84 100644
--- a/packages/rn-tester/Podfile.lock
+++ b/packages/rn-tester/Podfile.lock
@@ -510,8 +510,8 @@ SPEC CHECKSUMS:
   CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   CocoaLibEvent: 2fab71b8bd46dd33ddb959f7928ec5909f838e3f
   DoubleConversion: 0ea4559a49682230337df966e735d6cc7760108e
-  FBLazyVector: e6b5b2aea100714386d719500739ffa5ce7a5461
-  FBReactNativeSpec: 2ed74751b56c59a1be61fefa0a76476c5048f23f
+  FBLazyVector: 666596dc7c29ee7b2d1a48f535acb7cbb061ea90
+  FBReactNativeSpec: 0e9685ad5e72311405176c684617ef5d0dc8292e
   Flipper: be611d4b742d8c87fbae2ca5f44603a02539e365
   Flipper-DoubleConversion: 38631e41ef4f9b12861c67d17cb5518d06badc41
   Flipper-Folly: c12092ea368353b58e992843a990a3225d4533c3
@@ -522,33 +522,33 @@ SPEC CHECKSUMS:
   glog: b0ffa5c7cbb8a2c455ee70cc920fe61694d43248
   OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355
   RCT-Folly: 2f2111690f1e23490285c059ca53be22fe6d6bee
-  RCTRequired: 4c99e6c6d665c800f3e834131a79be7306092a66
-  RCTTypeSafety: 0be0b0d73a2b920f8d3f9c89e14740855eb3928b
-  React: 4dc3fcfcb828c5c7ccb0a153f3bc28d8cc31b40b
-  React-callinvoker: 8fe7ef21b53986f94f668d24961d715b90d900db
-  React-Core: bc5c4d0927f0fec1275faf079a9ca34fd440b7a6
-  React-CoreModules: fac1c3a4c1f7ae995e93a3011698a86ed760c0ef
-  React-cxxreact: e7b88716c3fc9d27f3488ad72e63cee65a7ad0d6
-  React-jsi: d56eef4ca7d766fbf60d1e22b954a449cc441b4a
-  React-jsiexecutor: 7fed49a40453ec4914e92e9998e6b7a01435c182
-  React-jsinspector: 3bb459b0b8796fc50e4cc1ed9567174447016e82
-  React-perflogger: 4f382f8545123cc90d970e88855d468f802c5840
-  React-RCTActionSheet: 8736aefd502c7365f7e33824d77460aea0a39486
-  React-RCTAnimation: bfdbb92fc63fbafc0307aa74fe7f0ff5279a2ef7
-  React-RCTBlob: 41c7680ff853973dfc248c99c7a051fc6ee558dd
-  React-RCTImage: 8a8c1ee9f4d6694f324aba1be12a235424938415
-  React-RCTLinking: ea892548e67b2e5467c52d6bd9cee9ba167d784f
-  React-RCTNetwork: 08d237db53600974f8d3fd5b4f7cb4ed585b00bf
-  React-RCTPushNotification: 4a7dacb2602cbb174197f5525e4dd4c6393283fb
-  React-RCTSettings: a25ce34c2870b094309889a240deab177b4e16b9
-  React-RCTTest: d94afa04c6bddc28db51c4e63cb8e8449137e279
-  React-RCTText: 3b638a21020bec8ccb759e725008ce8e77b41227
-  React-RCTVibration: 1349328af3919f409710ae8278177905fa0bc536
-  React-runtimeexecutor: e933d247e9161e1ad47c9641d1cf0acbf92abd3f
+  RCTRequired: bc021672176516f9077a9b2f1300d5a04e98dd8e
+  RCTTypeSafety: dd88e89b2d08df093f650af090bab371a8b7d369
+  React: fd0bed4a49748a1114bfae48c93bc55a178b8634
+  React-callinvoker: 49976d8b74c72ee82defb81422a331465441692a
+  React-Core: 138d769f39849681f6a6bc7e5a4db3c621df2c16
+  React-CoreModules: c1ab907464352b4ad65753945eced45e2286c17a
+  React-cxxreact: e7a5eda119759b32a0b085ee983938dd3c2ee83a
+  React-jsi: 6e01f87cc6fd6ba9a75d1a57d959a8290f6adfea
+  React-jsiexecutor: f5dc0df6ed8af85b00a8e985ec54c8967a082b5f
+  React-jsinspector: bdf106e1464bc469ba629a26c488520e6a112b1b
+  React-perflogger: 1add839c33e8241e6d20c468e4a4ffae59a13f64
+  React-RCTActionSheet: e14f85abb409305569e02ccecc7ad49ba571578b
+  React-RCTAnimation: 070e13c3df0cd154bdc32b52e59e5666fa6e9289
+  React-RCTBlob: 3e1bdc2139ea89309ec093b0c19429d30f560409
+  React-RCTImage: ad73b0817497213958d0bf36e4f2c27a8e668f3a
+  React-RCTLinking: 04988e0fe0f9ba3654374863442ec914ec3eb10b
+  React-RCTNetwork: 3054f8640873825d5e007d0a86e43a781b14f80e
+  React-RCTPushNotification: f8a39937fa6d734377cf64695293f7ae316d7051
+  React-RCTSettings: 6c95ad626d0535501c6a6a34bec2ba7d4de29790
+  React-RCTTest: 4341221f53c6524dcb02b035a406ec7cf3b7d964
+  React-RCTText: bcce263b99aa6721f2e3b2d62c863748d15debb3
+  React-RCTVibration: 751b81dfa647c0a3639047ac3e6adf2fd8fef86a
+  React-runtimeexecutor: c2c32ed679eb9763095d13960adce6b21a885046
   React-TurboModuleCxx-RNW: 12172bdbaaf052406ec571465243fad4b2eb2702
-  React-TurboModuleCxx-WinRTPort: 3b278b547dd08f51d022a4ac369e5ea2c471023c
-  ReactCommon: c890e2a0155bd6b264d1ef0894b3617712ae5f11
-  Yoga: 3a2f6978f910ca52aba12e0a86200082fbd60f90
+  React-TurboModuleCxx-WinRTPort: c2d49fa6eda38319bbc454b8b1525d3b007218dc
+  ReactCommon: bf7db57736b24e57497d1fdd384809345a0a5653
+  Yoga: d203d48354fa48e0100655ac7be4444477df794f
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a
 
 PODFILE CHECKSUM: cb260f8f7765c910b68f8267cbd74709f6ae6e54

From 9fd177ffb93076d701fa30c3d82590e396798363 Mon Sep 17 00:00:00 2001
From: Adam Gleitman <adam.gleitman@gmail.com>
Date: Mon, 27 Sep 2021 15:04:18 -0700
Subject: [PATCH 238/241] FIx Android patches

---
 .../patches/Build/ReactAndroid/build.gradle   | 20 +++++++++----------
 .../jni/react/jni/CatalystInstanceImpl.cpp    |  8 ++++----
 .../main/jni/react/jni/CatalystInstanceImpl.h |  4 ++--
 .../react/bridge/ReactMarkerConstants.java    |  9 ++++-----
 .../src/main/jni/react/jni/Android.mk         |  6 +++---
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/android-patches/patches/Build/ReactAndroid/build.gradle b/android-patches/patches/Build/ReactAndroid/build.gradle
index e0dfb8a21820fc..51c4f03823c85c 100644
--- a/android-patches/patches/Build/ReactAndroid/build.gradle
+++ b/android-patches/patches/Build/ReactAndroid/build.gradle
@@ -1,6 +1,6 @@
 --- "E:\\github\\rnm-63-fresh\\ReactAndroid\\build.gradle"	2020-10-27 20:26:16.652167500 -0700
 +++ "E:\\github\\rnm-63\\ReactAndroid\\build.gradle"	2020-10-13 22:03:22.833541000 -0700
-@@ -43,6 +43,8 @@
+@@ -46,6 +46,8 @@
  // and the build will use that.
  def boostPath = dependenciesPath ?: System.getenv("REACT_NATIVE_BOOST_PATH")
  
@@ -9,7 +9,7 @@
  // Setup build type for NDK, supported values: {debug, release}
  def nativeBuildType = System.getenv("NATIVE_BUILD_TYPE") ?: "release"
  
-@@ -92,11 +92,22 @@
+@@ -95,11 +97,22 @@
      dest(new File(downloadsDir, "folly-${FOLLY_VERSION}.tar.gz"))
  }
  
@@ -32,7 +32,7 @@
      includeEmptyDirs = false
      into("$thirdPartyNdkDir/folly")
  }
-@@ -119,6 +138,14 @@
+@@ -122,6 +135,14 @@
      into "$thirdPartyNdkDir/hermes"
  }
  
@@ -47,24 +47,24 @@
  task downloadGlog(dependsOn: createNativeDepsDirectories, type: Download) {
      src("https://github.com/google/glog/archive/v${GLOG_VERSION}.tar.gz")
      onlyIfNewer(true)
-@@ -300,7 +327,7 @@
+@@ -303,7 +324,7 @@
  }
  
  def buildReactNdkLib = tasks.register("buildReactNdkLib", Exec) {
 -    dependsOn(prepareJSC, prepareHermes, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
 +    dependsOn(prepareJSC, prepareHermes, prepareV8, prepareBoost, prepareDoubleConversion, prepareFolly, prepareGlog, extractAARHeaders, extractJNIFiles)
- 
+     dependsOn("generateCodegenArtifactsFromSchema");
+
      inputs.dir("$projectDir/../ReactCommon")
-     inputs.dir("src/main/jni")
-@@ -313,6 +340,7 @@
+@@ -317,6 +338,7 @@
              "NDK_OUT=" + temporaryDir,
              "NDK_LIBS_OUT=$buildDir/react-ndk/all",
              "THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
 +            "V8_NUGET_DIR=$projectDir/$V8Path",
              "REACT_COMMON_DIR=$projectDir/../ReactCommon",
+             "REACT_GENERATED_SRC_DIR=$buildDir/generated/source",
              "REACT_SRC_DIR=$projectDir/src/main/java/com/facebook/react",
-             "BUILD_FABRIC=$enableFabric",
-@@ -322,6 +351,7 @@
+@@ -333,6 +355,7 @@
      commandLine(getNdkBuildFullPath(),
              "NDK_APPLICATION_MK=$projectDir/src/main/jni/Application.mk",
              "THIRD_PARTY_NDK_DIR=$thirdPartyNdkDir",
@@ -72,7 +72,7 @@
              "REACT_COMMON_DIR=$projectDir/../ReactCommon",
              "-C", file("src/main/jni/react/jni").absolutePath,
              "clean")
-@@ -333,10 +363,16 @@
+@@ -345,10 +368,16 @@
  
  def packageReactNdkLibs = tasks.register("packageReactNdkLibs", Copy) {
      dependsOn(buildReactNdkLib)
diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
index a22041a20e393c..623c191bb20a03 100644
--- a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
+++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.cpp
@@ -1,6 +1,6 @@
 --- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp"	2020-10-27 20:26:17.024172000 -0700
 +++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.cpp"	2020-10-13 21:50:14.117742800 -0700
-@@ -101,6 +101,7 @@
+@@ -95,6 +95,7 @@
  void CatalystInstanceImpl::registerNatives() {
    registerHybrid({
        makeNativeMethod("initHybrid", CatalystInstanceImpl::initHybrid),
@@ -8,7 +8,7 @@
        makeNativeMethod(
            "initializeBridge", CatalystInstanceImpl::initializeBridge),
        makeNativeMethod(
-@@ -133,26 +134,39 @@
+@@ -127,26 +128,39 @@
            CatalystInstanceImpl::handleMemoryPressure),
        makeNativeMethod(
            "getRuntimeExecutor", CatalystInstanceImpl::getRuntimeExecutor),           
@@ -56,7 +56,7 @@
  
    // This used to be:
    //
-@@ -171,12 +185,13 @@
+@@ -165,12 +179,13 @@
    // don't need jsModuleDescriptions any more, all the way up and down the
    // stack.
  
@@ -75,7 +75,7 @@
    instance_->initializeBridge(
        std::make_unique<JInstanceCallback>(callback, moduleMessageQueue_),
        jseh->getExecutorFactory(),
-@@ -286,6 +301,10 @@
+@@ -280,6 +295,10 @@
    instance_->handleMemoryPressure(pressureLevel);
  }
  
diff --git a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
index 1c14e02b1e11df..54aff948758208 100644
--- a/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
+++ b/android-patches/patches/OfficeRNHost/ReactAndroid/src/main/jni/react/jni/CatalystInstanceImpl.h
@@ -1,6 +1,6 @@
 --- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h"	2020-10-27 20:26:17.024172000 -0700
 +++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\jni\\react\\jni\\CatalystInstanceImpl.h"	2020-10-13 21:51:15.981376100 -0700
-@@ -50,17 +50,16 @@
+@@ -49,17 +49,16 @@
  
    CatalystInstanceImpl();
  
@@ -24,7 +24,7 @@
  
    void extendNativeModules(
        jni::alias_ref<jni::JCollection<
-@@ -98,6 +97,7 @@
+@@ -97,6 +96,7 @@
    void setGlobalVariable(std::string propName, std::string &&jsonValue);
    jlong getJavaScriptContext();
    void handleMemoryPressure(int pressureLevel);
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
index 37ef5ce3ecb216..6ff479686ee300 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
+++ b/android-patches/patches/V8/ReactAndroid/src/main/java/com/facebook/react/bridge/ReactMarkerConstants.java
@@ -1,12 +1,11 @@
 --- "E:\\github\\rnm-63-fresh\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java"	2020-10-27 20:26:16.764168100 -0700
 +++ "E:\\github\\rnm-63\\ReactAndroid\\src\\main\\java\\com\\facebook\\react\\bridge\\ReactMarkerConstants.java"	2020-10-13 21:38:34.972566300 -0700
-@@ -108,5 +108,8 @@
-   FABRIC_BATCH_EXECUTION_START,
+@@ -109,5 +109,8 @@
    FABRIC_BATCH_EXECUTION_END,
    FABRIC_UPDATE_UI_MAIN_THREAD_START,
--  FABRIC_UPDATE_UI_MAIN_THREAD_END
-+  FABRIC_UPDATE_UI_MAIN_THREAD_END,
+   FABRIC_UPDATE_UI_MAIN_THREAD_END,
 +  BYTECODE_CREATION_FAILED,
 +  BYTECODE_READ_FAILED,
 +  BYTECODE_WRITE_FAILED,
- }
+   // New markers used by bridgeless RN below this line
+   REACT_INSTANCE_INIT_START,
diff --git a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk
index 8bac00983857e5..e3319f92b4c050 100644
--- a/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk
+++ b/android-patches/patches/V8/ReactAndroid/src/main/jni/react/jni/Android.mk
@@ -2,15 +2,15 @@ diff --git a/ReactAndroid/src/main/jni/react/jni/Android.mk b/ReactAndroid/src/m
 index 38a51019e..7425e65a5 100644
 --- a/ReactAndroid/src/main/jni/react/jni/Android.mk
 +++ b/ReactAndroid/src/main/jni/react/jni/Android.mk
-@@ -131,6 +131,7 @@ $(call import-module,callinvoker)
+@@ -128,6 +128,7 @@ $(call import-module,callinvoker)
  $(call import-module,reactperflogger)
  $(call import-module,hermes)
  $(call import-module,runtimeexecutor)
 +$(call import-module,v8jsi)
+ $(call import-module,react/nativemodule/core)
  
  include $(REACT_SRC_DIR)/reactperflogger/jni/Android.mk
- include $(REACT_SRC_DIR)/turbomodule/core/jni/Android.mk
-@@ -147,3 +148,4 @@ include $(REACT_SRC_DIR)/jscexecutor/Android.mk
+@@ -148,3 +149,4 @@ include $(REACT_SRC_DIR)/jscexecutor/Android.mk
  include $(REACT_SRC_DIR)/../hermes/reactexecutor/Android.mk
  include $(REACT_SRC_DIR)/../hermes/instrumentation/Android.mk
  include $(REACT_SRC_DIR)/modules/blob/jni/Android.mk

From 154fd429e34616dad37d08839ed7e260522ce3cf Mon Sep 17 00:00:00 2001
From: Valentin Shergin <shergin@fb.com>
Date: Thu, 8 Oct 2020 16:05:44 -0700
Subject: [PATCH 239/241] Back out "Align multi-line TextInput onSubmitEditing
 behavior"

Summary:
This is a revert of D22488870 (https://github.com/facebook/react-native/commit/521b16730dd07d80261086c2f33eed2a766d404e). (https://github.com/facebook/react-native/pull/29177)
We have to revert it because we realized that it's a breaking change without a very good reason. We have to figure out a better way to unify platform behaviors.

Changelog:
[iOS][Fixed] - Reverted recent change in TextInput (#29177)

Reviewed By: fkgozali

Differential Revision: D24200517

fbshipit-source-id: af0e561a6b8d9ade487be6b197a5d79d326442b6
---
 Libraries/Text/TextInput/RCTBaseTextInputView.m | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index d1798bd3114fc6..861dd5965fe6ec 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -413,13 +413,11 @@ - (BOOL)textInputShouldReturn
   // `onSubmitEditing` is called when "Submit" button
   // (the blue key on onscreen keyboard) did pressed
   // (no connection to any specific "submitting" process).
-  if (_blurOnSubmit) {
-    [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
-                                   reactTag:self.reactTag
-                                       text:[self.backedTextInputView.attributedText.string copy]
-                                        key:nil
-                                 eventCount:_nativeEventCount];
-  }
+  [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
+                                 reactTag:self.reactTag
+                                     text:[self.backedTextInputView.attributedText.string copy]
+                                      key:nil
+                               eventCount:_nativeEventCount];
 
   return _blurOnSubmit;
 }

From 9af8dcd93ce43a077bd784c7f559914be6e71c82 Mon Sep 17 00:00:00 2001
From: Adam Gleitman <adam.gleitman@gmail.com>
Date: Mon, 27 Sep 2021 15:34:42 -0700
Subject: [PATCH 240/241] Add explanation for disabling
 @react-native/codegen/react-native-modules

---
 Libraries/ActionSheetIOS/NativeActionSheetManager.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Libraries/ActionSheetIOS/NativeActionSheetManager.js b/Libraries/ActionSheetIOS/NativeActionSheetManager.js
index 31c83965acff32..9037f7ab3525e1 100644
--- a/Libraries/ActionSheetIOS/NativeActionSheetManager.js
+++ b/Libraries/ActionSheetIOS/NativeActionSheetManager.js
@@ -17,7 +17,11 @@ import type {ProcessedColorValue} from '../StyleSheet/processColor'; // TODO(mac
 export interface Spec extends TurboModule {
   +getConstants: () => {||};
   +showActionSheetWithOptions: (
-    // TODO(macOS GH#774)
+    // TODO(macOS GH#774) - For some reason, yarn lint complains here with this error:
+    //   "Unsupported type 'object' for Spec interface. See https://fburl.com/rn-nativemodules for more details"
+    // The link in the error is restricted to Facebook employees, so we can't access this info.
+    // 3a6327a5d9ebfd0de56c37009ab7de1d0e6bdf85 apparently solves this in other places by disabling the error,
+    // so we might as well do the same thing here.
     // eslint-disable-next-line @react-native/codegen/react-native-modules
     options: {|
       +title?: ?string,

From 9ae7f5fd8e16d7433d9afe2feca138b431e93619 Mon Sep 17 00:00:00 2001
From: Adam Gleitman <adam.gleitman@gmail.com>
Date: Mon, 27 Sep 2021 15:41:59 -0700
Subject: [PATCH 241/241] Add TARGET_OS_OSX back to -textInputShouldReturn

---
 Libraries/Text/TextInput/RCTBaseTextInputView.m | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/Libraries/Text/TextInput/RCTBaseTextInputView.m b/Libraries/Text/TextInput/RCTBaseTextInputView.m
index 861dd5965fe6ec..beeb152d8df20a 100644
--- a/Libraries/Text/TextInput/RCTBaseTextInputView.m
+++ b/Libraries/Text/TextInput/RCTBaseTextInputView.m
@@ -413,11 +413,17 @@ - (BOOL)textInputShouldReturn
   // `onSubmitEditing` is called when "Submit" button
   // (the blue key on onscreen keyboard) did pressed
   // (no connection to any specific "submitting" process).
-  [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
-                                 reactTag:self.reactTag
-                                     text:[self.backedTextInputView.attributedText.string copy]
-                                      key:nil
-                               eventCount:_nativeEventCount];
+#if TARGET_OS_OSX // [TODO(macOS GH#774)
+  if (_blurOnSubmit) {
+#endif // ]TODO(macOS GH#774)
+    [_eventDispatcher sendTextEventWithType:RCTTextEventTypeSubmit
+                                  reactTag:self.reactTag
+                                      text:[self.backedTextInputView.attributedText.string copy]
+                                        key:nil
+                                eventCount:_nativeEventCount];
+#if TARGET_OS_OSX // [TODO(macOS GH#774)
+  }
+#endif // ]TODO(macOS GH#774)
 
   return _blurOnSubmit;
 }