refactor: cleanup

Author: paradowstack

packages/react-native-codegen/src/parsers/flow/modules/__test_fixtures__/failures.js

@@ -322,7 +322,7 @@ export interface Spec extends TurboModule {
 export default TurboModuleRegistry.getEnforcing<Spec>('MixedValuesEnumNativeModule');
 `;
 
-const NATIVE_MODULE_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY = `
+const NATIVE_MODULES_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -351,7 +351,6 @@ export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 `;
 
 module.exports = {
-  NATIVE_MODULE_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY,
   NATIVE_MODULES_WITH_READ_ONLY_OBJECT_NO_TYPE_FOR_CONTENT,
   NATIVE_MODULES_WITH_UNNAMED_PARAMS,
   NATIVE_MODULES_WITH_PROMISE_WITHOUT_TYPE,
@@ -364,4 +363,5 @@ module.exports = {
   MIXED_VALUES_ENUM_NATIVE_MODULE,
   NUMERIC_VALUES_ENUM_NATIVE_MODULE,
   MAP_WITH_EXTRA_KEYS_NATIVE_MODULE,
+  NATIVE_MODULES_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY,
 };

packages/react-native-codegen/src/parsers/flow/modules/__tests__/__snapshots__/module-parser-snapshot-test.js.snap

@@ -13,7 +13,7 @@ export enum SomeEnum {
                      ^"
 `;
 
-exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULE_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY 1`] = `"Module NativeSampleTurboModule: Object property '[object Object]' cannot have type 'ArrayBuffer'."`;
+exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY 1`] = `"Module NativeSampleTurboModule: Object property '[object Object]' cannot have type 'ArrayBuffer'."`;
 
 exports[`RN Codegen Flow Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT 1`] = `"Module NativeSampleTurboModule: Generic 'Array' must have type parameters."`;
 

packages/react-native-codegen/src/parsers/flow/modules/__tests__/module-parser-e2e-test.js

@@ -17,7 +17,6 @@ import type {
 
 const {
   MissingTypeParameterGenericParserError,
-  ParserError,
   UnnamedFunctionParamParserError,
   UnsupportedGenericParserError,
   UnsupportedTypeAnnotationParserError,
@@ -718,26 +717,6 @@ describe('Flow Module Parser', () => {
       expect(isReturnTypeAnnotationNullable).toBe(false);
     });
 
-    it('should parse methods that have a return type of Promise<ArrayBuffer>', () => {
-      const module = parseModule(`
-          import type {TurboModule} from 'RCTExport';
-          import * as TurboModuleRegistry from 'TurboModuleRegistry';
-          export interface Spec extends TurboModule {
-            load(): Promise<ArrayBuffer>,
-          }
-          export default TurboModuleRegistry.get<Spec>('Foo');
-        `);
-      const [functionTypeAnnotation] = unwrapNullable(
-        module.spec.methods[0].typeAnnotation,
-      );
-      const [returnTypeAnnotation] = unwrapNullable(
-        functionTypeAnnotation.returnTypeAnnotation,
-      );
-      expect(returnTypeAnnotation.type).toBe('PromiseTypeAnnotation');
-      const [elementType] = unwrapNullable(returnTypeAnnotation.elementType);
-      expect(elementType.type).toBe('ArrayBufferTypeAnnotation');
-    });
-
     [true, false].forEach(IS_RETURN_TYPE_NULLABLE => {
       const RETURN_TYPE_DESCRIPTION = IS_RETURN_TYPE_NULLABLE
         ? 'a nullable'

packages/react-native-codegen/src/parsers/typescript/modules/__test_fixtures__/failures.js

@@ -261,7 +261,7 @@ export interface Spec extends TurboModule {
 export default TurboModuleRegistry.getEnforcing<Spec>('MapWithExtraKeysNativeModule');
 `;
 
-const NATIVE_MODULE_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY = `
+const NATIVE_MODULES_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY = `
 /**
  * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
@@ -287,7 +287,6 @@ export default TurboModuleRegistry.getEnforcing<Spec>('SampleTurboModule');
 `;
 
 module.exports = {
-  NATIVE_MODULE_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY,
   NATIVE_MODULES_WITH_UNNAMED_PARAMS,
   NATIVE_MODULES_WITH_PROMISE_WITHOUT_TYPE,
   NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT_AS_PARAM,
@@ -299,4 +298,5 @@ module.exports = {
   MIXED_VALUES_ENUM_NATIVE_MODULE,
   NUMERIC_VALUES_ENUM_NATIVE_MODULE,
   MAP_WITH_EXTRA_KEYS_NATIVE_MODULE,
+  NATIVE_MODULES_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY,
 };

packages/react-native-codegen/src/parsers/typescript/modules/__tests__/__snapshots__/typescript-module-parser-snapshot-test.js.snap

@@ -6,7 +6,7 @@ exports[`RN Codegen TypeScript Parser Fails with error message MAP_WITH_EXTRA_KE
 
 exports[`RN Codegen TypeScript Parser Fails with error message MIXED_VALUES_ENUM_NATIVE_MODULE 1`] = `"Module NativeSampleTurboModule: Failed parsing the enum SomeEnum in NativeSampleTurboModule with the error: Enum values can not be mixed. They all must be either blank, number, or string values."`;
 
-exports[`RN Codegen TypeScript Parser Fails with error message NATIVE_MODULE_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY 1`] = `"Module NativeSampleTurboModule: Object property '[object Object]' cannot have type 'ArrayBuffer'."`;
+exports[`RN Codegen TypeScript Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_BUFFER_IN_OBJECT_PROPERTY 1`] = `"Module NativeSampleTurboModule: Object property '[object Object]' cannot have type 'ArrayBuffer'."`;
 
 exports[`RN Codegen TypeScript Parser Fails with error message NATIVE_MODULES_WITH_ARRAY_WITH_NO_TYPE_FOR_CONTENT 1`] = `"Module NativeSampleTurboModule: Generic 'Array' must have type parameters."`;
 

packages/react-native-codegen/src/parsers/typescript/modules/__tests__/typescript-module-parser-e2e-test.js

@@ -17,7 +17,6 @@ import type {
 
 const {
   MissingTypeParameterGenericParserError,
-  ParserError,
   UnnamedFunctionParamParserError,
   UnsupportedGenericParserError,
   UnsupportedTypeAnnotationParserError,
@@ -794,26 +793,6 @@ describe('TypeScript Module Parser', () => {
       expect(isReturnTypeAnnotationNullable).toBe(false);
     });
 
-    it('should parse methods that have a return type of Promise<ArrayBuffer>', () => {
-      const module = parseModule(`
-          import type {TurboModule} from 'RCTExport';
-          import * as TurboModuleRegistry from 'TurboModuleRegistry';
-          export interface Spec extends TurboModule {
-            load(): Promise<ArrayBuffer>;
-          }
-          export default TurboModuleRegistry.get<Spec>('Foo');
-        `);
-      const [functionTypeAnnotation] = unwrapNullable(
-        module.spec.methods[0].typeAnnotation,
-      );
-      const [returnTypeAnnotation] = unwrapNullable(
-        functionTypeAnnotation.returnTypeAnnotation,
-      );
-      expect(returnTypeAnnotation.type).toBe('PromiseTypeAnnotation');
-      const [elementType] = unwrapNullable(returnTypeAnnotation.elementType);
-      expect(elementType.type).toBe('ArrayBufferTypeAnnotation');
-    });
-
     [true, false].forEach(IS_RETURN_TYPE_NULLABLE => {
       const RETURN_TYPE_DESCRIPTION = IS_RETURN_TYPE_NULLABLE
         ? 'a nullable'

packages/rn-tester/js/examples/TurboModule/NativeCxxModuleExampleExample.js

@@ -108,20 +108,22 @@ class NativeCxxModuleExampleExample extends React.Component<{}, State> {
     getArrayBuffer: () => {
       const view = new Uint8Array([1, 2, 3, 4, 5]);
       const buffer = NativeCxxModuleExample?.getArrayBuffer(view.buffer);
-      return new Uint8Array(buffer).toString();
+      return new Uint8Array(buffer || []).toString();
     },
     processAsyncBuffer: async () => {
       const view = new Uint8Array([10, 20, 30, 40, 50]);
       const nativeBuffer = NativeCxxModuleExample?.createNativeBuffer(10);
 
       const [byteSum, zeroCopyByteSum] = await Promise.all([
         NativeCxxModuleExample?.processAsyncBuffer(view.buffer),
-        NativeCxxModuleExample?.processAsyncBuffer(nativeBuffer),
+        nativeBuffer != null
+          ? NativeCxxModuleExample?.processAsyncBuffer(nativeBuffer)
+          : Promise.resolve(0),
       ]);
 
       this._setResult(
         'processAsyncBuffer',
-        `sum=${String(byteSum + zeroCopyByteSum)}`,
+        `sum=${(byteSum ?? 0) + (zeroCopyByteSum ?? 0)}`,
       );
     },
     getAsyncBuffer: () =>