@react-native/codegen 0.83.0-nightly-20251014-69dc65500 → 0.83.0-nightly-20251016-e79920c66

package/lib/generators/RNCodegen.js

@@ -33,7 +33,6 @@ const generateTests = require('./components/GenerateTests.js');
 const generateThirdPartyFabricComponentsProviderH = require('./components/GenerateThirdPartyFabricComponentsProviderH.js');
 const generateThirdPartyFabricComponentsProviderObjCpp = require('./components/GenerateThirdPartyFabricComponentsProviderObjCpp.js');
 const generateViewConfigJs = require('./components/GenerateViewConfigJs.js');
-const generateModuleCpp = require('./modules/GenerateModuleCpp.js');
 const generateModuleH = require('./modules/GenerateModuleH.js');
 const generateModuleJavaSpec = require('./modules/GenerateModuleJavaSpec.js');
 const generateModuleJniCpp = require('./modules/GenerateModuleJniCpp.js');
@@ -52,7 +51,6 @@ const ALL_GENERATORS = {
   generateStateCpp: generateStateCpp.generate,
   generateStateH: generateStateH.generate,
   generateModuleH: generateModuleH.generate,
-  generateModuleCpp: generateModuleCpp.generate,
   generateModuleObjCpp: generateModuleObjCpp.generate,
   generateModuleJavaSpec: generateModuleJavaSpec.generate,
   generateModuleJniCpp: generateModuleJniCpp.generate,
@@ -117,7 +115,7 @@ const LIBRARY_GENERATORS = {
     generateModuleJniH.generate,
     generateModuleJavaSpec.generate,
   ],
-  modulesCxx: [generateModuleCpp.generate, generateModuleH.generate],
+  modulesCxx: [generateModuleH.generate],
   modulesIOS: [generateModuleObjCpp.generate],
   tests: [generateTests.generate],
   'shadow-nodes': [

package/lib/generators/RNCodegen.js.flow

@@ -36,7 +36,6 @@ const generateTests = require('./components/GenerateTests.js');
 const generateThirdPartyFabricComponentsProviderH = require('./components/GenerateThirdPartyFabricComponentsProviderH.js');
 const generateThirdPartyFabricComponentsProviderObjCpp = require('./components/GenerateThirdPartyFabricComponentsProviderObjCpp.js');
 const generateViewConfigJs = require('./components/GenerateViewConfigJs.js');
-const generateModuleCpp = require('./modules/GenerateModuleCpp.js');
 const generateModuleH = require('./modules/GenerateModuleH.js');
 const generateModuleJavaSpec = require('./modules/GenerateModuleJavaSpec.js');
 const generateModuleJniCpp = require('./modules/GenerateModuleJniCpp.js');
@@ -56,7 +55,6 @@ const ALL_GENERATORS = {
   generateStateCpp: generateStateCpp.generate,
   generateStateH: generateStateH.generate,
   generateModuleH: generateModuleH.generate,
-  generateModuleCpp: generateModuleCpp.generate,
   generateModuleObjCpp: generateModuleObjCpp.generate,
   generateModuleJavaSpec: generateModuleJavaSpec.generate,
   generateModuleJniCpp: generateModuleJniCpp.generate,
@@ -179,7 +177,7 @@ const LIBRARY_GENERATORS: LibraryGeneratorsFunctions = {
     generateModuleJniH.generate,
     generateModuleJavaSpec.generate,
   ],
-  modulesCxx: [generateModuleCpp.generate, generateModuleH.generate],
+  modulesCxx: [generateModuleH.generate],
   modulesIOS: [generateModuleObjCpp.generate],
   tests: [generateTests.generate],
   'shadow-nodes': [

package/lib/generators/modules/GenerateModuleH.js

@@ -13,70 +13,136 @@
 const {unwrapNullable} = require('../../parsers/parsers-commons');
 const {wrapOptional} = require('../TypeUtils/Cxx');
 const {getEnumName, toPascalCase, toSafeCppString} = require('../Utils');
-const {indent} = require('../Utils');
 const {
   createAliasResolver,
   getModules,
   isArrayRecursiveMember,
   isDirectRecursiveMember,
 } = require('./Utils');
-const ModuleClassDeclarationTemplate = ({
-  hasteModuleName,
-  moduleProperties,
-  structs,
-  enums,
-}) => {
-  return `${enums}
-  ${structs}class JSI_EXPORT ${hasteModuleName}CxxSpecJSI : public TurboModule {
-protected:
-  ${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
+function serializeArg(moduleName, arg, index, resolveAlias, enumMap) {
+  const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
+  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+  function wrap(callback) {
+    const val = `args[${index}]`;
+    const expression = callback(val);
 
-public:
-  ${indent(moduleProperties.join('\n'), 2)}
+    // param?: T
+    if (optional && !nullable) {
+      // throw new Error('are we hitting this case? ' + moduleName);
+      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
 
-};`;
-};
+    // param: ?T
+    // param?: ?T
+    if (nullable || optional) {
+      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
+
+    // param: T
+    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
+  }
+  switch (realTypeAnnotation.type) {
+    case 'ReservedTypeAnnotation':
+      switch (realTypeAnnotation.name) {
+        case 'RootTag':
+          return wrap(val => `${val}.asNumber()`);
+        default:
+          realTypeAnnotation.name;
+          throw new Error(
+            `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.name}"`,
+          );
+      }
+    case 'StringTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'StringLiteralTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'StringLiteralUnionTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'BooleanTypeAnnotation':
+      return wrap(val => `${val}.asBool()`);
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
+          );
+      }
+    case 'NumberTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'FloatTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'DoubleTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'Int32TypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'NumberLiteralTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'ArrayTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt).asArray(rt)`);
+    case 'FunctionTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt).asFunction(rt)`);
+    case 'GenericObjectTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt)`);
+    case 'UnionTypeAnnotation':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'ObjectTypeAnnotation':
+          return wrap(val => `${val}.asObject(rt)`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unsupported union member type for param  "${arg.name}, found: ${realTypeAnnotation.memberType}"`,
+          );
+      }
+    case 'ObjectTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt)`);
+    case 'MixedTypeAnnotation':
+      return wrap(val => `jsi::Value(rt, ${val})`);
+    default:
+      realTypeAnnotation.type;
+      throw new Error(
+        `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
+      );
+  }
+}
 const ModuleSpecClassDeclarationTemplate = ({
   hasteModuleName,
   moduleName,
+  structs,
+  enums,
   moduleEventEmitters,
-  moduleProperties,
+  moduleFunctions,
+  methods,
 }) => {
-  return `template <typename T>
+  return `${enums}${structs}
+template <typename T>
 class JSI_EXPORT ${hasteModuleName}CxxSpec : public TurboModule {
 public:
-  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.create(rt, propName);
-  }
-
-  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
-    return delegate_.getPropertyNames(runtime);
-  }
-
   static constexpr std::string_view kModuleName = "${moduleName}";
 
 protected:
-  ${hasteModuleName}CxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(std::string{${hasteModuleName}CxxSpec::kModuleName}, jsInvoker),
-      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
-${moduleEventEmitters.map(e => e.emitFunction).join('\n')}
-
+  ${hasteModuleName}CxxSpec(std::shared_ptr<CallInvoker> jsInvoker) : TurboModule(std::string{${hasteModuleName}CxxSpec::kModuleName}, jsInvoker) {
+${methods
+  .map(({methodName, paramCount}) => {
+    return `    methodMap_["${methodName}"] = MethodMetadata {.argCount = ${paramCount}, .invoker = __${methodName}};`;
+  })
+  .join(
+    '\n',
+  )}${moduleEventEmitters.length > 0 ? '\n' : ''}${moduleEventEmitters.map(e => e.registerEventEmitter).join('\n')}
+  }
+  ${moduleEventEmitters.map(e => e.emitFunction).join('\n')}
 private:
-  class Delegate : public ${hasteModuleName}CxxSpecJSI {
-  public:
-    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
-      ${hasteModuleName}CxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
-${moduleEventEmitters.map(e => e.registerEventEmitter).join('\n')}
-    }
-
-    ${indent(moduleProperties.join('\n'), 4)}
-
-  private:
-    friend class ${hasteModuleName}CxxSpec;
-    T *instance_;
-  };
-
-  Delegate delegate_;
+${moduleFunctions.join('\n\n')}
 };`;
 };
 const FileTemplate = ({modules}) => {
@@ -238,7 +304,7 @@ function createStructsString(hasteModuleName, aliasMap, resolveAlias, enumMap) {
     return bridging::toJs(rt, value);
   }`,
         )
-        .join('\n\n');
+        .join('\n');
       return `
 #pragma mark - ${structName}
 
@@ -393,17 +459,17 @@ function createEnums(hasteModuleName, enumMap, resolveAlias) {
     .filter(Boolean)
     .join('\n');
 }
-function translatePropertyToCpp(
+function translateFunctionToCpp(
   hasteModuleName,
   prop,
   resolveAlias,
   enumMap,
-  abstract = false,
+  args,
+  returnTypeAnnotation,
 ) {
   const [propTypeAnnotation] = unwrapNullable(prop.typeAnnotation);
-  const params = propTypeAnnotation.params.map(
-    param => `std::move(${param.name})`,
-  );
+  const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
+  const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
   const paramTypes = propTypeAnnotation.params.map(param => {
     const translatedParam = translatePrimitiveJSTypeToCpp(
       hasteModuleName,
@@ -417,6 +483,7 @@ function translatePropertyToCpp(
     );
     return `${translatedParam} ${param.name}`;
   });
+  paramTypes.unshift('jsi::Runtime &rt');
   const returnType = translatePrimitiveJSTypeToCpp(
     hasteModuleName,
     null,
@@ -426,21 +493,15 @@ function translatePropertyToCpp(
     resolveAlias,
     enumMap,
   );
-
-  // The first param will always be the runtime reference.
-  paramTypes.unshift('jsi::Runtime &rt');
-  const method = `${returnType} ${prop.name}(${paramTypes.join(', ')})`;
-  if (abstract) {
-    return `virtual ${method} = 0;`;
+  let methodCallArgs = [...args].join(',\n      ');
+  if (methodCallArgs.length > 0) {
+    methodCallArgs = `,\n      ${methodCallArgs}`;
   }
-  return `${method} override {
-  static_assert(
+  return `  static jsi::Value __${prop.name}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* ${args.length > 0 ? 'args' : '/*args*/'}, size_t ${args.length > 0 ? 'count' : '/*count*/'}) {
+    static_assert(
       bridging::getParameterCount(&T::${prop.name}) == ${paramTypes.length},
       "Expected ${prop.name}(...) to have ${paramTypes.length} parameters");
-
-  return bridging::callFromJs<${returnType}>(
-      rt, &T::${prop.name}, jsInvoker_, ${['instance_', ...params].join(', ')});
-}`;
+    ${!isVoid ? (!isNullable ? 'return ' : 'auto result = ') : ''}bridging::callFromJs<${returnType}>(rt, &T::${prop.name},  static_cast<${hasteModuleName}CxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule)${methodCallArgs});${!isVoid ? (!isNullable ? '' : 'return result ? jsi::Value(std::move(*result)) : jsi::Value::null();') : 'return jsi::Value::undefined();'}\n  }`;
 }
 function translateEventEmitterToCpp(
   moduleName,
@@ -465,7 +526,7 @@ function translateEventEmitterToCpp(
   return {
     isVoidTypeAnnotation: isVoidTypeAnnotation,
     templateName: isVoidTypeAnnotation ? `/*${templateName}*/` : templateName,
-    registerEventEmitter: `      eventEmitterMap_["${eventEmitter.name}"] = std::make_shared<AsyncEventEmitter<${isVoidTypeAnnotation ? '' : 'jsi::Value'}>>();`,
+    registerEventEmitter: `    eventEmitterMap_["${eventEmitter.name}"] = std::make_shared<AsyncEventEmitter<${isVoidTypeAnnotation ? '' : 'jsi::Value'}>>();`,
     emitFunction: `
   ${isVoidTypeAnnotation ? '' : `template <typename ${templateName}> `}void emit${toPascalCase(eventEmitter.name)}(${isVoidTypeAnnotation ? '' : `${isArray ? `std::vector<${templateName}>` : templateName} value`}) {${
     isVoidTypeAnnotation
@@ -473,7 +534,7 @@ function translateEventEmitterToCpp(
       : `
     static_assert(bridging::supportsFromJs<${isArray ? `std::vector<${templateName}>` : templateName}, ${jsiType}>, "value cannnot be converted to ${jsiType}");`
   }
-    static_cast<AsyncEventEmitter<${isVoidTypeAnnotation ? '' : 'jsi::Value'}>&>(*delegate_.eventEmitterMap_["${eventEmitter.name}"]).emit(${
+    static_cast<AsyncEventEmitter<${isVoidTypeAnnotation ? '' : 'jsi::Value'}>&>(*eventEmitterMap_["${eventEmitter.name}"]).emit(${
       isVoidTypeAnnotation
         ? ''
         : `[jsInvoker = jsInvoker_, eventValue = value](jsi::Runtime& rt) -> jsi::Value {
@@ -493,8 +554,14 @@ module.exports = {
   ) {
     const nativeModules = getModules(schema);
     const modules = Object.keys(nativeModules).flatMap(hasteModuleName => {
-      const {aliasMap, enumMap, spec, moduleName} =
-        nativeModules[hasteModuleName];
+      const nativeModule = nativeModules[hasteModuleName];
+      const {
+        aliasMap,
+        enumMap,
+        spec: {methods},
+        spec,
+        moduleName,
+      } = nativeModule;
       const resolveAlias = createAliasResolver(aliasMap);
       const structs = createStructsString(
         hasteModuleName,
@@ -504,23 +571,11 @@ module.exports = {
       );
       const enums = createEnums(hasteModuleName, enumMap, resolveAlias);
       return [
-        ModuleClassDeclarationTemplate({
-          hasteModuleName,
-          moduleProperties: spec.methods.map(prop =>
-            translatePropertyToCpp(
-              hasteModuleName,
-              prop,
-              resolveAlias,
-              enumMap,
-              true,
-            ),
-          ),
-          structs,
-          enums,
-        }),
         ModuleSpecClassDeclarationTemplate({
           hasteModuleName,
           moduleName,
+          structs,
+          enums,
           moduleEventEmitters: spec.eventEmitters.map(eventEmitter =>
             translateEventEmitterToCpp(
               moduleName,
@@ -529,13 +584,29 @@ module.exports = {
               enumMap,
             ),
           ),
-          moduleProperties: spec.methods.map(prop =>
-            translatePropertyToCpp(
+          moduleFunctions: spec.methods.map(property => {
+            const [propertyTypeAnnotation] = unwrapNullable(
+              property.typeAnnotation,
+            );
+            return translateFunctionToCpp(
               hasteModuleName,
-              prop,
+              property,
               resolveAlias,
               enumMap,
-            ),
+              propertyTypeAnnotation.params.map((p, i) =>
+                serializeArg(moduleName, p, i, resolveAlias, enumMap),
+              ),
+              propertyTypeAnnotation.returnTypeAnnotation,
+            );
+          }),
+          methods: methods.map(
+            ({name: propertyName, typeAnnotation: nullableTypeAnnotation}) => {
+              const [{params}] = unwrapNullable(nullableTypeAnnotation);
+              return {
+                methodName: propertyName,
+                paramCount: params.length,
+              };
+            },
           ),
         }),
       ];

package/lib/generators/modules/GenerateModuleH.js.flow

@@ -9,17 +9,17 @@
  */
 
 'use strict';
+
 import type {
   NamedShape,
-  NativeModuleBaseTypeAnnotation,
-} from '../../CodegenSchema';
-import type {
   NativeModuleAliasMap,
+  NativeModuleBaseTypeAnnotation,
   NativeModuleEnumMap,
   NativeModuleEnumMember,
   NativeModuleEnumMemberType,
   NativeModuleEventEmitterShape,
   NativeModuleFunctionTypeAnnotation,
+  NativeModuleParamTypeAnnotation,
   NativeModulePropertyShape,
   NativeModuleTypeAnnotation,
   Nullable,
@@ -30,7 +30,6 @@ import type {AliasResolver} from './Utils';
 const {unwrapNullable} = require('../../parsers/parsers-commons');
 const {wrapOptional} = require('../TypeUtils/Cxx');
 const {getEnumName, toPascalCase, toSafeCppString} = require('../Utils');
-const {indent} = require('../Utils');
 const {
   createAliasResolver,
   getModules,
@@ -40,74 +39,151 @@ const {
 
 type FilesOutput = Map<string, string>;
 
-const ModuleClassDeclarationTemplate = ({
-  hasteModuleName,
-  moduleProperties,
-  structs,
-  enums,
-}: $ReadOnly<{
-  hasteModuleName: string,
-  moduleProperties: string[],
-  structs: string,
-  enums: string,
-}>) => {
-  return `${enums}
-  ${structs}class JSI_EXPORT ${hasteModuleName}CxxSpecJSI : public TurboModule {
-protected:
-  ${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker);
+type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
 
-public:
-  ${indent(moduleProperties.join('\n'), 2)}
+function serializeArg(
+  moduleName: string,
+  arg: Param,
+  index: number,
+  resolveAlias: AliasResolver,
+  enumMap: NativeModuleEnumMap,
+): string {
+  const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
+  const [typeAnnotation, nullable] =
+    unwrapNullable<NativeModuleParamTypeAnnotation>(nullableTypeAnnotation);
 
-};`;
-};
+  let realTypeAnnotation = typeAnnotation;
+  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
+    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
+  }
+
+  function wrap(callback: (val: string) => string) {
+    const val = `args[${index}]`;
+    const expression = callback(val);
+
+    // param?: T
+    if (optional && !nullable) {
+      // throw new Error('are we hitting this case? ' + moduleName);
+      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
+
+    // param: ?T
+    // param?: ?T
+    if (nullable || optional) {
+      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
+    }
+
+    // param: T
+    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
+  }
+
+  switch (realTypeAnnotation.type) {
+    case 'ReservedTypeAnnotation':
+      switch (realTypeAnnotation.name) {
+        case 'RootTag':
+          return wrap(val => `${val}.asNumber()`);
+        default:
+          (realTypeAnnotation.name: empty);
+          throw new Error(
+            `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.name}"`,
+          );
+      }
+    case 'StringTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'StringLiteralTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'StringLiteralUnionTypeAnnotation':
+      return wrap(val => `${val}.asString(rt)`);
+    case 'BooleanTypeAnnotation':
+      return wrap(val => `${val}.asBool()`);
+    case 'EnumDeclaration':
+      switch (realTypeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
+          );
+      }
+    case 'NumberTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'FloatTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'DoubleTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'Int32TypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'NumberLiteralTypeAnnotation':
+      return wrap(val => `${val}.asNumber()`);
+    case 'ArrayTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt).asArray(rt)`);
+    case 'FunctionTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt).asFunction(rt)`);
+    case 'GenericObjectTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt)`);
+    case 'UnionTypeAnnotation':
+      switch (typeAnnotation.memberType) {
+        case 'NumberTypeAnnotation':
+          return wrap(val => `${val}.asNumber()`);
+        case 'ObjectTypeAnnotation':
+          return wrap(val => `${val}.asObject(rt)`);
+        case 'StringTypeAnnotation':
+          return wrap(val => `${val}.asString(rt)`);
+        default:
+          throw new Error(
+            `Unsupported union member type for param  "${arg.name}, found: ${realTypeAnnotation.memberType}"`,
+          );
+      }
+    case 'ObjectTypeAnnotation':
+      return wrap(val => `${val}.asObject(rt)`);
+    case 'MixedTypeAnnotation':
+      return wrap(val => `jsi::Value(rt, ${val})`);
+    default:
+      (realTypeAnnotation.type: empty);
+      throw new Error(
+        `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
+      );
+  }
+}
 
 const ModuleSpecClassDeclarationTemplate = ({
   hasteModuleName,
   moduleName,
+  structs,
+  enums,
   moduleEventEmitters,
-  moduleProperties,
+  moduleFunctions,
+  methods,
 }: $ReadOnly<{
   hasteModuleName: string,
   moduleName: string,
+  structs: string,
+  enums: string,
   moduleEventEmitters: EventEmitterCpp[],
-  moduleProperties: string[],
+  moduleFunctions: string[],
+  methods: $ReadOnlyArray<$ReadOnly<{methodName: string, paramCount: number}>>,
 }>) => {
-  return `template <typename T>
+  return `${enums}${structs}
+template <typename T>
 class JSI_EXPORT ${hasteModuleName}CxxSpec : public TurboModule {
 public:
-  jsi::Value create(jsi::Runtime &rt, const jsi::PropNameID &propName) override {
-    return delegate_.create(rt, propName);
-  }
-
-  std::vector<jsi::PropNameID> getPropertyNames(jsi::Runtime& runtime) override {
-    return delegate_.getPropertyNames(runtime);
-  }
-
   static constexpr std::string_view kModuleName = "${moduleName}";
 
 protected:
-  ${hasteModuleName}CxxSpec(std::shared_ptr<CallInvoker> jsInvoker)
-    : TurboModule(std::string{${hasteModuleName}CxxSpec::kModuleName}, jsInvoker),
-      delegate_(reinterpret_cast<T*>(this), jsInvoker) {}
-${moduleEventEmitters.map(e => e.emitFunction).join('\n')}
-
+  ${hasteModuleName}CxxSpec(std::shared_ptr<CallInvoker> jsInvoker) : TurboModule(std::string{${hasteModuleName}CxxSpec::kModuleName}, jsInvoker) {
+${methods
+  .map(({methodName, paramCount}) => {
+    return `    methodMap_["${methodName}"] = MethodMetadata {.argCount = ${paramCount}, .invoker = __${methodName}};`;
+  })
+  .join(
+    '\n',
+  )}${moduleEventEmitters.length > 0 ? '\n' : ''}${moduleEventEmitters.map(e => e.registerEventEmitter).join('\n')}
+  }
+  ${moduleEventEmitters.map(e => e.emitFunction).join('\n')}
 private:
-  class Delegate : public ${hasteModuleName}CxxSpecJSI {
-  public:
-    Delegate(T *instance, std::shared_ptr<CallInvoker> jsInvoker) :
-      ${hasteModuleName}CxxSpecJSI(std::move(jsInvoker)), instance_(instance) {
-${moduleEventEmitters.map(e => e.registerEventEmitter).join('\n')}
-    }
-
-    ${indent(moduleProperties.join('\n'), 4)}
-
-  private:
-    friend class ${hasteModuleName}CxxSpec;
-    T *instance_;
-  };
-
-  Delegate delegate_;
+${moduleFunctions.join('\n\n')}
 };`;
 };
 
@@ -292,7 +368,7 @@ function createStructsString(
     return bridging::toJs(rt, value);
   }`,
         )
-        .join('\n\n');
+        .join('\n');
       return `
 #pragma mark - ${structName}
 
@@ -476,19 +552,19 @@ function createEnums(
     .join('\n');
 }
 
-function translatePropertyToCpp(
+function translateFunctionToCpp(
   hasteModuleName: string,
   prop: NativeModulePropertyShape,
   resolveAlias: AliasResolver,
   enumMap: NativeModuleEnumMap,
-  abstract: boolean = false,
+  args: Array<string>,
+  returnTypeAnnotation: Nullable<NativeModuleTypeAnnotation>,
 ): string {
   const [propTypeAnnotation] =
     unwrapNullable<NativeModuleFunctionTypeAnnotation>(prop.typeAnnotation);
 
-  const params = propTypeAnnotation.params.map(
-    param => `std::move(${param.name})`,
-  );
+  const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
+  const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
 
   const paramTypes = propTypeAnnotation.params.map(param => {
     const translatedParam = translatePrimitiveJSTypeToCpp(
@@ -503,6 +579,7 @@ function translatePropertyToCpp(
     );
     return `${translatedParam} ${param.name}`;
   });
+  paramTypes.unshift('jsi::Runtime &rt');
 
   const returnType = translatePrimitiveJSTypeToCpp(
     hasteModuleName,
@@ -514,23 +591,16 @@ function translatePropertyToCpp(
     enumMap,
   );
 
-  // The first param will always be the runtime reference.
-  paramTypes.unshift('jsi::Runtime &rt');
-
-  const method = `${returnType} ${prop.name}(${paramTypes.join(', ')})`;
-
-  if (abstract) {
-    return `virtual ${method} = 0;`;
+  let methodCallArgs = [...args].join(',\n      ');
+  if (methodCallArgs.length > 0) {
+    methodCallArgs = `,\n      ${methodCallArgs}`;
   }
 
-  return `${method} override {
-  static_assert(
+  return `  static jsi::Value __${prop.name}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* ${args.length > 0 ? 'args' : '/*args*/'}, size_t ${args.length > 0 ? 'count' : '/*count*/'}) {
+    static_assert(
       bridging::getParameterCount(&T::${prop.name}) == ${paramTypes.length},
       "Expected ${prop.name}(...) to have ${paramTypes.length} parameters");
-
-  return bridging::callFromJs<${returnType}>(
-      rt, &T::${prop.name}, jsInvoker_, ${['instance_', ...params].join(', ')});
-}`;
+    ${!isVoid ? (!isNullable ? 'return ' : 'auto result = ') : ''}bridging::callFromJs<${returnType}>(rt, &T::${prop.name},  static_cast<${hasteModuleName}CxxSpec*>(&turboModule)->jsInvoker_, static_cast<T*>(&turboModule)${methodCallArgs});${!isVoid ? (!isNullable ? '' : 'return result ? jsi::Value(std::move(*result)) : jsi::Value::null();') : 'return jsi::Value::undefined();'}\n  }`;
 }
 
 type EventEmitterCpp = {
@@ -563,7 +633,7 @@ function translateEventEmitterToCpp(
   return {
     isVoidTypeAnnotation: isVoidTypeAnnotation,
     templateName: isVoidTypeAnnotation ? `/*${templateName}*/` : templateName,
-    registerEventEmitter: `      eventEmitterMap_["${
+    registerEventEmitter: `    eventEmitterMap_["${
       eventEmitter.name
     }"] = std::make_shared<AsyncEventEmitter<${
       isVoidTypeAnnotation ? '' : 'jsi::Value'
@@ -585,7 +655,7 @@ function translateEventEmitterToCpp(
   }
     static_cast<AsyncEventEmitter<${
       isVoidTypeAnnotation ? '' : 'jsi::Value'
-    }>&>(*delegate_.eventEmitterMap_["${eventEmitter.name}"]).emit(${
+    }>&>(*eventEmitterMap_["${eventEmitter.name}"]).emit(${
       isVoidTypeAnnotation
         ? ''
         : `[jsInvoker = jsInvoker_, eventValue = value](jsi::Runtime& rt) -> jsi::Value {
@@ -607,8 +677,14 @@ module.exports = {
     const nativeModules = getModules(schema);
 
     const modules = Object.keys(nativeModules).flatMap(hasteModuleName => {
-      const {aliasMap, enumMap, spec, moduleName} =
-        nativeModules[hasteModuleName];
+      const nativeModule = nativeModules[hasteModuleName];
+      const {
+        aliasMap,
+        enumMap,
+        spec: {methods},
+        spec,
+        moduleName,
+      } = nativeModule;
       const resolveAlias = createAliasResolver(aliasMap);
       const structs = createStructsString(
         hasteModuleName,
@@ -617,25 +693,12 @@ module.exports = {
         enumMap,
       );
       const enums = createEnums(hasteModuleName, enumMap, resolveAlias);
-
       return [
-        ModuleClassDeclarationTemplate({
-          hasteModuleName,
-          moduleProperties: spec.methods.map(prop =>
-            translatePropertyToCpp(
-              hasteModuleName,
-              prop,
-              resolveAlias,
-              enumMap,
-              true,
-            ),
-          ),
-          structs,
-          enums,
-        }),
         ModuleSpecClassDeclarationTemplate({
           hasteModuleName,
           moduleName,
+          structs,
+          enums,
           moduleEventEmitters: spec.eventEmitters.map(eventEmitter =>
             translateEventEmitterToCpp(
               moduleName,
@@ -644,13 +707,30 @@ module.exports = {
               enumMap,
             ),
           ),
-          moduleProperties: spec.methods.map(prop =>
-            translatePropertyToCpp(
+          moduleFunctions: spec.methods.map(property => {
+            const [propertyTypeAnnotation] =
+              unwrapNullable<NativeModuleFunctionTypeAnnotation>(
+                property.typeAnnotation,
+              );
+            return translateFunctionToCpp(
               hasteModuleName,
-              prop,
+              property,
               resolveAlias,
               enumMap,
-            ),
+              propertyTypeAnnotation.params.map((p, i) =>
+                serializeArg(moduleName, p, i, resolveAlias, enumMap),
+              ),
+              propertyTypeAnnotation.returnTypeAnnotation,
+            );
+          }),
+          methods: methods.map(
+            ({name: propertyName, typeAnnotation: nullableTypeAnnotation}) => {
+              const [{params}] = unwrapNullable(nullableTypeAnnotation);
+              return {
+                methodName: propertyName,
+                paramCount: params.length,
+              };
+            },
           ),
         }),
       ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native/codegen",
-  "version": "0.83.0-nightly-20251014-69dc65500",
+  "version": "0.83.0-nightly-20251016-e79920c66",
   "description": "Code generation tools for React Native",
   "license": "MIT",
   "repository": {

package/lib/generators/modules/GenerateModuleCpp.js

@@ -1,230 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- *
- * @format
- */
-
-'use strict';
-
-const {unwrapNullable} = require('../../parsers/parsers-commons');
-const {createAliasResolver, getModules} = require('./Utils');
-const HostFunctionTemplate = ({
-  hasteModuleName,
-  methodName,
-  returnTypeAnnotation,
-  args,
-}) => {
-  const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
-  const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
-  const methodCallArgs = ['    rt', ...args].join(',\n    ');
-  const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(\n${methodCallArgs}\n  )`;
-  return `static jsi::Value __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {${isVoid ? `\n  ${methodCall};` : isNullable ? `\n  auto result = ${methodCall};` : ''}
-  return ${isVoid ? 'jsi::Value::undefined()' : isNullable ? 'result ? jsi::Value(std::move(*result)) : jsi::Value::null()' : methodCall};
-}`;
-};
-const ModuleTemplate = ({
-  hasteModuleName,
-  hostFunctions,
-  moduleName,
-  methods,
-}) => {
-  return `${hostFunctions.join('\n')}
-
-${hasteModuleName}CxxSpecJSI::${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule("${moduleName}", jsInvoker) {
-${methods
-  .map(({methodName, paramCount}) => {
-    return `  methodMap_["${methodName}"] = MethodMetadata {${paramCount}, __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}};`;
-  })
-  .join('\n')}
-}`;
-};
-const FileTemplate = ({libraryName, modules}) => {
-  return `/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * ${'@'}generated by codegen project: GenerateModuleCpp.js
- */
-
-#include "${libraryName}JSI.h"
-
-namespace facebook::react {
-
-${modules}
-
-
-} // namespace facebook::react
-`;
-};
-function serializeArg(moduleName, arg, index, resolveAlias, enumMap) {
-  const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
-  const [typeAnnotation, nullable] = unwrapNullable(nullableTypeAnnotation);
-  let realTypeAnnotation = typeAnnotation;
-  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
-    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
-  }
-  function wrap(callback) {
-    const val = `args[${index}]`;
-    const expression = callback(val);
-
-    // param?: T
-    if (optional && !nullable) {
-      // throw new Error('are we hitting this case? ' + moduleName);
-      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
-    }
-
-    // param: ?T
-    // param?: ?T
-    if (nullable || optional) {
-      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
-    }
-
-    // param: T
-    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
-  }
-  switch (realTypeAnnotation.type) {
-    case 'ReservedTypeAnnotation':
-      switch (realTypeAnnotation.name) {
-        case 'RootTag':
-          return wrap(val => `${val}.asNumber()`);
-        default:
-          realTypeAnnotation.name;
-          throw new Error(
-            `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.name}"`,
-          );
-      }
-    case 'StringTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'StringLiteralTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'StringLiteralUnionTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'BooleanTypeAnnotation':
-      return wrap(val => `${val}.asBool()`);
-    case 'EnumDeclaration':
-      switch (realTypeAnnotation.memberType) {
-        case 'NumberTypeAnnotation':
-          return wrap(val => `${val}.asNumber()`);
-        case 'StringTypeAnnotation':
-          return wrap(val => `${val}.asString(rt)`);
-        default:
-          throw new Error(
-            `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
-          );
-      }
-    case 'NumberTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'FloatTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'DoubleTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'Int32TypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'NumberLiteralTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'ArrayTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt).asArray(rt)`);
-    case 'FunctionTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt).asFunction(rt)`);
-    case 'GenericObjectTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt)`);
-    case 'UnionTypeAnnotation':
-      switch (typeAnnotation.memberType) {
-        case 'NumberTypeAnnotation':
-          return wrap(val => `${val}.asNumber()`);
-        case 'ObjectTypeAnnotation':
-          return wrap(val => `${val}.asObject(rt)`);
-        case 'StringTypeAnnotation':
-          return wrap(val => `${val}.asString(rt)`);
-        default:
-          throw new Error(
-            `Unsupported union member type for param  "${arg.name}, found: ${realTypeAnnotation.memberType}"`,
-          );
-      }
-    case 'ObjectTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt)`);
-    case 'MixedTypeAnnotation':
-      return wrap(val => `jsi::Value(rt, ${val})`);
-    default:
-      realTypeAnnotation.type;
-      throw new Error(
-        `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
-      );
-  }
-}
-function serializePropertyIntoHostFunction(
-  moduleName,
-  hasteModuleName,
-  property,
-  resolveAlias,
-  enumMap,
-) {
-  const [propertyTypeAnnotation] = unwrapNullable(property.typeAnnotation);
-  return HostFunctionTemplate({
-    hasteModuleName,
-    methodName: property.name,
-    returnTypeAnnotation: propertyTypeAnnotation.returnTypeAnnotation,
-    args: propertyTypeAnnotation.params.map((p, i) =>
-      serializeArg(moduleName, p, i, resolveAlias, enumMap),
-    ),
-  });
-}
-module.exports = {
-  generate(
-    libraryName,
-    schema,
-    packageName,
-    assumeNonnull = false,
-    headerPrefix,
-  ) {
-    const nativeModules = getModules(schema);
-    const modules = Object.keys(nativeModules)
-      .map(hasteModuleName => {
-        const nativeModule = nativeModules[hasteModuleName];
-        const {
-          aliasMap,
-          enumMap,
-          spec: {methods},
-          moduleName,
-        } = nativeModule;
-        const resolveAlias = createAliasResolver(aliasMap);
-        const hostFunctions = methods.map(property =>
-          serializePropertyIntoHostFunction(
-            moduleName,
-            hasteModuleName,
-            property,
-            resolveAlias,
-            enumMap,
-          ),
-        );
-        return ModuleTemplate({
-          hasteModuleName,
-          hostFunctions,
-          moduleName,
-          methods: methods.map(
-            ({name: propertyName, typeAnnotation: nullableTypeAnnotation}) => {
-              const [{params}] = unwrapNullable(nullableTypeAnnotation);
-              return {
-                methodName: propertyName,
-                paramCount: params.length,
-              };
-            },
-          ),
-        });
-      })
-      .join('\n');
-    const fileName = `${libraryName}JSI-generated.cpp`;
-    const replacedTemplate = FileTemplate({
-      modules,
-      libraryName,
-    });
-    return new Map([[fileName, replacedTemplate]]);
-  },
-};

package/lib/generators/modules/GenerateModuleCpp.js.flow

@@ -1,296 +0,0 @@
-/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow strict
- * @format
- */
-
-'use strict';
-
-import type {
-  NamedShape,
-  NativeModuleEnumMap,
-  NativeModuleFunctionTypeAnnotation,
-  NativeModuleParamTypeAnnotation,
-  NativeModulePropertyShape,
-  NativeModuleTypeAnnotation,
-  Nullable,
-  SchemaType,
-} from '../../CodegenSchema';
-import type {AliasResolver} from './Utils';
-
-const {unwrapNullable} = require('../../parsers/parsers-commons');
-const {createAliasResolver, getModules} = require('./Utils');
-
-type FilesOutput = Map<string, string>;
-
-const HostFunctionTemplate = ({
-  hasteModuleName,
-  methodName,
-  returnTypeAnnotation,
-  args,
-}: $ReadOnly<{
-  hasteModuleName: string,
-  methodName: string,
-  returnTypeAnnotation: Nullable<NativeModuleTypeAnnotation>,
-  args: Array<string>,
-}>) => {
-  const isNullable = returnTypeAnnotation.type === 'NullableTypeAnnotation';
-  const isVoid = returnTypeAnnotation.type === 'VoidTypeAnnotation';
-  const methodCallArgs = ['    rt', ...args].join(',\n    ');
-  const methodCall = `static_cast<${hasteModuleName}CxxSpecJSI *>(&turboModule)->${methodName}(\n${methodCallArgs}\n  )`;
-
-  return `static jsi::Value __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}(jsi::Runtime &rt, TurboModule &turboModule, const jsi::Value* args, size_t count) {${
-    isVoid
-      ? `\n  ${methodCall};`
-      : isNullable
-        ? `\n  auto result = ${methodCall};`
-        : ''
-  }
-  return ${
-    isVoid
-      ? 'jsi::Value::undefined()'
-      : isNullable
-        ? 'result ? jsi::Value(std::move(*result)) : jsi::Value::null()'
-        : methodCall
-  };
-}`;
-};
-
-const ModuleTemplate = ({
-  hasteModuleName,
-  hostFunctions,
-  moduleName,
-  methods,
-}: $ReadOnly<{
-  hasteModuleName: string,
-  hostFunctions: $ReadOnlyArray<string>,
-  moduleName: string,
-  methods: $ReadOnlyArray<$ReadOnly<{methodName: string, paramCount: number}>>,
-}>) => {
-  return `${hostFunctions.join('\n')}
-
-${hasteModuleName}CxxSpecJSI::${hasteModuleName}CxxSpecJSI(std::shared_ptr<CallInvoker> jsInvoker)
-  : TurboModule("${moduleName}", jsInvoker) {
-${methods
-  .map(({methodName, paramCount}) => {
-    return `  methodMap_["${methodName}"] = MethodMetadata {${paramCount}, __hostFunction_${hasteModuleName}CxxSpecJSI_${methodName}};`;
-  })
-  .join('\n')}
-}`;
-};
-
-const FileTemplate = ({
-  libraryName,
-  modules,
-}: $ReadOnly<{
-  libraryName: string,
-  modules: string,
-}>) => {
-  return `/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * ${'@'}generated by codegen project: GenerateModuleCpp.js
- */
-
-#include "${libraryName}JSI.h"
-
-namespace facebook::react {
-
-${modules}
-
-
-} // namespace facebook::react
-`;
-};
-
-type Param = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
-
-function serializeArg(
-  moduleName: string,
-  arg: Param,
-  index: number,
-  resolveAlias: AliasResolver,
-  enumMap: NativeModuleEnumMap,
-): string {
-  const {typeAnnotation: nullableTypeAnnotation, optional} = arg;
-  const [typeAnnotation, nullable] =
-    unwrapNullable<NativeModuleParamTypeAnnotation>(nullableTypeAnnotation);
-
-  let realTypeAnnotation = typeAnnotation;
-  if (realTypeAnnotation.type === 'TypeAliasTypeAnnotation') {
-    realTypeAnnotation = resolveAlias(realTypeAnnotation.name);
-  }
-
-  function wrap(callback: (val: string) => string) {
-    const val = `args[${index}]`;
-    const expression = callback(val);
-
-    // param?: T
-    if (optional && !nullable) {
-      // throw new Error('are we hitting this case? ' + moduleName);
-      return `count <= ${index} || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
-    }
-
-    // param: ?T
-    // param?: ?T
-    if (nullable || optional) {
-      return `count <= ${index} || ${val}.isNull() || ${val}.isUndefined() ? std::nullopt : std::make_optional(${expression})`;
-    }
-
-    // param: T
-    return `count <= ${index} ? throw jsi::JSError(rt, "Expected argument in position ${index} to be passed") : ${expression}`;
-  }
-
-  switch (realTypeAnnotation.type) {
-    case 'ReservedTypeAnnotation':
-      switch (realTypeAnnotation.name) {
-        case 'RootTag':
-          return wrap(val => `${val}.asNumber()`);
-        default:
-          (realTypeAnnotation.name: empty);
-          throw new Error(
-            `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.name}"`,
-          );
-      }
-    case 'StringTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'StringLiteralTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'StringLiteralUnionTypeAnnotation':
-      return wrap(val => `${val}.asString(rt)`);
-    case 'BooleanTypeAnnotation':
-      return wrap(val => `${val}.asBool()`);
-    case 'EnumDeclaration':
-      switch (realTypeAnnotation.memberType) {
-        case 'NumberTypeAnnotation':
-          return wrap(val => `${val}.asNumber()`);
-        case 'StringTypeAnnotation':
-          return wrap(val => `${val}.asString(rt)`);
-        default:
-          throw new Error(
-            `Unknown enum type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
-          );
-      }
-    case 'NumberTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'FloatTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'DoubleTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'Int32TypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'NumberLiteralTypeAnnotation':
-      return wrap(val => `${val}.asNumber()`);
-    case 'ArrayTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt).asArray(rt)`);
-    case 'FunctionTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt).asFunction(rt)`);
-    case 'GenericObjectTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt)`);
-    case 'UnionTypeAnnotation':
-      switch (typeAnnotation.memberType) {
-        case 'NumberTypeAnnotation':
-          return wrap(val => `${val}.asNumber()`);
-        case 'ObjectTypeAnnotation':
-          return wrap(val => `${val}.asObject(rt)`);
-        case 'StringTypeAnnotation':
-          return wrap(val => `${val}.asString(rt)`);
-        default:
-          throw new Error(
-            `Unsupported union member type for param  "${arg.name}, found: ${realTypeAnnotation.memberType}"`,
-          );
-      }
-    case 'ObjectTypeAnnotation':
-      return wrap(val => `${val}.asObject(rt)`);
-    case 'MixedTypeAnnotation':
-      return wrap(val => `jsi::Value(rt, ${val})`);
-    default:
-      (realTypeAnnotation.type: empty);
-      throw new Error(
-        `Unknown prop type for "${arg.name}, found: ${realTypeAnnotation.type}"`,
-      );
-  }
-}
-
-function serializePropertyIntoHostFunction(
-  moduleName: string,
-  hasteModuleName: string,
-  property: NativeModulePropertyShape,
-  resolveAlias: AliasResolver,
-  enumMap: NativeModuleEnumMap,
-): string {
-  const [propertyTypeAnnotation] =
-    unwrapNullable<NativeModuleFunctionTypeAnnotation>(property.typeAnnotation);
-
-  return HostFunctionTemplate({
-    hasteModuleName,
-    methodName: property.name,
-    returnTypeAnnotation: propertyTypeAnnotation.returnTypeAnnotation,
-    args: propertyTypeAnnotation.params.map((p, i) =>
-      serializeArg(moduleName, p, i, resolveAlias, enumMap),
-    ),
-  });
-}
-
-module.exports = {
-  generate(
-    libraryName: string,
-    schema: SchemaType,
-    packageName?: string,
-    assumeNonnull: boolean = false,
-    headerPrefix?: string,
-  ): FilesOutput {
-    const nativeModules = getModules(schema);
-
-    const modules = Object.keys(nativeModules)
-      .map((hasteModuleName: string) => {
-        const nativeModule = nativeModules[hasteModuleName];
-        const {
-          aliasMap,
-          enumMap,
-          spec: {methods},
-          moduleName,
-        } = nativeModule;
-        const resolveAlias = createAliasResolver(aliasMap);
-        const hostFunctions = methods.map(property =>
-          serializePropertyIntoHostFunction(
-            moduleName,
-            hasteModuleName,
-            property,
-            resolveAlias,
-            enumMap,
-          ),
-        );
-
-        return ModuleTemplate({
-          hasteModuleName,
-          hostFunctions,
-          moduleName,
-          methods: methods.map(
-            ({name: propertyName, typeAnnotation: nullableTypeAnnotation}) => {
-              const [{params}] = unwrapNullable(nullableTypeAnnotation);
-              return {
-                methodName: propertyName,
-                paramCount: params.length,
-              };
-            },
-          ),
-        });
-      })
-      .join('\n');
-
-    const fileName = `${libraryName}JSI-generated.cpp`;
-    const replacedTemplate = FileTemplate({
-      modules,
-      libraryName,
-    });
-    return new Map([[fileName, replacedTemplate]]);
-  },
-};