From 1b3dc1d9e32a4596a3a2cf5d476cfc5176fe7203 Mon Sep 17 00:00:00 2001 From: Ramanpreet Nara Date: Tue, 29 Sep 2020 14:33:06 -0700 Subject: [PATCH] Fix GenerateModuleJniCpp Summary: Just updated the generator to work with the new RN Codegen Flow Parser types. Changelog: [Internal] Reviewed By: fkgozali Differential Revision: D23667253 fbshipit-source-id: ef94e75287d37dfd7b80f61455a1bfa34bddeb28 --- .../modules/GenerateModuleJniCpp.js | 200 ++++++++++-------- 1 file changed, 111 insertions(+), 89 deletions(-) diff --git a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js index a97083d86bd..72b48a7fcda 100644 --- a/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js +++ b/packages/react-native-codegen/src/generators/modules/GenerateModuleJniCpp.js @@ -11,14 +11,14 @@ 'use strict'; import type { - FunctionTypeAnnotationParam, - FunctionTypeAnnotationReturn, - NativeModuleShape, - ObjectTypeAliasTypeShape, SchemaType, + NativeModulePropertySchema, + NativeModuleMethodParamSchema, + NativeModuleReturnTypeAnnotation, } from '../../CodegenSchema'; -const {getTypeAliasTypeAnnotation} = require('./Utils'); +import type {AliasResolver} from './Utils'; +const {createAliasResolver, getModules} = require('./Utils'); type FilesOutput = Map; @@ -50,7 +50,7 @@ const oneModuleLookupTemplate = ` if (moduleName == "::_MODULE_NAME_::") { const template = ` /** - * Copyright (c) Facebook, Inc. and its affiliates. + * ${'C'}opyright (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. @@ -75,17 +75,23 @@ std::shared_ptr ::_LIBRARY_NAME_::_ModuleProvider(const std::string `; function translateReturnTypeToKind( - typeAnnotation: FunctionTypeAnnotationReturn, + typeAnnotation: NativeModuleReturnTypeAnnotation, + resolveAlias: AliasResolver, ): string { - switch (typeAnnotation.type) { + let realTypeAnnotation = typeAnnotation; + if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') { + realTypeAnnotation = resolveAlias(realTypeAnnotation.name); + } + + switch (realTypeAnnotation.type) { case 'ReservedFunctionValueTypeAnnotation': - switch (typeAnnotation.name) { + switch (realTypeAnnotation.name) { case 'RootTag': return 'NumberKind'; default: - (typeAnnotation.name: empty); + (realTypeAnnotation.name: empty); throw new Error( - `Invalid ReservedFunctionValueTypeName name, got ${typeAnnotation.name}`, + `Invalid ReservedFunctionValueTypeName name, got ${realTypeAnnotation.name}`, ); } case 'VoidTypeAnnotation': @@ -95,42 +101,96 @@ function translateReturnTypeToKind( case 'BooleanTypeAnnotation': return 'BooleanKind'; case 'NumberTypeAnnotation': + return 'NumberKind'; case 'DoubleTypeAnnotation': + return 'NumberKind'; case 'FloatTypeAnnotation': + return 'NumberKind'; case 'Int32TypeAnnotation': return 'NumberKind'; case 'PromiseTypeAnnotation': return 'PromiseKind'; case 'GenericObjectTypeAnnotation': + return 'ObjectKind'; case 'ObjectTypeAnnotation': return 'ObjectKind'; case 'ArrayTypeAnnotation': return 'ArrayKind'; default: - // TODO (T65847278): Figure out why this does not work. - // (typeAnnotation.type: empty); + (realTypeAnnotation.type: empty); throw new Error( - `Unknown prop type for returning value, found: ${typeAnnotation.type}"`, + `Unknown prop type for returning value, found: ${realTypeAnnotation.type}"`, ); } } function translateParamTypeToJniType( - param: FunctionTypeAnnotationParam, - aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>, + param: NativeModuleMethodParamSchema, + resolveAlias: AliasResolver, ): string { - const {nullable, typeAnnotation} = param; + const {optional, typeAnnotation} = param; + const isRequired = !optional && !typeAnnotation.nullable; - const realTypeAnnotation = - typeAnnotation.type === 'TypeAliasTypeAnnotation' - ? getTypeAliasTypeAnnotation(typeAnnotation.name, aliases) - : typeAnnotation; + let realTypeAnnotation = typeAnnotation; + if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') { + realTypeAnnotation = resolveAlias(realTypeAnnotation.name); + } switch (realTypeAnnotation.type) { case 'ReservedFunctionValueTypeAnnotation': switch (realTypeAnnotation.name) { case 'RootTag': - return 'D'; + return !isRequired ? 'Ljava/lang/Double;' : 'D'; + default: + (realTypeAnnotation.name: empty); + throw new Error( + `Invalid ReservedFunctionValueTypeName name, got ${realTypeAnnotation.name}`, + ); + } + case 'StringTypeAnnotation': + return 'Ljava/lang/String;'; + case 'BooleanTypeAnnotation': + return !isRequired ? 'Ljava/lang/Boolean' : 'Z'; + case 'NumberTypeAnnotation': + return !isRequired ? 'Ljava/lang/Double;' : 'D'; + case 'DoubleTypeAnnotation': + return !isRequired ? 'Ljava/lang/Double;' : 'D'; + case 'FloatTypeAnnotation': + return !isRequired ? 'Ljava/lang/Double;' : 'D'; + case 'Int32TypeAnnotation': + return !isRequired ? 'Ljava/lang/Double;' : 'D'; + case 'GenericObjectTypeAnnotation': + return 'Lcom/facebook/react/bridge/ReadableMap;'; + case 'ObjectTypeAnnotation': + return 'Lcom/facebook/react/bridge/ReadableMap;'; + case 'ArrayTypeAnnotation': + return 'Lcom/facebook/react/bridge/ReadableArray;'; + case 'FunctionTypeAnnotation': + return 'Lcom/facebook/react/bridge/Callback;'; + default: + (realTypeAnnotation.type: empty); + throw new Error( + `Unknown prop type for method arg, found: ${realTypeAnnotation.type}"`, + ); + } +} + +function translateReturnTypeToJniType( + typeAnnotation: NativeModuleReturnTypeAnnotation, + resolveAlias: AliasResolver, +): string { + const {nullable} = typeAnnotation; + + let realTypeAnnotation = typeAnnotation; + if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') { + realTypeAnnotation = resolveAlias(realTypeAnnotation.name); + } + + switch (realTypeAnnotation.type) { + case 'ReservedFunctionValueTypeAnnotation': + switch (realTypeAnnotation.name) { + case 'RootTag': + return nullable ? 'Ljava/lang/Double;' : 'D'; default: (realTypeAnnotation.name: empty); throw new Error( @@ -144,70 +204,32 @@ function translateParamTypeToJniType( case 'BooleanTypeAnnotation': return nullable ? 'Ljava/lang/Boolean' : 'Z'; case 'NumberTypeAnnotation': + return nullable ? 'Ljava/lang/Double;' : 'D'; case 'DoubleTypeAnnotation': + return nullable ? 'Ljava/lang/Double;' : 'D'; case 'FloatTypeAnnotation': + return nullable ? 'Ljava/lang/Double;' : 'D'; case 'Int32TypeAnnotation': return nullable ? 'Ljava/lang/Double;' : 'D'; case 'PromiseTypeAnnotation': return 'Lcom/facebook/react/bridge/Promise;'; case 'GenericObjectTypeAnnotation': - case 'ObjectTypeAnnotation': - return 'Lcom/facebook/react/bridge/ReadableMap;'; - case 'ArrayTypeAnnotation': - return 'Lcom/facebook/react/bridge/ReadableArray;'; - case 'FunctionTypeAnnotation': - return 'Lcom/facebook/react/bridge/Callback;'; - default: - throw new Error( - `Unknown prop type for method arg, found: ${realTypeAnnotation.type}"`, - ); - } -} - -function translateReturnTypeToJniType( - typeAnnotation: FunctionTypeAnnotationReturn, -): string { - const {nullable} = typeAnnotation; - - switch (typeAnnotation.type) { - case 'ReservedFunctionValueTypeAnnotation': - switch (typeAnnotation.name) { - case 'RootTag': - return 'D'; - default: - (typeAnnotation.name: empty); - throw new Error( - `Invalid ReservedFunctionValueTypeName name, got ${typeAnnotation.name}`, - ); - } - case 'VoidTypeAnnotation': - return 'V'; - case 'StringTypeAnnotation': - return 'Ljava/lang/String;'; - case 'BooleanTypeAnnotation': - return nullable ? 'Ljava/lang/Boolean' : 'Z'; - case 'NumberTypeAnnotation': - case 'DoubleTypeAnnotation': - case 'FloatTypeAnnotation': - case 'Int32TypeAnnotation': - return nullable ? 'Ljava/lang/Double;' : 'D'; - case 'PromiseTypeAnnotation': - return 'Lcom/facebook/react/bridge/Promise;'; - case 'GenericObjectTypeAnnotation': + return 'Lcom/facebook/react/bridge/WritableMap;'; case 'ObjectTypeAnnotation': return 'Lcom/facebook/react/bridge/WritableMap;'; case 'ArrayTypeAnnotation': return 'Lcom/facebook/react/bridge/WritableArray;'; default: + (realTypeAnnotation.type: empty); throw new Error( - `Unknown prop type for method return type, found: ${typeAnnotation.type}"`, + `Unknown prop type for method return type, found: ${realTypeAnnotation.type}"`, ); } } function translateMethodTypeToJniSignature( - property, - aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>, + property: NativeModulePropertySchema, + resolveAlias: AliasResolver, ): string { const {name, typeAnnotation} = property; const {returnTypeAnnotation} = typeAnnotation; @@ -223,24 +245,29 @@ function translateMethodTypeToJniSignature( } const argsSignatureParts = params.map(t => { - return translateParamTypeToJniType(t, aliases); + return translateParamTypeToJniType(t, resolveAlias); }); if (isPromiseReturn) { // Additional promise arg for this case. - argsSignatureParts.push(translateReturnTypeToJniType(returnTypeAnnotation)); + argsSignatureParts.push( + translateReturnTypeToJniType(returnTypeAnnotation, resolveAlias), + ); } const argsSignature = argsSignatureParts.join(''); const returnSignature = name === 'getConstants' ? 'Ljava/util/Map;' - : translateReturnTypeToJniType(processedReturnTypeAnnotation); + : translateReturnTypeToJniType( + processedReturnTypeAnnotation, + resolveAlias, + ); return `(${argsSignature})${returnSignature}`; } function translateMethodForImplementation( - property, - aliases: $ReadOnly<{[aliasName: string]: ObjectTypeAliasTypeShape, ...}>, + property: NativeModulePropertySchema, + resolveAlias: AliasResolver, ): string { const {returnTypeAnnotation} = property.typeAnnotation; @@ -264,7 +291,10 @@ function translateMethodForImplementation( return ''; } return propertyTemplate - .replace(/::_KIND_::/g, translateReturnTypeToKind(returnTypeAnnotation)) + .replace( + /::_KIND_::/g, + translateReturnTypeToKind(returnTypeAnnotation, resolveAlias), + ) .replace(/::_PROPERTY_NAME_::/g, property.name) .replace( /::_ARGS_::/g, @@ -274,7 +304,7 @@ function translateMethodForImplementation( ) .replace( /::_SIGNATURE_::/g, - translateMethodTypeToJniSignature(property, aliases), + translateMethodTypeToJniSignature(property, resolveAlias), ); } @@ -284,25 +314,17 @@ module.exports = { schema: SchemaType, moduleSpecName: string, ): FilesOutput { - const nativeModules: {[name: string]: NativeModuleShape, ...} = Object.keys( - schema.modules, - ) - .map(moduleName => { - const modules = schema.modules[moduleName].nativeModules; - if (modules == null) { - return null; - } - - return modules; - }) - .filter(Boolean) - .reduce((acc, modules) => Object.assign(acc, modules), {}); + const nativeModules = getModules(schema); const modules = Object.keys(nativeModules) .map(name => { const {aliases, properties} = nativeModules[name]; + const resolveAlias = createAliasResolver(aliases); + const translatedMethods = properties - .map(property => translateMethodForImplementation(property, aliases)) + .map(property => + translateMethodForImplementation(property, resolveAlias), + ) .join('\n'); return moduleTemplate .replace(/::_TURBOMODULE_METHOD_INVOKERS_::/g, translatedMethods)