@react-native-windows/codegen 0.75.1 → 0.76.0-preview.1

package/lib-commonjs/generators/ParamTypes.js

@@ -5,7 +5,7 @@
  */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateArgs = exports.translateSpecArgs = void 0;
+exports.translateArgs = exports.translateEventEmitterArgs = exports.translateSpecArgs = void 0;
 const AliasManaging_1 = require("./AliasManaging");
 function decorateType(type, target) {
     switch (target) {
@@ -48,7 +48,7 @@ function translateFunction(param, aliases, baseAliasName, target, options) {
     }
 }
 function translateArray(param, aliases, baseAliasName, target, options) {
-    if (param.elementType) {
+    if (param.elementType.type !== 'AnyTypeAnnotation') {
         switch (target) {
             case 'spec':
             case 'template':
@@ -61,6 +61,17 @@ function translateArray(param, aliases, baseAliasName, target, options) {
         return decorateType('::React::JSValueArray', target);
     }
 }
+// Hopefully eventually NativeModuleEventEmitterTypeAnnotation will align better with NativeModuleParamTypeAnnotation
+// and this method can be merged / replaced with translateArray
+function translateEventEmitterArray(param, aliases, baseAliasName, target, options) {
+    switch (target) {
+        case 'spec':
+        case 'template':
+            return `std::vector<${translateEventEmitterParam(param.elementType, aliases, `${baseAliasName}_element`, 'template', options)}>`;
+        default:
+            return `std::vector<${translateEventEmitterParam(param.elementType, aliases, `${baseAliasName}_element`, 'template', options)}> const &`;
+    }
+}
 function translateParam(param, aliases, baseAliasName, target, options) {
     // avoid: Property 'type' does not exist on type 'never'
     const paramType = param.type;
@@ -99,6 +110,34 @@ function translateParam(param, aliases, baseAliasName, target, options) {
         case 'EnumDeclaration':
         case 'UnionTypeAnnotation':
             return translateUnionReturnType(param, target, options);
+        case 'AnyTypeAnnotation':
+            return decorateType('::React::JSValue', target);
+        default:
+            throw new Error(`Unhandled type in translateParam: ${paramType}`);
+    }
+}
+// Hopefully eventually NativeModuleEventEmitterTypeAnnotation will align better with NativeModuleParamTypeAnnotation
+// and this method can be merged / replaced with translateParam
+function translateEventEmitterParam(param, aliases, baseAliasName, target, options) {
+    // avoid: Property 'type' does not exist on type 'never'
+    const paramType = param.type;
+    switch (param.type) {
+        case 'StringTypeAnnotation':
+            return options.cppStringType;
+        case 'NumberTypeAnnotation':
+        case 'FloatTypeAnnotation':
+        case 'DoubleTypeAnnotation':
+            return 'double';
+        case 'Int32TypeAnnotation':
+            return 'int';
+        case 'BooleanTypeAnnotation':
+            return 'bool';
+        case 'ArrayTypeAnnotation':
+            return translateEventEmitterArray(param, aliases, baseAliasName, target, options);
+        case 'TypeAliasTypeAnnotation':
+            return decorateType((0, AliasManaging_1.getAliasCppName)(param.name), target);
+        case 'VoidTypeAnnotation':
+            return 'void';
         default:
             throw new Error(`Unhandled type in translateParam: ${paramType}`);
     }
@@ -127,6 +166,11 @@ function translateSpecArgs(params, aliases, baseAliasName, options) {
     });
 }
 exports.translateSpecArgs = translateSpecArgs;
+function translateEventEmitterArgs(params, aliases, baseAliasName, options) {
+    const translatedParam = translateEventEmitterParam(params, aliases, baseAliasName, 'spec', options);
+    return `${translatedParam}`;
+}
+exports.translateEventEmitterArgs = translateEventEmitterArgs;
 function translateArgs(params, aliases, baseAliasName, options) {
     return params.map(param => {
         const translatedParam = translateFunctionParam(param, aliases, `${baseAliasName}_${param.name}`, options);

package/lib-commonjs/generators/ParamTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"ParamTypes.js","sourceRoot":"","sources":["../../src/generators/ParamTypes.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {\n  NamedShape,\n  NativeModuleArrayTypeAnnotation,\n  NativeModuleBaseTypeAnnotation,\n  NativeModuleEnumDeclaration,\n  NativeModuleFunctionTypeAnnotation,\n  NativeModuleParamTypeAnnotation,\n  NativeModuleUnionTypeAnnotation,\n  Nullable,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {\n  AliasMap,\n  getAliasCppName,\n  getAnonymousAliasCppName,\n} from './AliasManaging';\nimport type {CppCodegenOptions} from './ObjectTypes';\n\ntype NativeModuleParamShape = NamedShape<\n  Nullable<NativeModuleParamTypeAnnotation>\n>;\n\ntype ParamTarget = 'spec' | 'template' | 'callback-arg' | 'method-arg';\n\nfunction decorateType(type: string, target: ParamTarget): string {\n  switch (target) {\n    case 'method-arg':\n      return `${type} &&`;\n    case 'callback-arg':\n      return `${type} const &`;\n    default:\n      return type;\n  }\n}\n\nfunction translateUnionReturnType(\n  type: NativeModuleEnumDeclaration | NativeModuleUnionTypeAnnotation,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  const memberType = type.memberType;\n  switch (type.memberType) {\n    case 'StringTypeAnnotation':\n      return options.cppStringType;\n    case 'NumberTypeAnnotation':\n      return 'double';\n    case 'ObjectTypeAnnotation':\n      return decorateType('::React::JSValue', target);\n    default:\n      throw new Error(\n        `Unknown enum/union member type in translateReturnType: ${memberType}`,\n      );\n  }\n}\n\nfunction translateFunction(\n  param: NativeModuleFunctionTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  // TODO: type.returnTypeAnnotation\n  switch (target) {\n    case 'spec':\n      return `Callback<${param.params\n        .map((p: NativeModuleParamShape) =>\n          translateSpecFunctionParam(\n            p,\n            aliases,\n            `${baseAliasName}_${p.name}`,\n            options,\n          ),\n        )\n        .join(', ')}>`;\n    case 'template':\n      return `std::function<void(${param.params\n        .map((p: NativeModuleParamShape) =>\n          translateCallbackParam(\n            p,\n            aliases,\n            `${baseAliasName}_${p.name}`,\n            options,\n          ),\n        )\n        .join(', ')})>`;\n    default:\n      return `std::function<void(${param.params\n        .map((p: NativeModuleParamShape) =>\n          translateCallbackParam(\n            p,\n            aliases,\n            `${baseAliasName}_${p.name}`,\n            options,\n          ),\n        )\n        .join(', ')})> const &`;\n  }\n}\n\nfunction translateArray(\n  param: NativeModuleArrayTypeAnnotation<\n    Nullable<NativeModuleBaseTypeAnnotation>\n  >,\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  if (param.elementType) {\n    switch (target) {\n      case 'spec':\n      case 'template':\n        return `std::vector<${translateNullableParamType(\n          param.elementType,\n          aliases,\n          `${baseAliasName}_element`,\n          'template',\n          'template',\n          options,\n        )}>`;\n      default:\n        return `std::vector<${translateNullableParamType(\n          param.elementType,\n          aliases,\n          `${baseAliasName}_element`,\n          'template',\n          'template',\n          options,\n        )}> const &`;\n    }\n  } else {\n    return decorateType('::React::JSValueArray', target);\n  }\n}\n\nfunction translateParam(\n  param: NativeModuleParamTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  // avoid: Property 'type' does not exist on type 'never'\n  const paramType = param.type;\n  switch (param.type) {\n    case 'StringTypeAnnotation':\n      return options.cppStringType;\n    case 'NumberTypeAnnotation':\n    case 'FloatTypeAnnotation':\n    case 'DoubleTypeAnnotation':\n      return 'double';\n    case 'Int32TypeAnnotation':\n      return 'int';\n    case 'BooleanTypeAnnotation':\n      return 'bool';\n    case 'FunctionTypeAnnotation':\n      return translateFunction(param, aliases, baseAliasName, target, options);\n    case 'ArrayTypeAnnotation':\n      return translateArray(param, aliases, baseAliasName, target, options);\n    case 'GenericObjectTypeAnnotation':\n      return decorateType('::React::JSValue', target);\n    case 'ObjectTypeAnnotation':\n      return decorateType(\n        getAnonymousAliasCppName(aliases, baseAliasName, param),\n        target,\n      );\n    case 'ReservedTypeAnnotation': {\n      // avoid: Property 'name' does not exist on type 'never'\n      const name = param.name;\n      // (#6597)\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (name !== 'RootTag')\n        throw new Error(`Unknown reserved function: ${name} in translateParam`);\n      return 'double';\n    }\n    case 'TypeAliasTypeAnnotation':\n      return decorateType(getAliasCppName(param.name), target);\n    case 'MixedTypeAnnotation':\n      return '';\n    case 'EnumDeclaration':\n    case 'UnionTypeAnnotation':\n      return translateUnionReturnType(param, target, options);\n    default:\n      throw new Error(`Unhandled type in translateParam: ${paramType}`);\n  }\n}\n\nfunction translateNullableParamType(\n  paramType: Nullable<NativeModuleParamTypeAnnotation>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  nullableTarget: ParamTarget,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  switch (paramType.type) {\n    case 'NullableTypeAnnotation':\n      return `std::optional<${translateParam(\n        paramType.typeAnnotation,\n        aliases,\n        baseAliasName,\n        nullableTarget,\n        options,\n      )}>`;\n    default:\n      return translateParam(paramType, aliases, baseAliasName, target, options);\n  }\n}\n\nfunction translateSpecFunctionParam(\n  param: NativeModuleParamShape,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateNullableParamType(\n    param.typeAnnotation,\n    aliases,\n    baseAliasName,\n    'spec',\n    'spec',\n    options,\n  );\n}\n\nfunction translateCallbackParam(\n  param: NativeModuleParamShape,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateNullableParamType(\n    param.typeAnnotation,\n    aliases,\n    baseAliasName,\n    'template',\n    'callback-arg',\n    options,\n  );\n}\n\nfunction translateFunctionParam(\n  param: NativeModuleParamShape,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateNullableParamType(\n    param.typeAnnotation,\n    aliases,\n    baseAliasName,\n    'template',\n    'method-arg',\n    options,\n  );\n}\n\nexport function translateSpecArgs(\n  params: ReadonlyArray<NativeModuleParamShape>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n) {\n  return params.map(param => {\n    const translatedParam = translateSpecFunctionParam(\n      param,\n      aliases,\n      `${baseAliasName}_${param.name}`,\n      options,\n    );\n    return `${translatedParam}`;\n  });\n}\n\nexport function translateArgs(\n  params: ReadonlyArray<NativeModuleParamShape>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n) {\n  return params.map(param => {\n    const translatedParam = translateFunctionParam(\n      param,\n      aliases,\n      `${baseAliasName}_${param.name}`,\n      options,\n    );\n    return `${translatedParam} ${param.name}`;\n  });\n}\n"]}
+{"version":3,"file":"ParamTypes.js","sourceRoot":"","sources":["../../src/generators/ParamTypes.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {\n  NamedShape,\n  NativeModuleArrayTypeAnnotation,\n  NativeModuleBaseTypeAnnotation,\n  NativeModuleEventEmitterBaseTypeAnnotation,\n  NativeModuleEventEmitterTypeAnnotation,\n  NativeModuleEnumDeclaration,\n  NativeModuleFunctionTypeAnnotation,\n  NativeModuleParamTypeAnnotation,\n  NativeModuleUnionTypeAnnotation,\n  UnsafeAnyTypeAnnotation,\n  Nullable,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {\n  AliasMap,\n  getAliasCppName,\n  getAnonymousAliasCppName,\n} from './AliasManaging';\nimport type {CppCodegenOptions} from './ObjectTypes';\n\ntype NativeModuleParamShape = NamedShape<\n  Nullable<NativeModuleParamTypeAnnotation>\n>;\n\ntype ParamTarget = 'spec' | 'template' | 'callback-arg' | 'method-arg';\n\nfunction decorateType(type: string, target: ParamTarget): string {\n  switch (target) {\n    case 'method-arg':\n      return `${type} &&`;\n    case 'callback-arg':\n      return `${type} const &`;\n    default:\n      return type;\n  }\n}\n\nfunction translateUnionReturnType(\n  type: NativeModuleEnumDeclaration | NativeModuleUnionTypeAnnotation,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  const memberType = type.memberType;\n  switch (type.memberType) {\n    case 'StringTypeAnnotation':\n      return options.cppStringType;\n    case 'NumberTypeAnnotation':\n      return 'double';\n    case 'ObjectTypeAnnotation':\n      return decorateType('::React::JSValue', target);\n    default:\n      throw new Error(\n        `Unknown enum/union member type in translateReturnType: ${memberType}`,\n      );\n  }\n}\n\nfunction translateFunction(\n  param: NativeModuleFunctionTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  // TODO: type.returnTypeAnnotation\n  switch (target) {\n    case 'spec':\n      return `Callback<${param.params\n        .map((p: NativeModuleParamShape) =>\n          translateSpecFunctionParam(\n            p,\n            aliases,\n            `${baseAliasName}_${p.name}`,\n            options,\n          ),\n        )\n        .join(', ')}>`;\n    case 'template':\n      return `std::function<void(${param.params\n        .map((p: NativeModuleParamShape) =>\n          translateCallbackParam(\n            p,\n            aliases,\n            `${baseAliasName}_${p.name}`,\n            options,\n          ),\n        )\n        .join(', ')})>`;\n    default:\n      return `std::function<void(${param.params\n        .map((p: NativeModuleParamShape) =>\n          translateCallbackParam(\n            p,\n            aliases,\n            `${baseAliasName}_${p.name}`,\n            options,\n          ),\n        )\n        .join(', ')})> const &`;\n  }\n}\n\nfunction translateArray(\n  param: NativeModuleArrayTypeAnnotation<\n    Nullable<NativeModuleBaseTypeAnnotation>\n  >,\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  if (param.elementType.type !== 'AnyTypeAnnotation') {\n    switch (target) {\n      case 'spec':\n      case 'template':\n        return `std::vector<${translateNullableParamType(\n          param.elementType,\n          aliases,\n          `${baseAliasName}_element`,\n          'template',\n          'template',\n          options,\n        )}>`;\n      default:\n        return `std::vector<${translateNullableParamType(\n          param.elementType,\n          aliases,\n          `${baseAliasName}_element`,\n          'template',\n          'template',\n          options,\n        )}> const &`;\n    }\n  } else {\n    return decorateType('::React::JSValueArray', target);\n  }\n}\n\n// Hopefully eventually NativeModuleEventEmitterTypeAnnotation will align better with NativeModuleParamTypeAnnotation\n// and this method can be merged / replaced with translateArray\nfunction translateEventEmitterArray(\n  param: {\n    readonly type: 'ArrayTypeAnnotation';\n    readonly elementType: NativeModuleEventEmitterBaseTypeAnnotation | {type: string};\n  },\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  switch (target) {\n    case 'spec':\n    case 'template':\n      return `std::vector<${translateEventEmitterParam(\n        param.elementType as NativeModuleEventEmitterBaseTypeAnnotation,\n        aliases,\n        `${baseAliasName}_element`,\n        'template',\n        options,\n      )}>`;\n    default:\n      return `std::vector<${translateEventEmitterParam(\n        param.elementType as NativeModuleEventEmitterBaseTypeAnnotation,\n        aliases,\n        `${baseAliasName}_element`,\n        'template',\n        options,\n      )}> const &`;\n  }\n}\n\nfunction translateParam(\n  param: NativeModuleParamTypeAnnotation | UnsafeAnyTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  // avoid: Property 'type' does not exist on type 'never'\n  const paramType = param.type;\n  switch (param.type) {\n    case 'StringTypeAnnotation':\n      return options.cppStringType;\n    case 'NumberTypeAnnotation':\n    case 'FloatTypeAnnotation':\n    case 'DoubleTypeAnnotation':\n      return 'double';\n    case 'Int32TypeAnnotation':\n      return 'int';\n    case 'BooleanTypeAnnotation':\n      return 'bool';\n    case 'FunctionTypeAnnotation':\n      return translateFunction(param, aliases, baseAliasName, target, options);\n    case 'ArrayTypeAnnotation':\n      return translateArray(param, aliases, baseAliasName, target, options);\n    case 'GenericObjectTypeAnnotation':\n      return decorateType('::React::JSValue', target);\n    case 'ObjectTypeAnnotation':\n      return decorateType(\n        getAnonymousAliasCppName(aliases, baseAliasName, param),\n        target,\n      );\n    case 'ReservedTypeAnnotation': {\n      // avoid: Property 'name' does not exist on type 'never'\n      const name = param.name;\n      // (#6597)\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (name !== 'RootTag')\n        throw new Error(`Unknown reserved function: ${name} in translateParam`);\n      return 'double';\n    }\n    case 'TypeAliasTypeAnnotation':\n      return decorateType(getAliasCppName(param.name), target);\n    case 'MixedTypeAnnotation':\n      return '';\n    case 'EnumDeclaration':\n    case 'UnionTypeAnnotation':\n      return translateUnionReturnType(param, target, options);\n    case 'AnyTypeAnnotation':\n      return decorateType('::React::JSValue', target);\n    default:\n      throw new Error(`Unhandled type in translateParam: ${paramType}`);\n  }\n}\n\n// Hopefully eventually NativeModuleEventEmitterTypeAnnotation will align better with NativeModuleParamTypeAnnotation\n// and this method can be merged / replaced with translateParam\nfunction translateEventEmitterParam(\n  param: NativeModuleEventEmitterTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  // avoid: Property 'type' does not exist on type 'never'\n  const paramType = param.type;\n  switch (param.type) {\n    case 'StringTypeAnnotation':\n      return options.cppStringType;\n    case 'NumberTypeAnnotation':\n    case 'FloatTypeAnnotation':\n    case 'DoubleTypeAnnotation':\n      return 'double';\n    case 'Int32TypeAnnotation':\n      return 'int';\n    case 'BooleanTypeAnnotation':\n      return 'bool';\n    case 'ArrayTypeAnnotation':\n      return translateEventEmitterArray(param, aliases, baseAliasName, target, options);\n    case 'TypeAliasTypeAnnotation':\n      return decorateType(getAliasCppName(param.name), target);\n    case 'VoidTypeAnnotation':\n      return 'void';\n    default:\n      throw new Error(`Unhandled type in translateParam: ${paramType}`);\n  }\n}\n\nfunction translateNullableParamType(\n  paramType: Nullable<NativeModuleParamTypeAnnotation> | UnsafeAnyTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  nullableTarget: ParamTarget,\n  target: ParamTarget,\n  options: CppCodegenOptions,\n): string {\n  switch (paramType.type) {\n    case 'NullableTypeAnnotation':\n      return `std::optional<${translateParam(\n        paramType.typeAnnotation,\n        aliases,\n        baseAliasName,\n        nullableTarget,\n        options,\n      )}>`;\n    default:\n      return translateParam(paramType, aliases, baseAliasName, target, options);\n  }\n}\n\nfunction translateSpecFunctionParam(\n  param: NativeModuleParamShape,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateNullableParamType(\n    param.typeAnnotation,\n    aliases,\n    baseAliasName,\n    'spec',\n    'spec',\n    options,\n  );\n}\n\nfunction translateCallbackParam(\n  param: NativeModuleParamShape,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateNullableParamType(\n    param.typeAnnotation,\n    aliases,\n    baseAliasName,\n    'template',\n    'callback-arg',\n    options,\n  );\n}\n\nfunction translateFunctionParam(\n  param: NativeModuleParamShape,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateNullableParamType(\n    param.typeAnnotation,\n    aliases,\n    baseAliasName,\n    'template',\n    'method-arg',\n    options,\n  );\n}\n\nexport function translateSpecArgs(\n  params: ReadonlyArray<NativeModuleParamShape>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n) {\n  return params.map(param => {\n    const translatedParam = translateSpecFunctionParam(\n      param,\n      aliases,\n      `${baseAliasName}_${param.name}`,\n      options,\n    );\n    return `${translatedParam}`;\n  });\n}\n\nexport function translateEventEmitterArgs(\n  params: NativeModuleEventEmitterTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n) {\n    const translatedParam = translateEventEmitterParam(\n      params,\n      aliases,\n      baseAliasName,\n      'spec',\n      options,\n    );\n    return `${translatedParam}`;\n}\n\nexport function translateArgs(\n  params: ReadonlyArray<NativeModuleParamShape>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n) {\n  return params.map(param => {\n    const translatedParam = translateFunctionParam(\n      param,\n      aliases,\n      `${baseAliasName}_${param.name}`,\n      options,\n    );\n    return `${translatedParam} ${param.name}`;\n  });\n}\n"]}

package/lib-commonjs/generators/ValidateMethods.d.ts

@@ -6,4 +6,9 @@
 import type { NativeModuleSchema } from '@react-native/codegen/lib/CodegenSchema';
 import { AliasMap } from './AliasManaging';
 import type { CppCodegenOptions } from './ObjectTypes';
-export declare function generateValidateMethods(nativeModule: NativeModuleSchema, aliases: AliasMap, options: CppCodegenOptions): [string, string];
+export declare function generateValidateMethods(nativeModule: NativeModuleSchema, aliases: AliasMap, options: CppCodegenOptions): {
+    traversedProperties: string;
+    traversedEventEmitters: string;
+    traversedPropertyTuples: string;
+    traversedEventEmitterTuples: string;
+};

package/lib-commonjs/generators/ValidateMethods.js

@@ -34,7 +34,7 @@ function translatePossibleMethodSignatures(prop, funcType, aliases, baseAliasNam
 }
 function renderProperties(methods, aliases, tuple, options) {
     // TODO: generate code for constants
-    return methods
+    const properties = methods
         .filter(prop => prop.name !== 'getConstants')
         .map((prop, index) => {
         // TODO: prop.optional === true
@@ -62,14 +62,42 @@ function renderProperties(methods, aliases, tuple, options) {
           "${prop.name}",
           ${translatePossibleMethodSignatures(prop, funcType, aliases, propAliasName, options)});`;
         }
+    });
+    return { code: properties.join('\n'), numberOfProperties: properties.length };
+}
+function getPossibleEventEmitterSignatures(eventEmitter, aliases, options) {
+    const traversedArgs = (0, ParamTypes_1.translateEventEmitterArgs)(eventEmitter.typeAnnotation.typeAnnotation, aliases, eventEmitter.name, options);
+    return [`REACT_EVENT(${eventEmitter.name}) std::function<void(${traversedArgs})> ${eventEmitter.name};`];
+}
+function translatePossibleEventSignatures(eventEmitter, aliases, options) {
+    return getPossibleEventEmitterSignatures(eventEmitter, aliases, options)
+        .map(sig => `"    ${sig}\\n"`)
+        .join('\n          ');
+}
+function renderEventEmitters(eventEmitters, indexOffset, aliases, tuple, options) {
+    return eventEmitters
+        .map((eventEmitter, index) => {
+        const traversedArgs = (0, ParamTypes_1.translateEventEmitterArgs)(eventEmitter.typeAnnotation.typeAnnotation, aliases, eventEmitter.name, options);
+        if (tuple) {
+            return `      EventEmitter<void(${traversedArgs})>{${index + indexOffset}, L"${eventEmitter.name}"},`;
+        }
+        else {
+            return `    REACT_SHOW_EVENTEMITTER_SPEC_ERRORS(
+          ${index + indexOffset},
+          "${eventEmitter.name}",
+          ${translatePossibleEventSignatures(eventEmitter, aliases, options)});`;
+        }
     })
         .join('\n');
 }
 function generateValidateMethods(nativeModule, aliases, options) {
     const methods = nativeModule.spec.methods;
+    const eventEmitters = nativeModule.spec.eventEmitters;
     const traversedProperties = renderProperties(methods, aliases, false, options);
+    const traversedEventEmitters = renderEventEmitters(eventEmitters, traversedProperties.numberOfProperties, aliases, false, options);
     const traversedPropertyTuples = renderProperties(methods, aliases, true, options);
-    return [traversedPropertyTuples, traversedProperties];
+    const traversedEventEmitterTuples = renderEventEmitters(eventEmitters, traversedProperties.numberOfProperties, aliases, true, options);
+    return { traversedPropertyTuples: traversedPropertyTuples.code, traversedEventEmitterTuples, traversedProperties: traversedProperties.code, traversedEventEmitters };
 }
 exports.generateValidateMethods = generateValidateMethods;
 //# sourceMappingURL=ValidateMethods.js.map

package/lib-commonjs/generators/ValidateMethods.js.map

@@ -1 +1 @@
-{"version":3,"file":"ValidateMethods.js","sourceRoot":"","sources":["../../src/generators/ValidateMethods.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {\n  NativeModuleFunctionTypeAnnotation,\n  NativeModulePropertyShape,\n  NativeModuleSchema,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap} from './AliasManaging';\nimport type {CppCodegenOptions} from './ObjectTypes';\nimport {translateArgs, translateSpecArgs} from './ParamTypes';\nimport {translateImplReturnType, translateSpecReturnType} from './ReturnTypes';\n\nfunction isMethodSync(funcType: NativeModuleFunctionTypeAnnotation) {\n  return (\n    funcType.returnTypeAnnotation.type !== 'VoidTypeAnnotation' &&\n    funcType.returnTypeAnnotation.type !== 'PromiseTypeAnnotation'\n  );\n}\n\nfunction getPossibleMethodSignatures(\n  prop: NativeModulePropertyShape,\n  funcType: NativeModuleFunctionTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string[] {\n  const args = translateArgs(funcType.params, aliases, baseAliasName, options);\n  if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {\n    if (funcType.returnTypeAnnotation.elementType) {\n      args.push(\n        `::React::ReactPromise<${translateImplReturnType(\n          funcType.returnTypeAnnotation.elementType,\n          aliases,\n          baseAliasName,\n          options,\n        )}> &&result`,\n      );\n    } else {\n      args.push('::React::ReactPromise<::React::JSValue> &&result');\n    }\n  }\n\n  // TODO: be much more exhaustive on the possible method signatures that can be used..\n  const sig = `REACT_${isMethodSync(funcType) ? 'SYNC_' : ''}METHOD(${\n    prop.name\n  }) ${translateImplReturnType(\n    funcType.returnTypeAnnotation,\n    aliases,\n    baseAliasName,\n    options,\n  )} ${prop.name}(${args.join(', ')}) noexcept { /* implementation */ }`;\n\n  const staticsig = `REACT_${isMethodSync(funcType) ? 'SYNC_' : ''}METHOD(${\n    prop.name\n  }) static ${translateImplReturnType(\n    funcType.returnTypeAnnotation,\n    aliases,\n    baseAliasName,\n    options,\n  )} ${prop.name}(${args.join(', ')}) noexcept { /* implementation */ }`;\n\n  return [sig, staticsig];\n}\n\nfunction translatePossibleMethodSignatures(\n  prop: NativeModulePropertyShape,\n  funcType: NativeModuleFunctionTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return getPossibleMethodSignatures(\n    prop,\n    funcType,\n    aliases,\n    baseAliasName,\n    options,\n  )\n    .map(sig => `\"    ${sig}\\\\n\"`)\n    .join('\\n          ');\n}\n\nfunction renderProperties(\n  methods: ReadonlyArray<NativeModulePropertyShape>,\n  aliases: AliasMap,\n  tuple: boolean,\n  options: CppCodegenOptions,\n): string {\n  // TODO: generate code for constants\n  return methods\n    .filter(prop => prop.name !== 'getConstants')\n    .map((prop, index) => {\n      // TODO: prop.optional === true\n      // TODO: prop.typeAnnotation.type === 'NullableTypeAnnotation'\n      const propAliasName = prop.name;\n      const funcType =\n        prop.typeAnnotation.type === 'NullableTypeAnnotation'\n          ? prop.typeAnnotation.typeAnnotation\n          : prop.typeAnnotation;\n\n      const traversedArgs = translateSpecArgs(\n        funcType.params,\n        aliases,\n        propAliasName,\n        options,\n      );\n\n      const translatedReturnParam = translateSpecReturnType(\n        funcType.returnTypeAnnotation,\n        aliases,\n        propAliasName,\n        options,\n      );\n\n      if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {\n        if (funcType.returnTypeAnnotation.elementType) {\n          traversedArgs.push(\n            `Promise<${translateSpecReturnType(\n              funcType.returnTypeAnnotation.elementType,\n              aliases,\n              propAliasName,\n              options,\n            )}>`,\n          );\n        } else {\n          traversedArgs.push('Promise<::React::JSValue>');\n        }\n      }\n\n      if (tuple) {\n        return `      ${\n          isMethodSync(funcType) ? 'Sync' : ''\n        }Method<${translatedReturnParam}(${traversedArgs.join(\n          ', ',\n        )}) noexcept>{${index}, L\"${prop.name}\"},`;\n      } else {\n        return `    REACT_SHOW_METHOD_SPEC_ERRORS(\n          ${index},\n          \"${prop.name}\",\n          ${translatePossibleMethodSignatures(\n            prop,\n            funcType,\n            aliases,\n            propAliasName,\n            options,\n          )});`;\n      }\n    })\n    .join('\\n');\n}\n\nexport function generateValidateMethods(\n  nativeModule: NativeModuleSchema,\n  aliases: AliasMap,\n  options: CppCodegenOptions,\n): [string, string] {\n  const methods = nativeModule.spec.methods;\n  const traversedProperties = renderProperties(\n    methods,\n    aliases,\n    false,\n    options,\n  );\n  const traversedPropertyTuples = renderProperties(\n    methods,\n    aliases,\n    true,\n    options,\n  );\n  return [traversedPropertyTuples, traversedProperties];\n}\n"]}
+{"version":3,"file":"ValidateMethods.js","sourceRoot":"","sources":["../../src/generators/ValidateMethods.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {\n  NativeModuleEventEmitterShape,\n  NativeModuleFunctionTypeAnnotation,\n  NativeModulePropertyShape,\n  NativeModuleSchema,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap} from './AliasManaging';\nimport type {CppCodegenOptions} from './ObjectTypes';\nimport {translateArgs, translateSpecArgs, translateEventEmitterArgs} from './ParamTypes';\nimport {translateImplReturnType, translateSpecReturnType} from './ReturnTypes';\n\nfunction isMethodSync(funcType: NativeModuleFunctionTypeAnnotation) {\n  return (\n    funcType.returnTypeAnnotation.type !== 'VoidTypeAnnotation' &&\n    funcType.returnTypeAnnotation.type !== 'PromiseTypeAnnotation'\n  );\n}\n\nfunction getPossibleMethodSignatures(\n  prop: NativeModulePropertyShape,\n  funcType: NativeModuleFunctionTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string[] {\n  const args = translateArgs(funcType.params, aliases, baseAliasName, options);\n  if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {\n    if (funcType.returnTypeAnnotation.elementType) {\n      args.push(\n        `::React::ReactPromise<${translateImplReturnType(\n          funcType.returnTypeAnnotation.elementType,\n          aliases,\n          baseAliasName,\n          options,\n        )}> &&result`,\n      );\n    } else {\n      args.push('::React::ReactPromise<::React::JSValue> &&result');\n    }\n  }\n\n  // TODO: be much more exhaustive on the possible method signatures that can be used..\n  const sig = `REACT_${isMethodSync(funcType) ? 'SYNC_' : ''}METHOD(${\n    prop.name\n  }) ${translateImplReturnType(\n    funcType.returnTypeAnnotation,\n    aliases,\n    baseAliasName,\n    options,\n  )} ${prop.name}(${args.join(', ')}) noexcept { /* implementation */ }`;\n\n  const staticsig = `REACT_${isMethodSync(funcType) ? 'SYNC_' : ''}METHOD(${\n    prop.name\n  }) static ${translateImplReturnType(\n    funcType.returnTypeAnnotation,\n    aliases,\n    baseAliasName,\n    options,\n  )} ${prop.name}(${args.join(', ')}) noexcept { /* implementation */ }`;\n\n  return [sig, staticsig];\n}\n\nfunction translatePossibleMethodSignatures(\n  prop: NativeModulePropertyShape,\n  funcType: NativeModuleFunctionTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return getPossibleMethodSignatures(\n    prop,\n    funcType,\n    aliases,\n    baseAliasName,\n    options,\n  )\n    .map(sig => `\"    ${sig}\\\\n\"`)\n    .join('\\n          ');\n}\n\nfunction renderProperties(\n  methods: ReadonlyArray<NativeModulePropertyShape>,\n  aliases: AliasMap,\n  tuple: boolean,\n  options: CppCodegenOptions,\n): { code: string, numberOfProperties: number } {\n  // TODO: generate code for constants\n  const properties = methods\n    .filter(prop => prop.name !== 'getConstants')\n    .map((prop, index) => {\n      // TODO: prop.optional === true\n      // TODO: prop.typeAnnotation.type === 'NullableTypeAnnotation'\n      const propAliasName = prop.name;\n      const funcType =\n        prop.typeAnnotation.type === 'NullableTypeAnnotation'\n          ? prop.typeAnnotation.typeAnnotation\n          : prop.typeAnnotation;\n\n      const traversedArgs = translateSpecArgs(\n        funcType.params,\n        aliases,\n        propAliasName,\n        options,\n      );\n\n      const translatedReturnParam = translateSpecReturnType(\n        funcType.returnTypeAnnotation,\n        aliases,\n        propAliasName,\n        options,\n      );\n\n      if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {\n        if (funcType.returnTypeAnnotation.elementType) {\n          traversedArgs.push(\n            `Promise<${translateSpecReturnType(\n              funcType.returnTypeAnnotation.elementType,\n              aliases,\n              propAliasName,\n              options,\n            )}>`,\n          );\n        } else {\n          traversedArgs.push('Promise<::React::JSValue>');\n        }\n      }\n\n      if (tuple) {\n        return `      ${\n          isMethodSync(funcType) ? 'Sync' : ''\n        }Method<${translatedReturnParam}(${traversedArgs.join(\n          ', ',\n        )}) noexcept>{${index}, L\"${prop.name}\"},`;\n      } else {\n        return `    REACT_SHOW_METHOD_SPEC_ERRORS(\n          ${index},\n          \"${prop.name}\",\n          ${translatePossibleMethodSignatures(\n            prop,\n            funcType,\n            aliases,\n            propAliasName,\n            options,\n          )});`;\n      }\n    });\n\n    return {code: properties.join('\\n'), numberOfProperties: properties.length};\n}\n\nfunction getPossibleEventEmitterSignatures(\n  eventEmitter: NativeModuleEventEmitterShape,\n  aliases: AliasMap,\n  options: CppCodegenOptions): string[] {\n  \n  const traversedArgs = translateEventEmitterArgs(\n    eventEmitter.typeAnnotation.typeAnnotation,\n    aliases,\n    eventEmitter.name,\n    options,\n  );\n  return [`REACT_EVENT(${eventEmitter.name}) std::function<void(${traversedArgs})> ${eventEmitter.name};`]\n}\n\nfunction translatePossibleEventSignatures(\n  eventEmitter: NativeModuleEventEmitterShape,\n  aliases: AliasMap,\n  options: CppCodegenOptions): string {\n  return getPossibleEventEmitterSignatures(\n    eventEmitter,\n    aliases,\n    options\n  )\n    .map(sig => `\"    ${sig}\\\\n\"`)\n    .join('\\n          ');\n}\n\nfunction renderEventEmitters(\n  eventEmitters: ReadonlyArray<NativeModuleEventEmitterShape>,\n  indexOffset: number,\n  aliases: AliasMap,\n  tuple: boolean,\n  options: CppCodegenOptions,\n): string {\n  return eventEmitters\n    .map((eventEmitter, index) => {\n      const traversedArgs = translateEventEmitterArgs(\n        eventEmitter.typeAnnotation.typeAnnotation,\n        aliases,\n        eventEmitter.name,\n        options,\n      );\n\n      if (tuple) {\n        return `      EventEmitter<void(${traversedArgs})>{${index + indexOffset}, L\"${eventEmitter.name}\"},`;\n      } else {\n        return `    REACT_SHOW_EVENTEMITTER_SPEC_ERRORS(\n          ${index + indexOffset},\n          \"${eventEmitter.name}\",\n          ${translatePossibleEventSignatures(\n            eventEmitter,\n            aliases,\n            options,\n      )});`;\n      }\n    })\n    .join('\\n');\n}\n\nexport function generateValidateMethods(\n  nativeModule: NativeModuleSchema,\n  aliases: AliasMap,\n  options: CppCodegenOptions,\n): {\n  traversedProperties: string,\n  traversedEventEmitters: string,\n  traversedPropertyTuples: string,\n  traversedEventEmitterTuples: string,\n} {\n  const methods = nativeModule.spec.methods;\n  const eventEmitters = nativeModule.spec.eventEmitters;\n  const traversedProperties = renderProperties(\n    methods,\n    aliases,\n    false,\n    options,\n  );\n  const traversedEventEmitters = renderEventEmitters(\n    eventEmitters,\n    traversedProperties.numberOfProperties,\n    aliases,\n    false,\n    options,\n  );\n  const traversedPropertyTuples = renderProperties(\n    methods,\n    aliases,\n    true,\n    options,\n  );\n  const traversedEventEmitterTuples = renderEventEmitters(\n    eventEmitters,\n    traversedProperties.numberOfProperties,\n    aliases,\n    true,\n    options,\n  );\n  return {traversedPropertyTuples: traversedPropertyTuples.code, traversedEventEmitterTuples, traversedProperties: traversedProperties.code, traversedEventEmitters};\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-windows/codegen",
-  "version": "0.75.1",
+  "version": "0.76.0-preview.1",
   "description": "Generators for react-native-codegen targeting react-native-windows",
   "main": "lib-commonjs/index.js",
   "repository": {
@@ -22,7 +22,7 @@
     "react-native-windows-codegen": "./bin.js"
   },
   "dependencies": {
-    "@react-native-windows/fs": "0.75.0",
+    "@react-native-windows/fs": "0.76.0-preview.1",
     "chalk": "^4.1.0",
     "globby": "^11.1.0",
     "mustache": "^4.0.1",
@@ -30,9 +30,9 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@rnw-scripts/eslint-config": "1.2.23",
-    "@rnw-scripts/jest-unittest-config": "1.5.8",
-    "@rnw-scripts/just-task": "2.3.40",
+    "@rnw-scripts/eslint-config": "1.2.27",
+    "@rnw-scripts/jest-unittest-config": "1.5.9",
+    "@rnw-scripts/just-task": "2.3.44",
     "@rnw-scripts/ts-config": "2.0.5",
     "@types/chalk": "^2.2.0",
     "@types/jest": "^29.2.2",
@@ -42,7 +42,7 @@
     "@typescript-eslint/parser": "^5.57.1",
     "babel-jest": "^29.6.3",
     "eslint": "^8.19.0",
-    "jest": "^29.6.3",
+    "jest": "^29.7.0",
     "prettier": "2.8.8",
     "typescript": "5.0.4"
   },
@@ -57,11 +57,11 @@
     "src"
   ],
   "beachball": {
-    "defaultNpmTag": "latest",
+    "defaultNpmTag": "preview",
     "disallowedChangeTypes": [
       "major",
       "minor",
-      "prerelease",
+      "patch",
       "premajor",
       "preminor",
       "prepatch"

package/src/Cli.ts

@@ -102,7 +102,7 @@ const changesNecessary = runCodeGen(<CodeGenOptions>argv);
 
 if (argv.test && changesNecessary) {
   console.error(
-    'There is a change in the output of codegen.  Rerun "react-native codegen-windows" to regenerate.',
+    'There is a change in the output of codegen.  Rerun "npx @react-native-community/cli codegen-windows" to regenerate.',
   );
   process.exit(2);
 }

package/src/generators/AliasGen.ts

@@ -71,7 +71,7 @@ interface AliasCodeMap {
 
 function getArrayTypeName(
   type: Nullable<NativeModuleBaseTypeAnnotation>): string {
-    if (type.type === 'ArrayTypeAnnotation' && type.elementType?.type === 'TypeAliasTypeAnnotation') {
+    if (type.type === 'ArrayTypeAnnotation' && type.elementType.type === 'TypeAliasTypeAnnotation') {
       return  type.elementType.name;
     }
 

package/src/generators/GenerateComponentWindows.ts

@@ -334,9 +334,9 @@ export function createComponentGenerator({
         }).join('\n\n') : '';
 
 
-        const commandHandler = hasAnyCommands ? `void HandleCommand(const winrt::Microsoft::ReactNative::ComponentView &view, winrt::hstring commandName, const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
-    args;
+        const commandHandler = hasAnyCommands ? `void HandleCommand(const winrt::Microsoft::ReactNative::ComponentView &view, const winrt::Microsoft::ReactNative::HandleCommandArgs& args) noexcept {
     auto userData = view.UserData().as<TUserData>();
+    auto commandName = args.CommandName();
 ${componentShape.commands.map(command => {
       const commaSeparatedCommandArgs = command.typeAnnotation.params.map(param => param.name).join(', ');
       return `    if (commandName == L"${command.name}") {
@@ -344,7 +344,7 @@ ${command.typeAnnotation.params.length !== 0 ? `      ${command.typeAnnotation.p
             const commandArgType = translateCommandParamType(param.typeAnnotation, commandAliases, `${componentName}_${command.name}`, cppCodegenOptions);
             return `${(param.optional && !commandArgType.alreadySupportsOptionalOrHasDefault) ? `std::optional<${commandArgType.type}>` : commandArgType.type} ${param.name};`;
       }).join('\n')}
-      winrt::Microsoft::ReactNative::ReadArgs(args, ${commaSeparatedCommandArgs});` : ''}
+      winrt::Microsoft::ReactNative::ReadArgs(args.CommandArgs(), ${commaSeparatedCommandArgs});` : ''}
       userData->Handle${capitalizeFirstLetter(command.name)}Command(${commaSeparatedCommandArgs});
       return;
     }`
@@ -352,10 +352,9 @@ ${command.typeAnnotation.params.length !== 0 ? `      ${command.typeAnnotation.p
   }` : '';
 
       const registerCommandHandler = hasAnyCommands ? `        builder.SetCustomCommandHandler([](const winrt::Microsoft::ReactNative::ComponentView &view,
-                                          winrt::hstring commandName,
-                                          const winrt::Microsoft::ReactNative::IJSValueReader &args) noexcept {
+                                          const winrt::Microsoft::ReactNative::HandleCommandArgs& args) noexcept {
           auto userData = view.UserData().as<TUserData>();
-          userData->HandleCommand(view, commandName, args);
+          userData->HandleCommand(view, args);
         });` : '';
 
         const baseType = baseStructTemplate

package/src/generators/GenerateNM2.ts

@@ -118,11 +118,11 @@ export function createNM2Generator({
         });
         let tuples = `
   static constexpr auto methods = std::tuple{
-${methods[0]}
+${methods.traversedPropertyTuples}${methods.traversedEventEmitterTuples ? '\n' : ''}${methods.traversedEventEmitterTuples}
   };`;
         let checks = `
     constexpr auto methodCheckResults = CheckMethods<TModule, ::_MODULE_NAME_::Spec>();`;
-        let errors = methods[1];
+        let errors = methods.traversedProperties + (methods.traversedEventEmitters ? '\n' : '') + methods.traversedEventEmitters;
 
         // prepare constants
         const constants = generateValidateConstants(nativeModule, aliases);

package/src/generators/GenerateTypeScript.ts

@@ -14,6 +14,7 @@ import type {
   NativeModuleParamTypeAnnotation,
   NativeModuleReturnTypeAnnotation,
   NativeModuleSchema,
+  UnsafeAnyTypeAnnotation,
   Nullable,
   SchemaType,
 } from '@react-native/codegen/lib/CodegenSchema';
@@ -65,7 +66,7 @@ function translateType(
     | NativeModuleBaseTypeAnnotation
     | NativeModuleParamTypeAnnotation
     | NativeModuleReturnTypeAnnotation
-  >,
+  > | UnsafeAnyTypeAnnotation,
 ): string {
   // avoid: Property 'type' does not exist on type 'never'
   const returnType = type.type;
@@ -80,7 +81,7 @@ function translateType(
     case 'BooleanTypeAnnotation':
       return 'boolean';
     case 'ArrayTypeAnnotation':
-      if (type.elementType) {
+      if (type.elementType.type !== 'AnyTypeAnnotation') {
         return `${translateType(type.elementType)}[]`;
       } else {
         return `Array`;

package/src/generators/ObjectTypes.ts

@@ -12,6 +12,7 @@ import type {
   NativeModuleUnionTypeAnnotation,
   NativeModuleStringTypeAnnotation,
   NativeModuleFunctionTypeAnnotation,
+  UnsafeAnyTypeAnnotation,
   Nullable,
 } from '@react-native/codegen/lib/CodegenSchema';
 import {
@@ -50,7 +51,7 @@ export function translateFieldOrReturnType(
     | NativeModuleBaseTypeAnnotation
     | NativeModuleStringTypeAnnotation
     | NativeModuleFunctionTypeAnnotation
-  >,
+  > | UnsafeAnyTypeAnnotation,
   aliases: AliasMap,
   baseAliasName: string,
   callerName: 'translateField' | 'translateReturnType',
@@ -70,7 +71,7 @@ export function translateFieldOrReturnType(
     case 'BooleanTypeAnnotation':
       return 'bool';
     case 'ArrayTypeAnnotation':
-      if (type.elementType) {
+      if (type.elementType.type !== 'AnyTypeAnnotation') {
         return `std::vector<${translateFieldOrReturnType(
           type.elementType,
           aliases,
@@ -110,6 +111,8 @@ export function translateFieldOrReturnType(
     case 'EnumDeclaration':
     case 'UnionTypeAnnotation':
       return translateUnionReturnType(type, options);
+    case 'AnyTypeAnnotation':
+      return '::React::JSValue?';
     default:
       throw new Error(`Unhandled type in ${callerName}: ${returnType}`);
   }

package/src/generators/ParamTypes.ts

@@ -10,10 +10,13 @@ import type {
   NamedShape,
   NativeModuleArrayTypeAnnotation,
   NativeModuleBaseTypeAnnotation,
+  NativeModuleEventEmitterBaseTypeAnnotation,
+  NativeModuleEventEmitterTypeAnnotation,
   NativeModuleEnumDeclaration,
   NativeModuleFunctionTypeAnnotation,
   NativeModuleParamTypeAnnotation,
   NativeModuleUnionTypeAnnotation,
+  UnsafeAnyTypeAnnotation,
   Nullable,
 } from '@react-native/codegen/lib/CodegenSchema';
 import {
@@ -114,7 +117,7 @@ function translateArray(
   target: ParamTarget,
   options: CppCodegenOptions,
 ): string {
-  if (param.elementType) {
+  if (param.elementType.type !== 'AnyTypeAnnotation') {
     switch (target) {
       case 'spec':
       case 'template':
@@ -141,8 +144,41 @@ function translateArray(
   }
 }
 
+// Hopefully eventually NativeModuleEventEmitterTypeAnnotation will align better with NativeModuleParamTypeAnnotation
+// and this method can be merged / replaced with translateArray
+function translateEventEmitterArray(
+  param: {
+    readonly type: 'ArrayTypeAnnotation';
+    readonly elementType: NativeModuleEventEmitterBaseTypeAnnotation | {type: string};
+  },
+  aliases: AliasMap,
+  baseAliasName: string,
+  target: ParamTarget,
+  options: CppCodegenOptions,
+): string {
+  switch (target) {
+    case 'spec':
+    case 'template':
+      return `std::vector<${translateEventEmitterParam(
+        param.elementType as NativeModuleEventEmitterBaseTypeAnnotation,
+        aliases,
+        `${baseAliasName}_element`,
+        'template',
+        options,
+      )}>`;
+    default:
+      return `std::vector<${translateEventEmitterParam(
+        param.elementType as NativeModuleEventEmitterBaseTypeAnnotation,
+        aliases,
+        `${baseAliasName}_element`,
+        'template',
+        options,
+      )}> const &`;
+  }
+}
+
 function translateParam(
-  param: NativeModuleParamTypeAnnotation,
+  param: NativeModuleParamTypeAnnotation | UnsafeAnyTypeAnnotation,
   aliases: AliasMap,
   baseAliasName: string,
   target: ParamTarget,
@@ -188,13 +224,48 @@ function translateParam(
     case 'EnumDeclaration':
     case 'UnionTypeAnnotation':
       return translateUnionReturnType(param, target, options);
+    case 'AnyTypeAnnotation':
+      return decorateType('::React::JSValue', target);
+    default:
+      throw new Error(`Unhandled type in translateParam: ${paramType}`);
+  }
+}
+
+// Hopefully eventually NativeModuleEventEmitterTypeAnnotation will align better with NativeModuleParamTypeAnnotation
+// and this method can be merged / replaced with translateParam
+function translateEventEmitterParam(
+  param: NativeModuleEventEmitterTypeAnnotation,
+  aliases: AliasMap,
+  baseAliasName: string,
+  target: ParamTarget,
+  options: CppCodegenOptions,
+): string {
+  // avoid: Property 'type' does not exist on type 'never'
+  const paramType = param.type;
+  switch (param.type) {
+    case 'StringTypeAnnotation':
+      return options.cppStringType;
+    case 'NumberTypeAnnotation':
+    case 'FloatTypeAnnotation':
+    case 'DoubleTypeAnnotation':
+      return 'double';
+    case 'Int32TypeAnnotation':
+      return 'int';
+    case 'BooleanTypeAnnotation':
+      return 'bool';
+    case 'ArrayTypeAnnotation':
+      return translateEventEmitterArray(param, aliases, baseAliasName, target, options);
+    case 'TypeAliasTypeAnnotation':
+      return decorateType(getAliasCppName(param.name), target);
+    case 'VoidTypeAnnotation':
+      return 'void';
     default:
       throw new Error(`Unhandled type in translateParam: ${paramType}`);
   }
 }
 
 function translateNullableParamType(
-  paramType: Nullable<NativeModuleParamTypeAnnotation>,
+  paramType: Nullable<NativeModuleParamTypeAnnotation> | UnsafeAnyTypeAnnotation,
   aliases: AliasMap,
   baseAliasName: string,
   nullableTarget: ParamTarget,
@@ -280,6 +351,22 @@ export function translateSpecArgs(
   });
 }
 
+export function translateEventEmitterArgs(
+  params: NativeModuleEventEmitterTypeAnnotation,
+  aliases: AliasMap,
+  baseAliasName: string,
+  options: CppCodegenOptions,
+) {
+    const translatedParam = translateEventEmitterParam(
+      params,
+      aliases,
+      baseAliasName,
+      'spec',
+      options,
+    );
+    return `${translatedParam}`;
+}
+
 export function translateArgs(
   params: ReadonlyArray<NativeModuleParamShape>,
   aliases: AliasMap,