Follow up e2e testing mechanism with real tests

packages/react-native-codegen/BUCK

@@ -37,7 +37,8 @@ fb_native.genrule(
     name = "codegen_tests_schema",
     srcs = glob(
         [
-            "**/e2e/__test_fixtures__/*NativeComponent.js",
+            "**/e2e/__test_fixtures__/components/*NativeComponent.js",
+            "**/e2e/__test_fixtures__/modules/Native*.js",
         ],
     ),
     cmd = "$(exe fbsource//xplat/js/react-native-github/packages/react-native-codegen:write_to_json) $OUT $SRCS",
@@ -66,6 +67,7 @@ fb_xplat_cxx_binary(
     visibility = ["PUBLIC"],
     deps = [
         ":generated_components-codegen_tests",
+        ":generated_modules-codegen_tests",
     ],
 )
 
@@ -89,6 +91,7 @@ rn_xplat_cxx_library(
     ],
     deps = [
         ":generated_components-codegen_tests",
+        ":generated_modules-codegen_tests",
     ],
 )
 

packages/react-native-codegen/DEFS.bzl

@@ -26,6 +26,8 @@ def rn_codegen(
     generate_props_h_name = "generated_props_h-{}".format(name)
     generate_shadow_node_cpp_name = "generated_shadow_node_cpp-{}".format(name)
     generate_shadow_node_h_name = "generated_shadow_node_h-{}".format(name)
+    generate_module_h_name = "generate_module_h-{}".format(name)
+    generate_module_cpp_name = "generate_module_cpp-{}".format(name)
 
     fb_native.genrule(
         name = generate_fixtures_rule_name,
@@ -82,6 +84,18 @@ def rn_codegen(
         out = "ShadowNodes.h",
     )
 
+    fb_native.genrule(
+        name = generate_module_h_name,
+        cmd = "cp $(location :{})/NativeModules.h $OUT".format(generate_fixtures_rule_name),
+        out = "NativeModules.h",
+    )
+
+    fb_native.genrule(
+        name = generate_module_cpp_name,
+        cmd = "cp $(location :{})/NativeModules.cpp $OUT".format(generate_fixtures_rule_name),
+        out = "NativeModules.cpp",
+    )
+
     # libs
     rn_xplat_cxx_library(
         name = "generated_components-{}".format(name),
@@ -134,6 +148,40 @@ def rn_codegen(
         ],
     )
 
+    # libs
+    rn_xplat_cxx_library(
+        name = "generated_modules-{}".format(name),
+        tests = [":generated_tests-{}".format(name)],
+        srcs = [
+            ":{}".format(generate_module_cpp_name),
+        ],
+        headers = [
+            ":{}".format(generate_module_h_name),
+        ],
+        exported_headers = {
+            "NativeModules.cpp": ":{}".format(generate_module_cpp_name),
+            "NativeModules.h": ":{}".format(generate_module_h_name),
+        },
+        header_namespace = "react/modules/{}".format(name),
+        compiler_flags = [
+            "-fexceptions",
+            "-frtti",
+            "-std=c++14",
+            "-Wall",
+        ],
+        fbobjc_compiler_flags = get_apple_compiler_flags(),
+        fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(),
+        platforms = (ANDROID, APPLE),
+        preprocessor_flags = [
+            "-DLOG_TAG=\"ReactNative\"",
+            "-DWITH_FBSYSTRACE=1",
+        ],
+        visibility = ["PUBLIC"],
+        exported_deps = [
+            react_native_xplat_target("turbomodule/core:core"),
+        ],
+    )
+
     # Tests
     fb_xplat_cxx_test(
         name = "generated_tests-{}".format(name),

packages/react-native-codegen/buck_tests/emptyFile.cpp

@@ -1,4 +1,6 @@
 #import <react/components/codegen_tests/ComponentDescriptors.h>
+#import <react/modules/codegen_tests/NativeModules.h>
+#import <react/modules/codegen_tests/NativeModules.cpp>
 
 // TODO: Import every prop and event to asset they're generated
 

packages/react-native-codegen/buck_tests/generate-tests.js

@@ -44,5 +44,14 @@ try {
 
 RNCodegen.generate(
   {libraryName, schema, outputDirectory},
-  {generators: ['descriptors', 'events', 'props', 'tests', 'shadow-nodes']},
+  {
+    generators: [
+      'descriptors',
+      'events',
+      'props',
+      'tests',
+      'shadow-nodes',
+      'modules',
+    ],
+  },
 );

packages/react-native-codegen/e2e/__test_fixtures__/ArrayPropsNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/ArrayPropsNativeComponent.js

@@ -13,15 +13,15 @@
 import type {
   PointValue,
   ColorValue,
-} from '../../../../Libraries/StyleSheet/StyleSheetTypes';
-import type {ImageSource} from '../../../../Libraries/Image/ImageSource';
+} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
+import type {ImageSource} from '../../../../../Libraries/Image/ImageSource';
 import type {
   Int32,
   Float,
   WithDefault,
-} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/BooleanPropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/BooleanPropNativeComponent.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {WithDefault} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/ColorPropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/ColorPropNativeComponent.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {ColorValue} from '../../../../Libraries/StyleSheet/StyleSheetTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+import type {ColorValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/EnumPropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/EnumPropNativeComponent.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {WithDefault} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/EventNestedObjectPropsNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/EventNestedObjectPropsNativeComponent.js

@@ -14,9 +14,9 @@ import type {
   Int32,
   BubblingEventHandler,
   WithDefault,
-} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type OnChangeEvent = $ReadOnly<{|
   location: {

packages/react-native-codegen/e2e/__test_fixtures__/EventPropsNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/EventPropsNativeComponent.js

@@ -16,9 +16,9 @@ import type {
   BubblingEventHandler,
   DirectEventHandler,
   WithDefault,
-} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type OnChangeEvent = $ReadOnly<{|
   value: boolean,

packages/react-native-codegen/e2e/__test_fixtures__/FloatPropsNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/FloatPropsNativeComponent.js

@@ -13,9 +13,9 @@
 import type {
   WithDefault,
   Float,
-} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/ImagePropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/ImagePropNativeComponent.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {ImageSource} from '../../../../Libraries/Image/ImageSource';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+import type {ImageSource} from '../../../../../Libraries/Image/ImageSource';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/IntegerPropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/IntegerPropNativeComponent.js

@@ -13,9 +13,9 @@
 import type {
   WithDefault,
   Int32,
-} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/InterfaceOnlyNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/InterfaceOnlyNativeComponent.js

@@ -13,9 +13,9 @@
 import type {
   BubblingEventHandler,
   WithDefault,
-} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/MultiNativePropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/MultiNativePropNativeComponent.js

@@ -13,10 +13,10 @@
 import type {
   PointValue,
   ColorValue,
-} from '../../../../Libraries/StyleSheet/StyleSheetTypes';
-import type {ImageSource} from '../../../../Libraries/Image/ImageSource';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
+import type {ImageSource} from '../../../../../Libraries/Image/ImageSource';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/NoPropsNoEventsNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/NoPropsNoEventsNativeComponent.js

@@ -10,8 +10,8 @@
 
 'use strict';
 
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/PointPropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/PointPropNativeComponent.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {PointValue} from '../../../../Libraries/StyleSheet/StyleSheetTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+import type {PointValue} from '../../../../../Libraries/StyleSheet/StyleSheetTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/StringPropNativeComponent.js → packages/react-native-codegen/e2e/__test_fixtures__/components/StringPropNativeComponent.js

@@ -10,9 +10,9 @@
 
 'use strict';
 
-import type {WithDefault} from '../../../../Libraries/Types/CodegenTypes';
-import type {ViewProps} from '../../../../Libraries/Components/View/ViewPropTypes';
-import codegenNativeComponent from '../../../../Libraries/Utilities/codegenNativeComponent';
+import type {WithDefault} from '../../../../../Libraries/Types/CodegenTypes';
+import type {ViewProps} from '../../../../../Libraries/Components/View/ViewPropTypes';
+import codegenNativeComponent from '../../../../../Libraries/Utilities/codegenNativeComponent';
 
 type NativeProps = $ReadOnly<{|
   ...ViewProps,

packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeArrayTurboModule.js

@@ -0,0 +1,24 @@
+/**
+ * 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 {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+export type ArrayType = string;
+type AnotherArray = Array<ArrayType>;
+
+export interface Spec extends TurboModule {
+  +getArray: (a: Array<any>) => Array<string>;
+  +getArrayWithAlias: (a: AnotherArray, b: Array<ArrayType>) => AnotherArray;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');

packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeBooleanTurboModule.js

@@ -0,0 +1,24 @@
+/**
+ * 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 {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+export type Boolean = boolean;
+type AnotherBoolean = Boolean;
+
+export interface Spec extends TurboModule {
+  +getBoolean: (arg: boolean) => boolean;
+  +getBooleanWithAlias: (arg: Boolean) => AnotherBoolean;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');

packages/react-native-codegen/e2e/__test_fixtures__/modules/NativeCallbackTurboModule.js

@@ -0,0 +1,24 @@
+/**
+ * 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 {TurboModule} from 'react-native/Libraries/TurboModule/RCTExport';
+import * as TurboModuleRegistry from 'react-native/Libraries/TurboModule/TurboModuleRegistry';
+
+export type String = string;
+type CB = (value: String) => void;
+
+export interface Spec extends TurboModule {
+  +getValueWithCallback: (callback: (value: string) => void) => void;
+  +getValueWithCallbackWithAlias: (c: CB) => void;
+}
+
+export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');