From e6c1e81c60638b052edbe373d110ccc321fcefec Mon Sep 17 00:00:00 2001
From: Rick Hanlon <rickhanlonii@fb.com>
Date: Mon, 12 Aug 2019 13:48:09 -0700
Subject: [PATCH] Move generateStructName to CppHelpers

Summary: We'll need this helper in the prop files now so let's move it over to the generic cpp helpers

Reviewed By: TheSavior

Differential Revision: D16759164

fbshipit-source-id: 8765ffee3bd8219b5f0dc8677362ec45f0a8e2c5
---
 .../src/generators/components/CppHelpers.js   |  9 +++++++
 .../components/EventEmitterHelpers.js         | 27 -------------------
 .../components/GenerateEventEmitterCpp.js     |  5 +---
 .../components/GenerateEventEmitterH.js       |  7 +++--
 4 files changed, 15 insertions(+), 33 deletions(-)
 delete mode 100644 packages/react-native-codegen/src/generators/components/EventEmitterHelpers.js

diff --git a/packages/react-native-codegen/src/generators/components/CppHelpers.js b/packages/react-native-codegen/src/generators/components/CppHelpers.js
index 296e00fea42..68151b18e52 100644
--- a/packages/react-native-codegen/src/generators/components/CppHelpers.js
+++ b/packages/react-native-codegen/src/generators/components/CppHelpers.js
@@ -80,8 +80,17 @@ function getImports(component: ComponentShape): Set<string> {
   return imports;
 }
 
+function generateStructName(
+  componentName: string,
+  parts: $ReadOnlyArray<string> = [],
+) {
+  const additional = parts.map(toSafeCppString).join('');
+  return `${componentName}${additional}Struct`;
+}
+
 module.exports = {
   getCppTypeForAnnotation,
   getImports,
   toSafeCppString,
+  generateStructName,
 };
diff --git a/packages/react-native-codegen/src/generators/components/EventEmitterHelpers.js b/packages/react-native-codegen/src/generators/components/EventEmitterHelpers.js
deleted file mode 100644
index 665d504fe17..00000000000
--- a/packages/react-native-codegen/src/generators/components/EventEmitterHelpers.js
+++ /dev/null
@@ -1,27 +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';
-
-const {toSafeCppString} = require('./CppHelpers.js');
-
-// import type {EventTypeShape} from './CodegenSchema';
-
-function generateStructName(
-  componentName: string,
-  parts: $ReadOnlyArray<string> = [],
-): string {
-  const additional = parts.map(toSafeCppString).join('');
-  return `${componentName}${additional}Struct`;
-}
-
-module.exports = {
-  generateStructName,
-};
diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js
index 58ea1679006..4181f01aafc 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterCpp.js
@@ -10,11 +10,10 @@
 
 'use strict';
 
-const {generateStructName} = require('./EventEmitterHelpers.js');
+const {generateStructName} = require('./CppHelpers.js');
 
 import type {
   ComponentShape,
-  EventTypeShape,
   ObjectPropertyType,
   SchemaType,
 } from '../../CodegenSchema';
@@ -26,8 +25,6 @@ type ComponentCollection = $ReadOnly<{
   [component: string]: ComponentShape,
 }>;
 
-type SettersSet = Set<string>;
-
 const template = `
 /**
  * Copyright (c) Facebook, Inc. and its affiliates.
diff --git a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
index 7444a724874..90976c26dfc 100644
--- a/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
+++ b/packages/react-native-codegen/src/generators/components/GenerateEventEmitterH.js
@@ -12,8 +12,11 @@
 
 const nullthrows = require('nullthrows');
 
-const {getCppTypeForAnnotation, toSafeCppString} = require('./CppHelpers.js');
-const {generateStructName} = require('./EventEmitterHelpers.js');
+const {
+  getCppTypeForAnnotation,
+  toSafeCppString,
+  generateStructName,
+} = require('./CppHelpers.js');
 
 import type {
   ComponentShape,