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 b4051ac81d7..c243cae7d73 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 55d9b2aa7b7..a2b3d54d5ed 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 7342ad01a7c..f2aaa32f41f 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 c9f173df868..cd54439ff91 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 43937022e4f..45ff4ba8dcf 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 aac88138b51..a97083d86bd 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 8b60d07e127..53a0585886e 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 1c5a3b9127d..4f4f5fc14bd 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 96cbea8e38d..6c35735fee2 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 e4647258fe3..b48f155accf 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 ca1b95216e2..a1da76184fb 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'.`, );