Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make JavaSpec Generator handle NullableTypeAnnotation

Browse Source 
Summary: Changelog: [Internal]

Reviewed By: hramos

Differential Revision: D24027248

fbshipit-source-id: 7ca0e04e8e2f19cffc9aea3d6db51f86703c06f7
This commit is contained in:
Ramanpreet Nara
2020-10-01 19:26:14 -07:00
committed by Facebook GitHub Bot
parent d9dc9d5d0a
commit 0a2228ae3f
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/react-native-codegen/src/generators/modules/GenerateModuleJavaSpec.js
Vendored
+19 -10
View File
@@ -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 =>