@react-native-windows/codegen 0.74.1 → 0.75.0-preview.1

package/CHANGELOG.md

@@ -1,34 +1,166 @@
 # Change Log - @react-native-windows/codegen
 
-This log was last generated on Mon, 01 Jul 2024 15:15:54 GMT and should not be manually modified.
+This log was last generated on Mon, 15 Jul 2024 16:51:29 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.74.1
+## 0.75.0-preview.1
 
-Mon, 01 Jul 2024 15:15:54 GMT
+Mon, 15 Jul 2024 16:51:29 GMT
 
-### Patches
+### Changes
 
-- SFI: Component Governance fixes 6/19/24 (jthysell@microsoft.com)
+- Promote 0.75 to preview (tatianakapos@microsoft.com)
+- Bump @react-native-windows/fs to v0.75.0-preview.1
 
-## 0.74.0
+## 0.0.0-canary.96
 
-Sat, 27 Apr 2024 21:16:06 GMT
+Fri, 21 Jun 2024 05:17:50 GMT
 
-### Patches
+### Changes
+
+- SFI: Component Governance fixes 6/19/24 (jthysell@microsoft.com)
+
+## 0.0.0-canary.95
+
+Wed, 12 Jun 2024 05:16:24 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.52
+- Bump @rnw-scripts/eslint-config to v1.2.23
+- Bump @rnw-scripts/just-task to v2.3.40
+
+## 0.0.0-canary.94
+
+Sat, 08 Jun 2024 05:17:57 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.51
+- Bump @rnw-scripts/eslint-config to v1.2.22
+- Bump @rnw-scripts/just-task to v2.3.39
+
+## 0.0.0-canary.93
+
+Wed, 05 Jun 2024 05:18:11 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.50
+- Bump @rnw-scripts/just-task to v2.3.38
+
+## 0.0.0-canary.92
+
+Tue, 04 Jun 2024 05:18:35 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.49
+- Bump @rnw-scripts/eslint-config to v1.2.21
+- Bump @rnw-scripts/just-task to v2.3.37
+
+## 0.0.0-canary.91
+
+Sat, 01 Jun 2024 05:21:31 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.48
+- Bump @rnw-scripts/eslint-config to v1.2.20
+- Bump @rnw-scripts/just-task to v2.3.36
+
+## 0.0.0-canary.90
+
+Thu, 30 May 2024 05:18:25 GMT
+
+### Changes
+
+- RN Integration 05/11 (1422161+marlenecota@users.noreply.github.com)
+- Bump @react-native-windows/fs to v0.0.0-canary.47
+- Bump @rnw-scripts/eslint-config to v1.2.19
+- Bump @rnw-scripts/just-task to v2.3.35
+
+## 0.0.0-canary.89
+
+Thu, 23 May 2024 05:17:50 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.46
+- Bump @rnw-scripts/eslint-config to v1.2.18
+- Bump @rnw-scripts/just-task to v2.3.34
+
+## 0.0.0-canary.88
+
+Wed, 22 May 2024 05:18:18 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.45
+- Bump @rnw-scripts/eslint-config to v1.2.17
+- Bump @rnw-scripts/just-task to v2.3.33
+
+## 0.0.0-canary.87
+
+Wed, 15 May 2024 05:14:54 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.44
+- Bump @rnw-scripts/eslint-config to v1.2.16
+- Bump @rnw-scripts/just-task to v2.3.32
+
+## 0.0.0-canary.86
+
+Sat, 11 May 2024 05:18:30 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.43
+- Bump @rnw-scripts/eslint-config to v1.2.15
+- Bump @rnw-scripts/just-task to v2.3.31
+
+## 0.0.0-canary.85
+
+Thu, 09 May 2024 05:18:44 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.42
+- Bump @rnw-scripts/eslint-config to v1.2.14
+- Bump @rnw-scripts/just-task to v2.3.30
+
+## 0.0.0-canary.84
+
+Thu, 25 Apr 2024 20:12:42 GMT
+
+### Changes
+
+- Fix bad version bump (30809111+acoates-ms@users.noreply.github.com)
+- Bump @react-native-windows/fs to v0.0.0-canary.41
+- Bump @rnw-scripts/eslint-config to v1.2.13
+- Bump @rnw-scripts/just-task to v2.3.29
+
+## 0.0.0-canary.83
+
+Wed, 10 Apr 2024 05:18:19 GMT
+
+### Changes
 
-- Promote 0.74 to latest (tatianakapos@microsoft.com)
-- Bump @react-native-windows/fs to v0.74.0
+- Bump @react-native-windows/fs to v0.0.0-canary.40
+- Bump @rnw-scripts/eslint-config to v1.2.11
+- Bump @rnw-scripts/just-task to v2.3.27
 
-## 0.74.0-preview.1
+## 0.0.0-canary.82
 
-Mon, 08 Apr 2024 15:16:48 GMT
+Sat, 30 Mar 2024 05:18:04 GMT
 
 ### Changes
 
-- Promote 0.74 to preview (tatianakapos@microsoft.com)
-- Bump @react-native-windows/fs to v0.74.0-preview.1
+- Bump @react-native-windows/fs to v0.0.0-canary.39
+- Bump @rnw-scripts/eslint-config to v1.2.10
+- Bump @rnw-scripts/just-task to v2.3.26
 
 ## 0.0.0-canary.81
 

package/lib-commonjs/generators/AliasGen.js

@@ -34,9 +34,32 @@ function createAliasMap(nativeModuleAliases) {
     return aliases;
 }
 exports.createAliasMap = createAliasMap;
-function generateSingleAlias(aliases, aliasName, aliasCode, options) {
+function getArrayTypeName(type) {
+    var _a;
+    if (type.type === 'ArrayTypeAnnotation' && ((_a = type.elementType) === null || _a === void 0 ? void 0 : _a.type) === 'TypeAliasTypeAnnotation') {
+        return type.elementType.name;
+    }
+    return '';
+}
+function checkTypes(aliases, type, aliasOrder) {
+    for (const prop of type.properties) {
+        const propType = prop.typeAnnotation;
+        let propName = '';
+        if (propType.type === 'TypeAliasTypeAnnotation') {
+            propName = propType.name;
+        }
+        if (propType.type === 'ArrayTypeAnnotation') {
+            propName = getArrayTypeName(propType);
+        }
+        if (propName !== '' && !aliasOrder.includes(prop.name) && !aliases.jobs.includes(propName)) {
+            aliases.jobs.push(propName);
+        }
+    }
+}
+function generateSingleAlias(aliases, aliasName, aliasCode, options, aliasOrder) {
     const aliasCppName = (0, AliasManaging_1.getAliasCppName)(aliasName);
     const aliasType = aliases.types[aliasName];
+    checkTypes(aliases, aliasType, aliasOrder);
     const definition = `
 struct ${aliasCppName} {
 ${translateObjectMembersDefinition(aliasType, aliases, aliasName, '    ', options)}
@@ -61,14 +84,16 @@ function generateNestedAliasesInCorrectOrder(aliases, aliasCode, aliasOrder, opt
         // generate a new struct and all fields will be examined
         // new anonymous objects could be found
         // they will be stored in aliases.jobs
-        generateSingleAlias(aliases, aliasName, aliasCode, options);
+        generateSingleAlias(aliases, aliasName, aliasCode, options, aliasOrder);
         // nested C++ structs must be put before the current C++ struct
         // as they will be used in the current C++ struct
         // the order will be perfectly and easily ensured by doing this recursively
         generateNestedAliasesInCorrectOrder(aliases, aliasCode, aliasOrder, options);
         // all referenced C++ structs are generated
         // put the current one following them
-        aliasOrder.push(aliasName);
+        if (!aliasOrder.includes(aliasName)) {
+            aliasOrder.push(aliasName);
+        }
     }
 }
 function generateAliases(aliases, options) {

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

@@ -1 +1 @@
-{"version":3,"file":"AliasGen.js","sourceRoot":"","sources":["../../src/generators/AliasGen.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  NativeModuleBaseTypeAnnotation,\n  NativeModuleObjectTypeAnnotation,\n  NamedShape,\n  Nullable,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap, getAliasCppName} from './AliasManaging';\nimport {CppCodegenOptions, translateField} from './ObjectTypes';\n\nfunction translateObjectMembersDefinition(\n  type: NativeModuleObjectTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  prefix: string,\n  options: CppCodegenOptions,\n) {\n  return type.properties\n    .map((prop: NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>) => {\n      let propType = prop.typeAnnotation;\n      if (prop.optional && propType.type !== 'NullableTypeAnnotation') {\n        propType = {type: 'NullableTypeAnnotation', typeAnnotation: propType};\n      }\n      return `${prefix}${translateField(\n        propType,\n        aliases,\n        `${baseAliasName}_${prop.name}`,\n        options,\n      )} ${prop.name};`;\n    })\n    .join('\\n');\n}\n\nfunction translateObjectMembersReflection(\n  type: NativeModuleObjectTypeAnnotation,\n  aliasCppName: string,\n  prefix: string,\n) {\n  return type.properties\n    .map((prop: NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>) => {\n      return `${prefix}{L\"${prop.name}\", &${aliasCppName}::${prop.name}},`;\n    })\n    .join('\\n');\n}\n\nexport function createAliasMap(nativeModuleAliases: {\n  [name: string]: NativeModuleObjectTypeAnnotation;\n}): AliasMap {\n  const aliases: AliasMap = {types: {}, jobs: Object.keys(nativeModuleAliases)};\n  for (const aliasName of aliases.jobs) {\n    aliases.types[aliasName] = nativeModuleAliases[aliasName];\n  }\n  return aliases;\n}\n\ninterface AliasCode {\n  definition: string;\n  reflection: string;\n}\n\ninterface AliasCodeMap {\n  [name: string]: AliasCode;\n}\n\nfunction generateSingleAlias(\n  aliases: AliasMap,\n  aliasName: string,\n  aliasCode: AliasCodeMap,\n  options: CppCodegenOptions,\n): void {\n  const aliasCppName = getAliasCppName(aliasName);\n  const aliasType = <NativeModuleObjectTypeAnnotation>aliases.types[aliasName];\n  const definition = `\nstruct ${aliasCppName} {\n${translateObjectMembersDefinition(\n  aliasType,\n  aliases,\n  aliasName,\n  '    ',\n  options,\n)}\n};\n`;\n  const reflection = `\ninline winrt::Microsoft::ReactNative::FieldMap GetStructInfo(${aliasCppName}*) noexcept {\n    winrt::Microsoft::ReactNative::FieldMap fieldMap {\n${translateObjectMembersReflection(aliasType, aliasCppName, '        ')}\n    };\n    return fieldMap;\n}\n`;\n  aliasCode[aliasName] = {definition, reflection};\n}\n\nfunction generateNestedAliasesInCorrectOrder(\n  aliases: AliasMap,\n  aliasCode: AliasCodeMap,\n  aliasOrder: string[],\n  options: CppCodegenOptions,\n): void {\n  // retrieve and clean all ungenerated aliases\n  const jobs = aliases.jobs;\n  aliases.jobs = [];\n\n  // generate each one in its found order\n  for (const aliasName of jobs) {\n    // generate a new struct and all fields will be examined\n    // new anonymous objects could be found\n    // they will be stored in aliases.jobs\n    generateSingleAlias(aliases, aliasName, aliasCode, options);\n    // nested C++ structs must be put before the current C++ struct\n    // as they will be used in the current C++ struct\n    // the order will be perfectly and easily ensured by doing this recursively\n    generateNestedAliasesInCorrectOrder(\n      aliases,\n      aliasCode,\n      aliasOrder,\n      options,\n    );\n    // all referenced C++ structs are generated\n    // put the current one following them\n    aliasOrder.push(aliasName);\n  }\n}\n\nexport function generateAliases(\n  aliases: AliasMap,\n  options: CppCodegenOptions,\n): [string, string] {\n  const aliasCode: AliasCodeMap = {};\n  const aliasOrder: string[] = [];\n  generateNestedAliasesInCorrectOrder(aliases, aliasCode, aliasOrder, options);\n\n  // aliasOrder now has the correct order of C++ struct code\n  let customTypes = '';\n  let customReflection = '';\n  for (const aliasName of aliasOrder) {\n    customTypes = `${customTypes}${aliasCode[aliasName].definition}`;\n    customReflection = `${customReflection}${aliasCode[aliasName].reflection}`;\n  }\n  return [customTypes, customReflection];\n}\n"]}
+{"version":3,"file":"AliasGen.js","sourceRoot":"","sources":["../../src/generators/AliasGen.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  NativeModuleBaseTypeAnnotation,\n  NativeModuleObjectTypeAnnotation,\n  NamedShape,\n  Nullable,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap, getAliasCppName} from './AliasManaging';\nimport {CppCodegenOptions, translateField} from './ObjectTypes';\n\nfunction translateObjectMembersDefinition(\n  type: NativeModuleObjectTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  prefix: string,\n  options: CppCodegenOptions,\n) {\n  return type.properties\n    .map((prop: NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>) => {\n      let propType = prop.typeAnnotation;\n      if (prop.optional && propType.type !== 'NullableTypeAnnotation') {\n        propType = {type: 'NullableTypeAnnotation', typeAnnotation: propType};\n      }\n      return `${prefix}${translateField(\n        propType,\n        aliases,\n        `${baseAliasName}_${prop.name}`,\n        options,\n      )} ${prop.name};`;\n    })\n    .join('\\n');\n}\n\nfunction translateObjectMembersReflection(\n  type: NativeModuleObjectTypeAnnotation,\n  aliasCppName: string,\n  prefix: string,\n) {\n  return type.properties\n    .map((prop: NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>) => {\n      return `${prefix}{L\"${prop.name}\", &${aliasCppName}::${prop.name}},`;\n    })\n    .join('\\n');\n}\n\nexport function createAliasMap(nativeModuleAliases: {\n  [name: string]: NativeModuleObjectTypeAnnotation;\n}): AliasMap {\n  const aliases: AliasMap = {types: {}, jobs: Object.keys(nativeModuleAliases)};\n  for (const aliasName of aliases.jobs) {\n    aliases.types[aliasName] = nativeModuleAliases[aliasName];\n  }\n  return aliases;\n}\n\ninterface AliasCode {\n  definition: string;\n  reflection: string;\n}\n\ninterface AliasCodeMap {\n  [name: string]: AliasCode;\n}\n\nfunction getArrayTypeName(\n  type: Nullable<NativeModuleBaseTypeAnnotation>): string {\n    if (type.type === 'ArrayTypeAnnotation' && type.elementType?.type === 'TypeAliasTypeAnnotation') {\n      return  type.elementType.name;\n    }\n\n    return '';\n}\n\nfunction checkTypes(\n  aliases: AliasMap,\n  type: NativeModuleObjectTypeAnnotation,\n  aliasOrder: string[]): void {\n    for (const prop of type.properties) {\n      const propType = prop.typeAnnotation;\n      let propName = '';\n\n      if (propType.type === 'TypeAliasTypeAnnotation') {\n        propName = propType.name;\n      }\n\n      if (propType.type === 'ArrayTypeAnnotation') {\n        propName = getArrayTypeName(propType);\n      }\n\n      if (propName !== '' && !aliasOrder.includes(prop.name) && !aliases.jobs.includes(propName)) {\n        aliases.jobs.push(propName);\n      }\n    }\n}\n\nfunction generateSingleAlias(\n  aliases: AliasMap,\n  aliasName: string,\n  aliasCode: AliasCodeMap,\n  options: CppCodegenOptions,\n  aliasOrder: string[],\n): void {\n  const aliasCppName = getAliasCppName(aliasName);\n  const aliasType = <NativeModuleObjectTypeAnnotation>aliases.types[aliasName];\n\n  checkTypes(aliases, aliasType, aliasOrder);\n\n  const definition = `\nstruct ${aliasCppName} {\n${translateObjectMembersDefinition(\n  aliasType,\n  aliases,\n  aliasName,\n  '    ',\n  options,\n)}\n};\n`;\n  const reflection = `\ninline winrt::Microsoft::ReactNative::FieldMap GetStructInfo(${aliasCppName}*) noexcept {\n    winrt::Microsoft::ReactNative::FieldMap fieldMap {\n${translateObjectMembersReflection(aliasType, aliasCppName, '        ')}\n    };\n    return fieldMap;\n}\n`;\n  aliasCode[aliasName] = {definition, reflection};\n}\n\nfunction generateNestedAliasesInCorrectOrder(\n  aliases: AliasMap,\n  aliasCode: AliasCodeMap,\n  aliasOrder: string[],\n  options: CppCodegenOptions,\n): void {\n  // retrieve and clean all ungenerated aliases\n  const jobs = aliases.jobs;\n  aliases.jobs = [];\n\n  // generate each one in its found order\n  for (const aliasName of jobs) {\n    // generate a new struct and all fields will be examined\n    // new anonymous objects could be found\n    // they will be stored in aliases.jobs\n    generateSingleAlias(aliases, aliasName, aliasCode, options, aliasOrder);\n    // nested C++ structs must be put before the current C++ struct\n    // as they will be used in the current C++ struct\n    // the order will be perfectly and easily ensured by doing this recursively\n    generateNestedAliasesInCorrectOrder(\n      aliases,\n      aliasCode,\n      aliasOrder,\n      options,\n    );\n    // all referenced C++ structs are generated\n    // put the current one following them\n    if (!aliasOrder.includes(aliasName)) {\n      aliasOrder.push(aliasName);\n    }\n  }\n}\n\nexport function generateAliases(\n  aliases: AliasMap,\n  options: CppCodegenOptions,\n): [string, string] {\n  const aliasCode: AliasCodeMap = {};\n  const aliasOrder: string[] = [];\n  generateNestedAliasesInCorrectOrder(aliases, aliasCode, aliasOrder, options);\n\n  // aliasOrder now has the correct order of C++ struct code\n  let customTypes = '';\n  let customReflection = '';\n  for (const aliasName of aliasOrder) {\n    customTypes = `${customTypes}${aliasCode[aliasName].definition}`;\n    customReflection = `${customReflection}${aliasCode[aliasName].reflection}`;\n  }\n  return [customTypes, customReflection];\n}\n"]}

package/lib-commonjs/generators/GenerateNM2.js

@@ -18,7 +18,7 @@ const headerTemplate = `/*
  * by the TurboModule JS spec.
  */
 #pragma once`;
-const specTemplate = `::_MODULE_CUSTPM_TYPES_REFLECTION_::
+const specTemplate = `::_MODULE_CUSTOM_TYPES_REFLECTION_::
 struct ::_MODULE_NAME_::Spec : winrt::Microsoft::ReactNative::TurboModuleSpec {
 ::_MODULE_MEMBERS_TUPLES_::
 
@@ -37,7 +37,7 @@ ${headerTemplate}
 #include <vector>
 
 namespace ::_NAMESPACE_:: {
-::_MODULE_CUSTPM_TYPES_::
+::_MODULE_CUSTOM_TYPES_::
 } // namespace ::_NAMESPACE_::
 `;
 const moduleOnlyTemplate = `
@@ -60,7 +60,7 @@ ${headerTemplate}
 #include <tuple>
 
 namespace ::_NAMESPACE_:: {
-::_MODULE_CUSTPM_TYPES_::
+::_MODULE_CUSTOM_TYPES_::
 ${specTemplate}
 };
 
@@ -113,8 +113,8 @@ ${errors}`;
                 const customTypesExist = customTypes !== '';
                 const replaceContent = function (template) {
                     return template
-                        .replace(/::_MODULE_CUSTPM_TYPES_::/g, customTypes)
-                        .replace(/::_MODULE_CUSTPM_TYPES_REFLECTION_::/g, customReflection)
+                        .replace(/::_MODULE_CUSTOM_TYPES_::/g, customTypes)
+                        .replace(/::_MODULE_CUSTOM_TYPES_REFLECTION_::/g, customReflection)
                         .replace(/::_MODULE_MEMBERS_TUPLES_::/g, tuples.substring(1))
                         .replace(/::_MODULE_MEMBERS_CHECKS_::/g, checks.substring(1))
                         .replace(/::_MODULE_MEMBERS_ERRORS_::/g, errors)

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

@@ -1 +1 @@
-{"version":3,"file":"GenerateNM2.js","sourceRoot":"","sources":["../../src/generators/GenerateNM2.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 {SchemaType} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap, setPreferredModuleName} from './AliasManaging';\nimport {createAliasMap, generateAliases} from './AliasGen';\nimport {generateValidateConstants} from './ValidateConstants';\nimport {generateValidateMethods} from './ValidateMethods';\nimport type {CppStringTypes} from './ObjectTypes';\n\nexport type {CppStringTypes} from './ObjectTypes';\n\ntype FilesOutput = Map<string, string>;\n\nconst headerTemplate = `/*\n * This file is auto-generated from a NativeModule spec file in js.\n *\n * This is a C++ Spec class that should be used with MakeTurboModuleProvider to register native modules\n * in a way that also verifies at compile time that the native module matches the interface required\n * by the TurboModule JS spec.\n */\n#pragma once`;\n\nconst specTemplate = `::_MODULE_CUSTPM_TYPES_REFLECTION_::\nstruct ::_MODULE_NAME_::Spec : winrt::Microsoft::ReactNative::TurboModuleSpec {\n::_MODULE_MEMBERS_TUPLES_::\n\n  template <class TModule>\n  static constexpr void ValidateModule() noexcept {\n::_MODULE_MEMBERS_CHECKS_::\n\n::_MODULE_MEMBERS_ERRORS_::\n  }`;\n\nconst typeOnlyTemplate = `\n${headerTemplate}\n\n#include <string>\n#include <optional>\n#include <functional>\n#include <vector>\n\nnamespace ::_NAMESPACE_:: {\n::_MODULE_CUSTPM_TYPES_::\n} // namespace ::_NAMESPACE_::\n`;\n\nconst moduleOnlyTemplate = `\n${headerTemplate}\n\n::_TYPE_DEFINITION_INCLUDE_::\n#include <NativeModules.h>\n#include <tuple>\n\nnamespace ::_NAMESPACE_:: {\n${specTemplate}\n};\n\n} // namespace ::_NAMESPACE_::\n`;\n\nconst allInOneTemplate = `\n${headerTemplate}\n\n#include <NativeModules.h>\n#include <tuple>\n\nnamespace ::_NAMESPACE_:: {\n::_MODULE_CUSTPM_TYPES_::\n${specTemplate}\n};\n\n} // namespace ::_NAMESPACE_::\n`;\n\nexport function createNM2Generator({\n  methodOnly,\n  namespace,\n  cppStringType,\n  separateDataTypes,\n}: {\n  methodOnly: boolean;\n  namespace: string;\n  cppStringType: CppStringTypes;\n  separateDataTypes: boolean;\n}) {\n  return (\n    _libraryName: string,\n    schema: SchemaType,\n    _moduleSpecName: string,\n  ): FilesOutput => {\n    const files = new Map<string, string>();\n\n    for (const moduleName of Object.keys(schema.modules)) {\n      const nativeModule = schema.modules[moduleName];\n      // from 0.65 facebook's react-native-codegen\n      // the module name has the Native prefix comparing to 0.63\n      // when reading files we provided\n      const preferredModuleName = moduleName.startsWith('Native')\n        ? moduleName.substr(6)\n        : moduleName;\n      setPreferredModuleName(preferredModuleName);\n\n      if (nativeModule.type === 'NativeModule') {\n        console.log(`Generating Native${preferredModuleName}Spec.g.h`);\n\n        // copy all explicit to a map\n        const aliases: AliasMap = createAliasMap(nativeModule.aliasMap);\n\n        // prepare methods\n        const methods = generateValidateMethods(nativeModule, aliases, {\n          cppStringType,\n        });\n        let tuples = `\n  static constexpr auto methods = std::tuple{\n${methods[0]}\n  };`;\n        let checks = `\n    constexpr auto methodCheckResults = CheckMethods<TModule, ::_MODULE_NAME_::Spec>();`;\n        let errors = methods[1];\n\n        // prepare constants\n        const constants = generateValidateConstants(nativeModule, aliases);\n        if (constants !== undefined && !methodOnly) {\n          tuples = `\n  static constexpr auto constants = std::tuple{\n${constants[0]}\n  };${tuples}`;\n          checks = `\n    constexpr auto constantCheckResults = CheckConstants<TModule, ::_MODULE_NAME_::Spec>();${checks}`;\n          errors = `${constants[1]}\n\n${errors}`;\n        }\n\n        // generate code for structs\n        const [customTypes, customReflection] = generateAliases(aliases, {\n          cppStringType,\n        });\n\n        const customTypesExist = customTypes !== '';\n\n        const replaceContent = function (template: string): string {\n          return template\n            .replace(/::_MODULE_CUSTPM_TYPES_::/g, customTypes)\n            .replace(/::_MODULE_CUSTPM_TYPES_REFLECTION_::/g, customReflection)\n            .replace(/::_MODULE_MEMBERS_TUPLES_::/g, tuples.substring(1))\n            .replace(/::_MODULE_MEMBERS_CHECKS_::/g, checks.substring(1))\n            .replace(/::_MODULE_MEMBERS_ERRORS_::/g, errors)\n            .replace(/::_MODULE_NAME_::/g, preferredModuleName)\n            .replace(\n              /::_TYPE_DEFINITION_INCLUDE_::/g,\n              customTypesExist\n                ? `// #include \"Native${preferredModuleName}DataTypes.g.h\" before this file to use the generated type definition`\n                : '',\n            )\n            .replace(/::_NAMESPACE_::/g, namespace);\n        };\n\n        if (separateDataTypes) {\n          if (customTypesExist) {\n            files.set(\n              `Native${preferredModuleName}DataTypes.g.h`,\n              replaceContent(typeOnlyTemplate),\n            );\n          }\n          files.set(\n            `Native${preferredModuleName}Spec.g.h`,\n            replaceContent(moduleOnlyTemplate),\n          );\n        } else {\n          files.set(\n            `Native${preferredModuleName}Spec.g.h`,\n            replaceContent(allInOneTemplate),\n          );\n        }\n      }\n    }\n\n    return files;\n  };\n}\n"]}
+{"version":3,"file":"GenerateNM2.js","sourceRoot":"","sources":["../../src/generators/GenerateNM2.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 {SchemaType} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap, setPreferredModuleName} from './AliasManaging';\nimport {createAliasMap, generateAliases} from './AliasGen';\nimport {generateValidateConstants} from './ValidateConstants';\nimport {generateValidateMethods} from './ValidateMethods';\nimport type {CppStringTypes} from './ObjectTypes';\n\nexport type {CppStringTypes} from './ObjectTypes';\n\ntype FilesOutput = Map<string, string>;\n\nconst headerTemplate = `/*\n * This file is auto-generated from a NativeModule spec file in js.\n *\n * This is a C++ Spec class that should be used with MakeTurboModuleProvider to register native modules\n * in a way that also verifies at compile time that the native module matches the interface required\n * by the TurboModule JS spec.\n */\n#pragma once`;\n\nconst specTemplate = `::_MODULE_CUSTOM_TYPES_REFLECTION_::\nstruct ::_MODULE_NAME_::Spec : winrt::Microsoft::ReactNative::TurboModuleSpec {\n::_MODULE_MEMBERS_TUPLES_::\n\n  template <class TModule>\n  static constexpr void ValidateModule() noexcept {\n::_MODULE_MEMBERS_CHECKS_::\n\n::_MODULE_MEMBERS_ERRORS_::\n  }`;\n\nconst typeOnlyTemplate = `\n${headerTemplate}\n\n#include <string>\n#include <optional>\n#include <functional>\n#include <vector>\n\nnamespace ::_NAMESPACE_:: {\n::_MODULE_CUSTOM_TYPES_::\n} // namespace ::_NAMESPACE_::\n`;\n\nconst moduleOnlyTemplate = `\n${headerTemplate}\n\n::_TYPE_DEFINITION_INCLUDE_::\n#include <NativeModules.h>\n#include <tuple>\n\nnamespace ::_NAMESPACE_:: {\n${specTemplate}\n};\n\n} // namespace ::_NAMESPACE_::\n`;\n\nconst allInOneTemplate = `\n${headerTemplate}\n\n#include <NativeModules.h>\n#include <tuple>\n\nnamespace ::_NAMESPACE_:: {\n::_MODULE_CUSTOM_TYPES_::\n${specTemplate}\n};\n\n} // namespace ::_NAMESPACE_::\n`;\n\nexport function createNM2Generator({\n  methodOnly,\n  namespace,\n  cppStringType,\n  separateDataTypes,\n}: {\n  methodOnly: boolean;\n  namespace: string;\n  cppStringType: CppStringTypes;\n  separateDataTypes: boolean;\n}) {\n  return (\n    _libraryName: string,\n    schema: SchemaType,\n    _moduleSpecName: string,\n  ): FilesOutput => {\n    const files = new Map<string, string>();\n\n    for (const moduleName of Object.keys(schema.modules)) {\n      const nativeModule = schema.modules[moduleName];\n      // from 0.65 facebook's react-native-codegen\n      // the module name has the Native prefix comparing to 0.63\n      // when reading files we provided\n      const preferredModuleName = moduleName.startsWith('Native')\n        ? moduleName.substr(6)\n        : moduleName;\n      setPreferredModuleName(preferredModuleName);\n\n      if (nativeModule.type === 'NativeModule') {\n        console.log(`Generating Native${preferredModuleName}Spec.g.h`);\n\n        // copy all explicit to a map\n        const aliases: AliasMap = createAliasMap(nativeModule.aliasMap);\n\n        // prepare methods\n        const methods = generateValidateMethods(nativeModule, aliases, {\n          cppStringType,\n        });\n        let tuples = `\n  static constexpr auto methods = std::tuple{\n${methods[0]}\n  };`;\n        let checks = `\n    constexpr auto methodCheckResults = CheckMethods<TModule, ::_MODULE_NAME_::Spec>();`;\n        let errors = methods[1];\n\n        // prepare constants\n        const constants = generateValidateConstants(nativeModule, aliases);\n        if (constants !== undefined && !methodOnly) {\n          tuples = `\n  static constexpr auto constants = std::tuple{\n${constants[0]}\n  };${tuples}`;\n          checks = `\n    constexpr auto constantCheckResults = CheckConstants<TModule, ::_MODULE_NAME_::Spec>();${checks}`;\n          errors = `${constants[1]}\n\n${errors}`;\n        }\n\n        // generate code for structs\n        const [customTypes, customReflection] = generateAliases(aliases, {\n          cppStringType,\n        });\n\n        const customTypesExist = customTypes !== '';\n\n        const replaceContent = function (template: string): string {\n          return template\n            .replace(/::_MODULE_CUSTOM_TYPES_::/g, customTypes)\n            .replace(/::_MODULE_CUSTOM_TYPES_REFLECTION_::/g, customReflection)\n            .replace(/::_MODULE_MEMBERS_TUPLES_::/g, tuples.substring(1))\n            .replace(/::_MODULE_MEMBERS_CHECKS_::/g, checks.substring(1))\n            .replace(/::_MODULE_MEMBERS_ERRORS_::/g, errors)\n            .replace(/::_MODULE_NAME_::/g, preferredModuleName)\n            .replace(\n              /::_TYPE_DEFINITION_INCLUDE_::/g,\n              customTypesExist\n                ? `// #include \"Native${preferredModuleName}DataTypes.g.h\" before this file to use the generated type definition`\n                : '',\n            )\n            .replace(/::_NAMESPACE_::/g, namespace);\n        };\n\n        if (separateDataTypes) {\n          if (customTypesExist) {\n            files.set(\n              `Native${preferredModuleName}DataTypes.g.h`,\n              replaceContent(typeOnlyTemplate),\n            );\n          }\n          files.set(\n            `Native${preferredModuleName}Spec.g.h`,\n            replaceContent(moduleOnlyTemplate),\n          );\n        } else {\n          files.set(\n            `Native${preferredModuleName}Spec.g.h`,\n            replaceContent(allInOneTemplate),\n          );\n        }\n      }\n    }\n\n    return files;\n  };\n}\n"]}

package/lib-commonjs/generators/GenerateTypeScript.js

@@ -102,7 +102,7 @@ ${type.properties
 `;
 }
 function tryGetConstantType(nativeModule) {
-    const candidates = nativeModule.spec.properties.filter(prop => prop.name === 'getConstants');
+    const candidates = nativeModule.spec.methods.filter(prop => prop.name === 'getConstants');
     if (candidates.length === 0) {
         return undefined;
     }
@@ -151,7 +151,7 @@ function generateTypeScript(_libraryName, schema, _moduleSpecName) {
             const constantCode = constantType === undefined
                 ? ''
                 : `  getConstants(): ${translateType(constantType)}`;
-            const methods = nativeModule.spec.properties.filter(prop => prop.name !== 'getConstants');
+            const methods = nativeModule.spec.methods.filter(prop => prop.name !== 'getConstants');
             const membersCode = methods.map(translateMethod).join('');
             files.set(`${preferredModuleName}Spec.g.ts`, moduleTemplate
                 .replace(/::_MODULE_ALIASED_STRUCTS_::/g, aliasCode)

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

@@ -1 +1 @@
-{"version":3,"file":"GenerateTypeScript.js","sourceRoot":"","sources":["../../src/generators/GenerateTypeScript.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  NativeModuleBaseTypeAnnotation,\n  NativeModuleFunctionTypeAnnotation,\n  NativeModuleObjectTypeAnnotation,\n  NativeModuleParamTypeAnnotation,\n  NativeModuleReturnTypeAnnotation,\n  NativeModuleSchema,\n  Nullable,\n  SchemaType,\n} from '@react-native/codegen/lib/CodegenSchema';\n\ninterface CodegenNativeModuleSchema extends NativeModuleSchema {\n  optionalTurboModule?: boolean;\n}\n\nexport function setOptionalTurboModule(\n  schema: NativeModuleSchema,\n  optional: boolean,\n): void {\n  const cs = <CodegenNativeModuleSchema>schema;\n  cs.optionalTurboModule = optional;\n}\n\nexport function getOptionalTurboModule(schema: NativeModuleSchema): boolean {\n  return (<CodegenNativeModuleSchema>schema).optionalTurboModule ?? false;\n}\n\ntype ObjectProp = NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>;\ntype FunctionParam = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;\ntype FunctionDecl = NamedShape<Nullable<NativeModuleFunctionTypeAnnotation>>;\ntype FilesOutput = Map<string, string>;\n\nconst moduleTemplate = `\n/*\n * This file is auto-generated from a NativeModule spec file in js.\n *\n * This is a TypeScript turbo module definition file.\n */\n\nimport {TurboModule, TurboModuleRegistry} from 'react-native';\n'use strict';\n::_MODULE_ALIASED_STRUCTS_::\nexport interface Spec extends TurboModule {\n::_MODULE_MEMBERS_::\n}\n\nexport default TurboModuleRegistry.::_MODULE_GETTER_::<Spec>('::_MODULE_NAME_::');\n`;\n\nfunction optionalSign<T>(obj: NamedShape<T>): string {\n  return obj.optional ? '?' : '';\n}\n\nfunction translateType(\n  type: Nullable<\n    | NativeModuleBaseTypeAnnotation\n    | NativeModuleParamTypeAnnotation\n    | NativeModuleReturnTypeAnnotation\n  >,\n): string {\n  // avoid: Property 'type' does not exist on type 'never'\n  const returnType = type.type;\n  switch (type.type) {\n    case 'StringTypeAnnotation':\n      return 'string';\n    case 'NumberTypeAnnotation':\n    case 'FloatTypeAnnotation':\n    case 'DoubleTypeAnnotation':\n    case 'Int32TypeAnnotation':\n      return 'number';\n    case 'BooleanTypeAnnotation':\n      return 'boolean';\n    case 'ArrayTypeAnnotation':\n      if (type.elementType) {\n        return `${translateType(type.elementType)}[]`;\n      } else {\n        return `Array`;\n      }\n    case 'GenericObjectTypeAnnotation':\n      return 'object';\n    case 'ObjectTypeAnnotation':\n      return `{${type.properties\n        .map((prop: ObjectProp) => {\n          return `${prop.name}${optionalSign(prop)}: ${translateType(\n            prop.typeAnnotation,\n          )}`;\n        })\n        .join(', ')}}`;\n    case 'ReservedTypeAnnotation': {\n      // avoid: Property 'name' does not exist on type 'never'\n      const name = type.name;\n      // (#6597)\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (name !== 'RootTag')\n        throw new Error(\n          `Unknown reserved function: ${name} in translateReturnType`,\n        );\n      return 'number';\n    }\n    case 'TypeAliasTypeAnnotation':\n      return type.name;\n    case 'NullableTypeAnnotation':\n      return `(${translateType(type.typeAnnotation)} | null | undefined)`;\n    case 'VoidTypeAnnotation':\n      return `void`;\n    case 'PromiseTypeAnnotation':\n      return `Promise`;\n    case `FunctionTypeAnnotation`:\n      return `((${type.params\n        .map((param: FunctionParam) => {\n          return `${param.name}${optionalSign(param)}: ${translateType(\n            param.typeAnnotation,\n          )}`;\n        })\n        .join(', ')}) => ${translateType(type.returnTypeAnnotation)})`;\n    default:\n      throw new Error(`Unhandled type in translateReturnType: ${returnType}`);\n  }\n}\n\nfunction translateAlias(\n  name: string,\n  type: NativeModuleObjectTypeAnnotation,\n): string {\n  return `\nexport interface ${name} {\n${type.properties\n  .map((prop: ObjectProp) => {\n    return `  ${prop.name}${optionalSign(prop)}: ${translateType(\n      prop.typeAnnotation,\n    )};`;\n  })\n  .join('\\n')}\n}\n`;\n}\n\nfunction tryGetConstantType(\n  nativeModule: NativeModuleSchema,\n): NativeModuleObjectTypeAnnotation | undefined {\n  const candidates = nativeModule.spec.properties.filter(\n    prop => prop.name === 'getConstants',\n  );\n  if (candidates.length === 0) {\n    return undefined;\n  }\n\n  const getConstant = candidates[0];\n  const funcType =\n    getConstant.typeAnnotation.type === 'NullableTypeAnnotation'\n      ? getConstant.typeAnnotation.typeAnnotation\n      : getConstant.typeAnnotation;\n  if (\n    funcType.params.length > 0 ||\n    funcType.returnTypeAnnotation.type !== 'ObjectTypeAnnotation'\n  ) {\n    return undefined;\n  }\n\n  const constantType = funcType.returnTypeAnnotation;\n  if (constantType.properties.length === 0) {\n    return undefined;\n  }\n\n  return constantType;\n}\n\nfunction translateMethod(func: FunctionDecl): string {\n  const funcType =\n    func.typeAnnotation.type === 'NullableTypeAnnotation'\n      ? func.typeAnnotation.typeAnnotation\n      : func.typeAnnotation;\n\n  return `\n  ${func.name}(${funcType.params\n    .map((param: FunctionParam) => {\n      return `${param.name}${optionalSign(param)}: ${translateType(\n        param.typeAnnotation,\n      )}`;\n    })\n    .join(', ')})${optionalSign(func)}: ${translateType(\n    funcType.returnTypeAnnotation,\n  )}${\n    funcType.returnTypeAnnotation.type === 'ObjectTypeAnnotation' ? '' : ';'\n  }`;\n}\n\nexport function generateTypeScript(\n  _libraryName: string,\n  schema: SchemaType,\n  _moduleSpecName: string,\n): FilesOutput {\n  const files = new Map<string, string>();\n\n  for (const moduleName of Object.keys(schema.modules)) {\n    const nativeModule = schema.modules[moduleName];\n    // from 0.65 facebook's react-native-codegen\n    // the module name has the Native prefix comparing to 0.63\n    // when reading files we provided\n    const nativePrefix = 'Native';\n    const preferredModuleName = moduleName.startsWith(nativePrefix)\n      ? moduleName.substr(nativePrefix.length)\n      : moduleName;\n\n    if (nativeModule.type === 'NativeModule') {\n      console.log(`Generating ${preferredModuleName}Spec.g.ts`);\n\n      const aliasCode = Object.keys(nativeModule.aliasMap)\n        .map(name => translateAlias(name, nativeModule.aliasMap[name]))\n        .join('');\n\n      const constantType = tryGetConstantType(nativeModule);\n      const constantCode =\n        constantType === undefined\n          ? ''\n          : `  getConstants(): ${translateType(constantType)}`;\n\n      const methods = nativeModule.spec.properties.filter(\n        prop => prop.name !== 'getConstants',\n      );\n      const membersCode = methods.map(translateMethod).join('');\n\n      files.set(\n        `${preferredModuleName}Spec.g.ts`,\n        moduleTemplate\n          .replace(/::_MODULE_ALIASED_STRUCTS_::/g, aliasCode)\n          .replace(/::_MODULE_MEMBERS_::/g, constantCode + membersCode)\n          .replace(/::_MODULE_NAME_::/g, preferredModuleName)\n          .replace(\n            /::_MODULE_GETTER_::/g,\n            getOptionalTurboModule(nativeModule) ? 'get' : 'getEnforcing',\n          ),\n      );\n    }\n  }\n\n  return files;\n}\n"]}
+{"version":3,"file":"GenerateTypeScript.js","sourceRoot":"","sources":["../../src/generators/GenerateTypeScript.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  NativeModuleBaseTypeAnnotation,\n  NativeModuleFunctionTypeAnnotation,\n  NativeModuleObjectTypeAnnotation,\n  NativeModuleParamTypeAnnotation,\n  NativeModuleReturnTypeAnnotation,\n  NativeModuleSchema,\n  Nullable,\n  SchemaType,\n} from '@react-native/codegen/lib/CodegenSchema';\n\ninterface CodegenNativeModuleSchema extends NativeModuleSchema {\n  optionalTurboModule?: boolean;\n}\n\nexport function setOptionalTurboModule(\n  schema: NativeModuleSchema,\n  optional: boolean,\n): void {\n  const cs = <CodegenNativeModuleSchema>schema;\n  cs.optionalTurboModule = optional;\n}\n\nexport function getOptionalTurboModule(schema: NativeModuleSchema): boolean {\n  return (<CodegenNativeModuleSchema>schema).optionalTurboModule ?? false;\n}\n\ntype ObjectProp = NamedShape<Nullable<NativeModuleBaseTypeAnnotation>>;\ntype FunctionParam = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;\ntype FunctionDecl = NamedShape<Nullable<NativeModuleFunctionTypeAnnotation>>;\ntype FilesOutput = Map<string, string>;\n\nconst moduleTemplate = `\n/*\n * This file is auto-generated from a NativeModule spec file in js.\n *\n * This is a TypeScript turbo module definition file.\n */\n\nimport {TurboModule, TurboModuleRegistry} from 'react-native';\n'use strict';\n::_MODULE_ALIASED_STRUCTS_::\nexport interface Spec extends TurboModule {\n::_MODULE_MEMBERS_::\n}\n\nexport default TurboModuleRegistry.::_MODULE_GETTER_::<Spec>('::_MODULE_NAME_::');\n`;\n\nfunction optionalSign<T>(obj: NamedShape<T>): string {\n  return obj.optional ? '?' : '';\n}\n\nfunction translateType(\n  type: Nullable<\n    | NativeModuleBaseTypeAnnotation\n    | NativeModuleParamTypeAnnotation\n    | NativeModuleReturnTypeAnnotation\n  >,\n): string {\n  // avoid: Property 'type' does not exist on type 'never'\n  const returnType = type.type;\n  switch (type.type) {\n    case 'StringTypeAnnotation':\n      return 'string';\n    case 'NumberTypeAnnotation':\n    case 'FloatTypeAnnotation':\n    case 'DoubleTypeAnnotation':\n    case 'Int32TypeAnnotation':\n      return 'number';\n    case 'BooleanTypeAnnotation':\n      return 'boolean';\n    case 'ArrayTypeAnnotation':\n      if (type.elementType) {\n        return `${translateType(type.elementType)}[]`;\n      } else {\n        return `Array`;\n      }\n    case 'GenericObjectTypeAnnotation':\n      return 'object';\n    case 'ObjectTypeAnnotation':\n      return `{${type.properties\n        .map((prop: ObjectProp) => {\n          return `${prop.name}${optionalSign(prop)}: ${translateType(\n            prop.typeAnnotation,\n          )}`;\n        })\n        .join(', ')}}`;\n    case 'ReservedTypeAnnotation': {\n      // avoid: Property 'name' does not exist on type 'never'\n      const name = type.name;\n      // (#6597)\n      // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition\n      if (name !== 'RootTag')\n        throw new Error(\n          `Unknown reserved function: ${name} in translateReturnType`,\n        );\n      return 'number';\n    }\n    case 'TypeAliasTypeAnnotation':\n      return type.name;\n    case 'NullableTypeAnnotation':\n      return `(${translateType(type.typeAnnotation)} | null | undefined)`;\n    case 'VoidTypeAnnotation':\n      return `void`;\n    case 'PromiseTypeAnnotation':\n      return `Promise`;\n    case `FunctionTypeAnnotation`:\n      return `((${type.params\n        .map((param: FunctionParam) => {\n          return `${param.name}${optionalSign(param)}: ${translateType(\n            param.typeAnnotation,\n          )}`;\n        })\n        .join(', ')}) => ${translateType(type.returnTypeAnnotation)})`;\n    default:\n      throw new Error(`Unhandled type in translateReturnType: ${returnType}`);\n  }\n}\n\nfunction translateAlias(\n  name: string,\n  type: NativeModuleObjectTypeAnnotation,\n): string {\n  return `\nexport interface ${name} {\n${type.properties\n  .map((prop: ObjectProp) => {\n    return `  ${prop.name}${optionalSign(prop)}: ${translateType(\n      prop.typeAnnotation,\n    )};`;\n  })\n  .join('\\n')}\n}\n`;\n}\n\nfunction tryGetConstantType(\n  nativeModule: NativeModuleSchema,\n): NativeModuleObjectTypeAnnotation | undefined {\n  const candidates = nativeModule.spec.methods.filter(\n    prop => prop.name === 'getConstants',\n  );\n  if (candidates.length === 0) {\n    return undefined;\n  }\n\n  const getConstant = candidates[0];\n  const funcType =\n    getConstant.typeAnnotation.type === 'NullableTypeAnnotation'\n      ? getConstant.typeAnnotation.typeAnnotation\n      : getConstant.typeAnnotation;\n  if (\n    funcType.params.length > 0 ||\n    funcType.returnTypeAnnotation.type !== 'ObjectTypeAnnotation'\n  ) {\n    return undefined;\n  }\n\n  const constantType = funcType.returnTypeAnnotation;\n  if (constantType.properties.length === 0) {\n    return undefined;\n  }\n\n  return constantType;\n}\n\nfunction translateMethod(func: FunctionDecl): string {\n  const funcType =\n    func.typeAnnotation.type === 'NullableTypeAnnotation'\n      ? func.typeAnnotation.typeAnnotation\n      : func.typeAnnotation;\n\n  return `\n  ${func.name}(${funcType.params\n    .map((param: FunctionParam) => {\n      return `${param.name}${optionalSign(param)}: ${translateType(\n        param.typeAnnotation,\n      )}`;\n    })\n    .join(', ')})${optionalSign(func)}: ${translateType(\n    funcType.returnTypeAnnotation,\n  )}${\n    funcType.returnTypeAnnotation.type === 'ObjectTypeAnnotation' ? '' : ';'\n  }`;\n}\n\nexport function generateTypeScript(\n  _libraryName: string,\n  schema: SchemaType,\n  _moduleSpecName: string,\n): FilesOutput {\n  const files = new Map<string, string>();\n\n  for (const moduleName of Object.keys(schema.modules)) {\n    const nativeModule = schema.modules[moduleName];\n    // from 0.65 facebook's react-native-codegen\n    // the module name has the Native prefix comparing to 0.63\n    // when reading files we provided\n    const nativePrefix = 'Native';\n    const preferredModuleName = moduleName.startsWith(nativePrefix)\n      ? moduleName.substr(nativePrefix.length)\n      : moduleName;\n\n    if (nativeModule.type === 'NativeModule') {\n      console.log(`Generating ${preferredModuleName}Spec.g.ts`);\n\n      const aliasCode = Object.keys(nativeModule.aliasMap)\n        .map(name => translateAlias(name, nativeModule.aliasMap[name]))\n        .join('');\n\n      const constantType = tryGetConstantType(nativeModule);\n      const constantCode =\n        constantType === undefined\n          ? ''\n          : `  getConstants(): ${translateType(constantType)}`;\n\n      const methods = nativeModule.spec.methods.filter(\n        prop => prop.name !== 'getConstants',\n      );\n      const membersCode = methods.map(translateMethod).join('');\n\n      files.set(\n        `${preferredModuleName}Spec.g.ts`,\n        moduleTemplate\n          .replace(/::_MODULE_ALIASED_STRUCTS_::/g, aliasCode)\n          .replace(/::_MODULE_MEMBERS_::/g, constantCode + membersCode)\n          .replace(/::_MODULE_NAME_::/g, preferredModuleName)\n          .replace(\n            /::_MODULE_GETTER_::/g,\n            getOptionalTurboModule(nativeModule) ? 'get' : 'getEnforcing',\n          ),\n      );\n    }\n  }\n\n  return files;\n}\n"]}

package/lib-commonjs/generators/ObjectTypes.js

@@ -58,6 +58,7 @@ function translateFieldOrReturnType(type, aliases, baseAliasName, callerName, op
             return (0, AliasManaging_1.getAliasCppName)(type.name);
         case 'NullableTypeAnnotation':
             return `std::optional<${translateFieldOrReturnType(type.typeAnnotation, aliases, baseAliasName, callerName, options)}>`;
+        case 'FunctionTypeAnnotation':
         case 'MixedTypeAnnotation':
             return '';
         case 'EnumDeclaration':

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

@@ -1 +1 @@
-{"version":3,"file":"ObjectTypes.js","sourceRoot":"","sources":["../../src/generators/ObjectTypes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAUb,mDAIyB;AAQzB,SAAS,wBAAwB,CAC/B,IAAmE,EACnE,OAA0B;IAE1B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,QAAQ,IAAI,CAAC,UAAU,EAAE;QACvB,KAAK,sBAAsB;YACzB,OAAO,OAAO,CAAC,aAAa,CAAC;QAC/B,KAAK,sBAAsB;YACzB,OAAO,QAAQ,CAAC;QAClB,KAAK,sBAAsB;YACzB,OAAO,kBAAkB,CAAC;QAC5B;YACE,MAAM,IAAI,KAAK,CACb,0DAA0D,UAAU,EAAE,CACvE,CAAC;KACL;AACH,CAAC;AAED,SAAgB,0BAA0B,CACxC,IAIC,EACD,OAAiB,EACjB,aAAqB,EACrB,UAAoD,EACpD,OAA0B;IAE1B,wDAAwD;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;IAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,sBAAsB;YACzB,OAAO,OAAO,CAAC,aAAa,CAAC;QAC/B,KAAK,sBAAsB,CAAC;QAC5B,KAAK,qBAAqB,CAAC;QAC3B,KAAK,sBAAsB;YACzB,OAAO,QAAQ,CAAC;QAClB,KAAK,qBAAqB;YACxB,OAAO,KAAK,CAAC;QACf,KAAK,uBAAuB;YAC1B,OAAO,MAAM,CAAC;QAChB,KAAK,qBAAqB;YACxB,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,OAAO,eAAe,0BAA0B,CAC9C,IAAI,CAAC,WAAW,EAChB,OAAO,EACP,GAAG,aAAa,UAAU,EAC1B,UAAU,EACV,OAAO,CACR,GAAG,CAAC;aACN;iBAAM;gBACL,OAAO,uBAAuB,CAAC;aAChC;QACH,KAAK,6BAA6B;YAChC,OAAO,kBAAkB,CAAC;QAC5B,KAAK,sBAAsB;YACzB,OAAO,IAAA,wCAAwB,EAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QAChE,KAAK,wBAAwB,CAAC,CAAC;YAC7B,wDAAwD;YACxD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,UAAU;YACV,uEAAuE;YACvE,IAAI,IAAI,KAAK,SAAS;gBACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,OAAO,UAAU,EAAE,CAAC,CAAC;YACzE,OAAO,QAAQ,CAAC;SACjB;QACD,KAAK,yBAAyB;YAC5B,OAAO,IAAA,+BAAe,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,KAAK,wBAAwB;YAC3B,OAAO,iBAAiB,0BAA0B,CAChD,IAAI,CAAC,cAAc,EACnB,OAAO,EACP,aAAa,EACb,UAAU,EACV,OAAO,CACR,GAAG,CAAC;QACP,KAAK,qBAAqB;YACxB,OAAO,EAAE,CAAC;QACZ,KAAK,iBAAiB,CAAC;QACvB,KAAK,qBAAqB;YACxB,OAAO,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,KAAK,UAAU,EAAE,CAAC,CAAC;KACrE;AACH,CAAC;AAnED,gEAmEC;AAED,SAAgB,cAAc,CAC5B,IAA8C,EAC9C,OAAiB,EACjB,aAAqB,EACrB,OAA0B;IAE1B,OAAO,0BAA0B,CAC/B,IAAI,EACJ,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,OAAO,CACR,CAAC;AACJ,CAAC;AAbD,wCAaC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {\n  NativeModuleEnumDeclaration,\n  NativeModuleBaseTypeAnnotation,\n  NativeModuleUnionTypeAnnotation,\n  NativeModuleStringTypeAnnotation,\n  NativeModuleFunctionTypeAnnotation,\n  Nullable,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {\n  AliasMap,\n  getAliasCppName,\n  getAnonymousAliasCppName,\n} from './AliasManaging';\n\nexport type CppStringTypes = 'std::string' | 'std::wstring';\n\nexport interface CppCodegenOptions {\n  cppStringType: CppStringTypes;\n}\n\nfunction translateUnionReturnType(\n  type: NativeModuleEnumDeclaration | NativeModuleUnionTypeAnnotation,\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 '::React::JSValue';\n    default:\n      throw new Error(\n        `Unknown enum/union member type in translateReturnType: ${memberType}`,\n      );\n  }\n}\n\nexport function translateFieldOrReturnType(\n  type: Nullable<\n    | NativeModuleBaseTypeAnnotation\n    | NativeModuleStringTypeAnnotation\n    | NativeModuleFunctionTypeAnnotation\n  >,\n  aliases: AliasMap,\n  baseAliasName: string,\n  callerName: 'translateField' | 'translateReturnType',\n  options: CppCodegenOptions,\n): string {\n  // avoid: Property 'type' does not exist on type 'never'\n  const returnType = type.type;\n  switch (type.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      if (type.elementType) {\n        return `std::vector<${translateFieldOrReturnType(\n          type.elementType,\n          aliases,\n          `${baseAliasName}_element`,\n          callerName,\n          options,\n        )}>`;\n      } else {\n        return `::React::JSValueArray`;\n      }\n    case 'GenericObjectTypeAnnotation':\n      return '::React::JSValue';\n    case 'ObjectTypeAnnotation':\n      return getAnonymousAliasCppName(aliases, baseAliasName, type);\n    case 'ReservedTypeAnnotation': {\n      // avoid: Property 'name' does not exist on type 'never'\n      const name = type.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 ${callerName}`);\n      return 'double';\n    }\n    case 'TypeAliasTypeAnnotation':\n      return getAliasCppName(type.name);\n    case 'NullableTypeAnnotation':\n      return `std::optional<${translateFieldOrReturnType(\n        type.typeAnnotation,\n        aliases,\n        baseAliasName,\n        callerName,\n        options,\n      )}>`;\n    case 'MixedTypeAnnotation':\n      return '';\n    case 'EnumDeclaration':\n    case 'UnionTypeAnnotation':\n      return translateUnionReturnType(type, options);\n    default:\n      throw new Error(`Unhandled type in ${callerName}: ${returnType}`);\n  }\n}\n\nexport function translateField(\n  type: Nullable<NativeModuleBaseTypeAnnotation>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateFieldOrReturnType(\n    type,\n    aliases,\n    baseAliasName,\n    'translateField',\n    options,\n  );\n}\n"]}
+{"version":3,"file":"ObjectTypes.js","sourceRoot":"","sources":["../../src/generators/ObjectTypes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAUb,mDAIyB;AAQzB,SAAS,wBAAwB,CAC/B,IAAmE,EACnE,OAA0B;IAE1B,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,QAAQ,IAAI,CAAC,UAAU,EAAE;QACvB,KAAK,sBAAsB;YACzB,OAAO,OAAO,CAAC,aAAa,CAAC;QAC/B,KAAK,sBAAsB;YACzB,OAAO,QAAQ,CAAC;QAClB,KAAK,sBAAsB;YACzB,OAAO,kBAAkB,CAAC;QAC5B;YACE,MAAM,IAAI,KAAK,CACb,0DAA0D,UAAU,EAAE,CACvE,CAAC;KACL;AACH,CAAC;AAED,SAAgB,0BAA0B,CACxC,IAIC,EACD,OAAiB,EACjB,aAAqB,EACrB,UAAoD,EACpD,OAA0B;IAE1B,wDAAwD;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;IAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,sBAAsB;YACzB,OAAO,OAAO,CAAC,aAAa,CAAC;QAC/B,KAAK,sBAAsB,CAAC;QAC5B,KAAK,qBAAqB,CAAC;QAC3B,KAAK,sBAAsB;YACzB,OAAO,QAAQ,CAAC;QAClB,KAAK,qBAAqB;YACxB,OAAO,KAAK,CAAC;QACf,KAAK,uBAAuB;YAC1B,OAAO,MAAM,CAAC;QAChB,KAAK,qBAAqB;YACxB,IAAI,IAAI,CAAC,WAAW,EAAE;gBACpB,OAAO,eAAe,0BAA0B,CAC9C,IAAI,CAAC,WAAW,EAChB,OAAO,EACP,GAAG,aAAa,UAAU,EAC1B,UAAU,EACV,OAAO,CACR,GAAG,CAAC;aACN;iBAAM;gBACL,OAAO,uBAAuB,CAAC;aAChC;QACH,KAAK,6BAA6B;YAChC,OAAO,kBAAkB,CAAC;QAC5B,KAAK,sBAAsB;YACzB,OAAO,IAAA,wCAAwB,EAAC,OAAO,EAAE,aAAa,EAAE,IAAI,CAAC,CAAC;QAChE,KAAK,wBAAwB,CAAC,CAAC;YAC7B,wDAAwD;YACxD,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;YACvB,UAAU;YACV,uEAAuE;YACvE,IAAI,IAAI,KAAK,SAAS;gBACpB,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,OAAO,UAAU,EAAE,CAAC,CAAC;YACzE,OAAO,QAAQ,CAAC;SACjB;QACD,KAAK,yBAAyB;YAC5B,OAAO,IAAA,+BAAe,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,KAAK,wBAAwB;YAC3B,OAAO,iBAAiB,0BAA0B,CAChD,IAAI,CAAC,cAAc,EACnB,OAAO,EACP,aAAa,EACb,UAAU,EACV,OAAO,CACR,GAAG,CAAC;QACP,KAAK,wBAAwB,CAAC;QAC9B,KAAK,qBAAqB;YACxB,OAAO,EAAE,CAAC;QACZ,KAAK,iBAAiB,CAAC;QACvB,KAAK,qBAAqB;YACxB,OAAO,wBAAwB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACjD;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,KAAK,UAAU,EAAE,CAAC,CAAC;KACrE;AACH,CAAC;AApED,gEAoEC;AAED,SAAgB,cAAc,CAC5B,IAA8C,EAC9C,OAAiB,EACjB,aAAqB,EACrB,OAA0B;IAE1B,OAAO,0BAA0B,CAC/B,IAAI,EACJ,OAAO,EACP,aAAa,EACb,gBAAgB,EAChB,OAAO,CACR,CAAC;AACJ,CAAC;AAbD,wCAaC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {\n  NativeModuleEnumDeclaration,\n  NativeModuleBaseTypeAnnotation,\n  NativeModuleUnionTypeAnnotation,\n  NativeModuleStringTypeAnnotation,\n  NativeModuleFunctionTypeAnnotation,\n  Nullable,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {\n  AliasMap,\n  getAliasCppName,\n  getAnonymousAliasCppName,\n} from './AliasManaging';\n\nexport type CppStringTypes = 'std::string' | 'std::wstring';\n\nexport interface CppCodegenOptions {\n  cppStringType: CppStringTypes;\n}\n\nfunction translateUnionReturnType(\n  type: NativeModuleEnumDeclaration | NativeModuleUnionTypeAnnotation,\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 '::React::JSValue';\n    default:\n      throw new Error(\n        `Unknown enum/union member type in translateReturnType: ${memberType}`,\n      );\n  }\n}\n\nexport function translateFieldOrReturnType(\n  type: Nullable<\n    | NativeModuleBaseTypeAnnotation\n    | NativeModuleStringTypeAnnotation\n    | NativeModuleFunctionTypeAnnotation\n  >,\n  aliases: AliasMap,\n  baseAliasName: string,\n  callerName: 'translateField' | 'translateReturnType',\n  options: CppCodegenOptions,\n): string {\n  // avoid: Property 'type' does not exist on type 'never'\n  const returnType = type.type;\n  switch (type.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      if (type.elementType) {\n        return `std::vector<${translateFieldOrReturnType(\n          type.elementType,\n          aliases,\n          `${baseAliasName}_element`,\n          callerName,\n          options,\n        )}>`;\n      } else {\n        return `::React::JSValueArray`;\n      }\n    case 'GenericObjectTypeAnnotation':\n      return '::React::JSValue';\n    case 'ObjectTypeAnnotation':\n      return getAnonymousAliasCppName(aliases, baseAliasName, type);\n    case 'ReservedTypeAnnotation': {\n      // avoid: Property 'name' does not exist on type 'never'\n      const name = type.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 ${callerName}`);\n      return 'double';\n    }\n    case 'TypeAliasTypeAnnotation':\n      return getAliasCppName(type.name);\n    case 'NullableTypeAnnotation':\n      return `std::optional<${translateFieldOrReturnType(\n        type.typeAnnotation,\n        aliases,\n        baseAliasName,\n        callerName,\n        options,\n      )}>`;\n    case 'FunctionTypeAnnotation':\n    case 'MixedTypeAnnotation':\n      return '';\n    case 'EnumDeclaration':\n    case 'UnionTypeAnnotation':\n      return translateUnionReturnType(type, options);\n    default:\n      throw new Error(`Unhandled type in ${callerName}: ${returnType}`);\n  }\n}\n\nexport function translateField(\n  type: Nullable<NativeModuleBaseTypeAnnotation>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  options: CppCodegenOptions,\n): string {\n  return translateFieldOrReturnType(\n    type,\n    aliases,\n    baseAliasName,\n    'translateField',\n    options,\n  );\n}\n"]}

package/lib-commonjs/generators/ValidateConstants.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateValidateConstants = void 0;
 const AliasManaging_1 = require("./AliasManaging");
 function generateValidateConstants(nativeModule, aliases) {
-    const candidates = nativeModule.spec.properties.filter(prop => prop.name === 'getConstants');
+    const candidates = nativeModule.spec.methods.filter(prop => prop.name === 'getConstants');
     if (candidates.length === 0) {
         return undefined;
     }

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

@@ -1 +1 @@
-{"version":3,"file":"ValidateConstants.js","sourceRoot":"","sources":["../../src/generators/ValidateConstants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAGb,mDAAmE;AAEnE,SAAgB,yBAAyB,CACvC,YAAgC,EAChC,OAAiB;IAEjB,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,CACpD,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CACrC,CAAC;IACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,QAAQ,GACZ,WAAW,CAAC,cAAc,CAAC,IAAI,KAAK,wBAAwB;QAC1D,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,cAAc;QAC3C,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC;IACjC,IACE,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;QAC1B,QAAQ,CAAC,oBAAoB,CAAC,IAAI,KAAK,sBAAsB,EAC7D;QACA,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,oBAAoB,CAAC;IACnD,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,OAAO,GAAG,IAAA,wCAAwB,EAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAE7E,OAAO;QACL,uBAAuB,OAAO,OAAO;QACrC;;aAES,OAAO;mDAC+B,OAAO;0DACA,OAAO,qDAAqD;KACnH,CAAC;AACJ,CAAC;AAtCD,8DAsCC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {NativeModuleSchema} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap, getAnonymousAliasCppName} from './AliasManaging';\n\nexport function generateValidateConstants(\n  nativeModule: NativeModuleSchema,\n  aliases: AliasMap,\n): [string, string] | undefined {\n  const candidates = nativeModule.spec.properties.filter(\n    prop => prop.name === 'getConstants',\n  );\n  if (candidates.length === 0) {\n    return undefined;\n  }\n\n  const getConstant = candidates[0];\n  const funcType =\n    getConstant.typeAnnotation.type === 'NullableTypeAnnotation'\n      ? getConstant.typeAnnotation.typeAnnotation\n      : getConstant.typeAnnotation;\n  if (\n    funcType.params.length > 0 ||\n    funcType.returnTypeAnnotation.type !== 'ObjectTypeAnnotation'\n  ) {\n    return undefined;\n  }\n\n  const constantType = funcType.returnTypeAnnotation;\n  if (constantType.properties.length === 0) {\n    return undefined;\n  }\n\n  const cppName = getAnonymousAliasCppName(aliases, 'Constants', constantType);\n\n  return [\n    `      TypedConstant<${cppName}>{0},`,\n    `    REACT_SHOW_CONSTANT_SPEC_ERRORS(\n          0,\n          \"${cppName}\",\n          \"    REACT_GET_CONSTANTS(GetConstants) ${cppName} GetConstants() noexcept {/*implementation*/}\\\\n\"\n          \"    REACT_GET_CONSTANTS(GetConstants) static ${cppName} GetConstants() noexcept {/*implementation*/}\\\\n\");`,\n  ];\n}\n"]}
+{"version":3,"file":"ValidateConstants.js","sourceRoot":"","sources":["../../src/generators/ValidateConstants.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAGb,mDAAmE;AAEnE,SAAgB,yBAAyB,CACvC,YAAgC,EAChC,OAAiB;IAEjB,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CACjD,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,cAAc,CACrC,CAAC;IACF,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QAC3B,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;IAClC,MAAM,QAAQ,GACZ,WAAW,CAAC,cAAc,CAAC,IAAI,KAAK,wBAAwB;QAC1D,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC,cAAc;QAC3C,CAAC,CAAC,WAAW,CAAC,cAAc,CAAC;IACjC,IACE,QAAQ,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC;QAC1B,QAAQ,CAAC,oBAAoB,CAAC,IAAI,KAAK,sBAAsB,EAC7D;QACA,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,YAAY,GAAG,QAAQ,CAAC,oBAAoB,CAAC;IACnD,IAAI,YAAY,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE;QACxC,OAAO,SAAS,CAAC;KAClB;IAED,MAAM,OAAO,GAAG,IAAA,wCAAwB,EAAC,OAAO,EAAE,WAAW,EAAE,YAAY,CAAC,CAAC;IAE7E,OAAO;QACL,uBAAuB,OAAO,OAAO;QACrC;;aAES,OAAO;mDAC+B,OAAO;0DACA,OAAO,qDAAqD;KACnH,CAAC;AACJ,CAAC;AAtCD,8DAsCC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {NativeModuleSchema} from '@react-native/codegen/lib/CodegenSchema';\nimport {AliasMap, getAnonymousAliasCppName} from './AliasManaging';\n\nexport function generateValidateConstants(\n  nativeModule: NativeModuleSchema,\n  aliases: AliasMap,\n): [string, string] | undefined {\n  const candidates = nativeModule.spec.methods.filter(\n    prop => prop.name === 'getConstants',\n  );\n  if (candidates.length === 0) {\n    return undefined;\n  }\n\n  const getConstant = candidates[0];\n  const funcType =\n    getConstant.typeAnnotation.type === 'NullableTypeAnnotation'\n      ? getConstant.typeAnnotation.typeAnnotation\n      : getConstant.typeAnnotation;\n  if (\n    funcType.params.length > 0 ||\n    funcType.returnTypeAnnotation.type !== 'ObjectTypeAnnotation'\n  ) {\n    return undefined;\n  }\n\n  const constantType = funcType.returnTypeAnnotation;\n  if (constantType.properties.length === 0) {\n    return undefined;\n  }\n\n  const cppName = getAnonymousAliasCppName(aliases, 'Constants', constantType);\n\n  return [\n    `      TypedConstant<${cppName}>{0},`,\n    `    REACT_SHOW_CONSTANT_SPEC_ERRORS(\n          0,\n          \"${cppName}\",\n          \"    REACT_GET_CONSTANTS(GetConstants) ${cppName} GetConstants() noexcept {/*implementation*/}\\\\n\"\n          \"    REACT_GET_CONSTANTS(GetConstants) static ${cppName} GetConstants() noexcept {/*implementation*/}\\\\n\");`,\n  ];\n}\n"]}

package/lib-commonjs/generators/ValidateMethods.js

@@ -32,9 +32,9 @@ function translatePossibleMethodSignatures(prop, funcType, aliases, baseAliasNam
         .map(sig => `"    ${sig}\\n"`)
         .join('\n          ');
 }
-function renderProperties(properties, aliases, tuple, options) {
+function renderProperties(methods, aliases, tuple, options) {
     // TODO: generate code for constants
-    return properties
+    return methods
         .filter(prop => prop.name !== 'getConstants')
         .map((prop, index) => {
         // TODO: prop.optional === true
@@ -66,9 +66,9 @@ function renderProperties(properties, aliases, tuple, options) {
         .join('\n');
 }
 function generateValidateMethods(nativeModule, aliases, options) {
-    const properties = nativeModule.spec.properties;
-    const traversedProperties = renderProperties(properties, aliases, false, options);
-    const traversedPropertyTuples = renderProperties(properties, aliases, true, options);
+    const methods = nativeModule.spec.methods;
+    const traversedProperties = renderProperties(methods, aliases, false, options);
+    const traversedPropertyTuples = renderProperties(methods, aliases, true, options);
     return [traversedPropertyTuples, traversedProperties];
 }
 exports.generateValidateMethods = generateValidateMethods;

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  properties: ReadonlyArray<NativeModulePropertyShape>,\n  aliases: AliasMap,\n  tuple: boolean,\n  options: CppCodegenOptions,\n): string {\n  // TODO: generate code for constants\n  return properties\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 properties = nativeModule.spec.properties;\n  const traversedProperties = renderProperties(\n    properties,\n    aliases,\n    false,\n    options,\n  );\n  const traversedPropertyTuples = renderProperties(\n    properties,\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  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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-native-windows/codegen",
-  "version": "0.74.1",
+  "version": "0.75.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.74.0",
+    "@react-native-windows/fs": "0.75.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.9",
+    "@rnw-scripts/eslint-config": "1.2.23",
     "@rnw-scripts/jest-unittest-config": "1.5.8",
-    "@rnw-scripts/just-task": "2.3.25",
+    "@rnw-scripts/just-task": "2.3.40",
     "@rnw-scripts/ts-config": "2.0.5",
     "@types/chalk": "^2.2.0",
     "@types/jest": "^29.2.2",
@@ -57,11 +57,11 @@
     "src"
   ],
   "beachball": {
-    "defaultNpmTag": "latest",
+    "defaultNpmTag": "preview",
     "disallowedChangeTypes": [
       "major",
       "minor",
-      "prerelease",
+      "patch",
       "premajor",
       "preminor",
       "prepatch"

package/src/generators/AliasGen.ts

@@ -69,14 +69,49 @@ interface AliasCodeMap {
   [name: string]: AliasCode;
 }
 
+function getArrayTypeName(
+  type: Nullable<NativeModuleBaseTypeAnnotation>): string {
+    if (type.type === 'ArrayTypeAnnotation' && type.elementType?.type === 'TypeAliasTypeAnnotation') {
+      return  type.elementType.name;
+    }
+
+    return '';
+}
+
+function checkTypes(
+  aliases: AliasMap,
+  type: NativeModuleObjectTypeAnnotation,
+  aliasOrder: string[]): void {
+    for (const prop of type.properties) {
+      const propType = prop.typeAnnotation;
+      let propName = '';
+
+      if (propType.type === 'TypeAliasTypeAnnotation') {
+        propName = propType.name;
+      }
+
+      if (propType.type === 'ArrayTypeAnnotation') {
+        propName = getArrayTypeName(propType);
+      }
+
+      if (propName !== '' && !aliasOrder.includes(prop.name) && !aliases.jobs.includes(propName)) {
+        aliases.jobs.push(propName);
+      }
+    }
+}
+
 function generateSingleAlias(
   aliases: AliasMap,
   aliasName: string,
   aliasCode: AliasCodeMap,
   options: CppCodegenOptions,
+  aliasOrder: string[],
 ): void {
   const aliasCppName = getAliasCppName(aliasName);
   const aliasType = <NativeModuleObjectTypeAnnotation>aliases.types[aliasName];
+
+  checkTypes(aliases, aliasType, aliasOrder);
+
   const definition = `
 struct ${aliasCppName} {
 ${translateObjectMembersDefinition(
@@ -114,7 +149,7 @@ function generateNestedAliasesInCorrectOrder(
     // generate a new struct and all fields will be examined
     // new anonymous objects could be found
     // they will be stored in aliases.jobs
-    generateSingleAlias(aliases, aliasName, aliasCode, options);
+    generateSingleAlias(aliases, aliasName, aliasCode, options, aliasOrder);
     // nested C++ structs must be put before the current C++ struct
     // as they will be used in the current C++ struct
     // the order will be perfectly and easily ensured by doing this recursively
@@ -126,7 +161,9 @@ function generateNestedAliasesInCorrectOrder(
     );
     // all referenced C++ structs are generated
     // put the current one following them
-    aliasOrder.push(aliasName);
+    if (!aliasOrder.includes(aliasName)) {
+      aliasOrder.push(aliasName);
+    }
   }
 }
 

package/src/generators/GenerateNM2.ts

@@ -26,7 +26,7 @@ const headerTemplate = `/*
  */
 #pragma once`;
 
-const specTemplate = `::_MODULE_CUSTPM_TYPES_REFLECTION_::
+const specTemplate = `::_MODULE_CUSTOM_TYPES_REFLECTION_::
 struct ::_MODULE_NAME_::Spec : winrt::Microsoft::ReactNative::TurboModuleSpec {
 ::_MODULE_MEMBERS_TUPLES_::
 
@@ -46,7 +46,7 @@ ${headerTemplate}
 #include <vector>
 
 namespace ::_NAMESPACE_:: {
-::_MODULE_CUSTPM_TYPES_::
+::_MODULE_CUSTOM_TYPES_::
 } // namespace ::_NAMESPACE_::
 `;
 
@@ -71,7 +71,7 @@ ${headerTemplate}
 #include <tuple>
 
 namespace ::_NAMESPACE_:: {
-::_MODULE_CUSTPM_TYPES_::
+::_MODULE_CUSTOM_TYPES_::
 ${specTemplate}
 };
 
@@ -147,8 +147,8 @@ ${errors}`;
 
         const replaceContent = function (template: string): string {
           return template
-            .replace(/::_MODULE_CUSTPM_TYPES_::/g, customTypes)
-            .replace(/::_MODULE_CUSTPM_TYPES_REFLECTION_::/g, customReflection)
+            .replace(/::_MODULE_CUSTOM_TYPES_::/g, customTypes)
+            .replace(/::_MODULE_CUSTOM_TYPES_REFLECTION_::/g, customReflection)
             .replace(/::_MODULE_MEMBERS_TUPLES_::/g, tuples.substring(1))
             .replace(/::_MODULE_MEMBERS_CHECKS_::/g, checks.substring(1))
             .replace(/::_MODULE_MEMBERS_ERRORS_::/g, errors)

package/src/generators/GenerateTypeScript.ts

@@ -147,7 +147,7 @@ ${type.properties
 function tryGetConstantType(
   nativeModule: NativeModuleSchema,
 ): NativeModuleObjectTypeAnnotation | undefined {
-  const candidates = nativeModule.spec.properties.filter(
+  const candidates = nativeModule.spec.methods.filter(
     prop => prop.name === 'getConstants',
   );
   if (candidates.length === 0) {
@@ -224,7 +224,7 @@ export function generateTypeScript(
           ? ''
           : `  getConstants(): ${translateType(constantType)}`;
 
-      const methods = nativeModule.spec.properties.filter(
+      const methods = nativeModule.spec.methods.filter(
         prop => prop.name !== 'getConstants',
       );
       const membersCode = methods.map(translateMethod).join('');

package/src/generators/ObjectTypes.ts

@@ -104,6 +104,7 @@ export function translateFieldOrReturnType(
         callerName,
         options,
       )}>`;
+    case 'FunctionTypeAnnotation':
     case 'MixedTypeAnnotation':
       return '';
     case 'EnumDeclaration':

package/src/generators/ValidateConstants.ts

@@ -13,7 +13,7 @@ export function generateValidateConstants(
   nativeModule: NativeModuleSchema,
   aliases: AliasMap,
 ): [string, string] | undefined {
-  const candidates = nativeModule.spec.properties.filter(
+  const candidates = nativeModule.spec.methods.filter(
     prop => prop.name === 'getConstants',
   );
   if (candidates.length === 0) {

package/src/generators/ValidateMethods.ts

@@ -87,13 +87,13 @@ function translatePossibleMethodSignatures(
 }
 
 function renderProperties(
-  properties: ReadonlyArray<NativeModulePropertyShape>,
+  methods: ReadonlyArray<NativeModulePropertyShape>,
   aliases: AliasMap,
   tuple: boolean,
   options: CppCodegenOptions,
 ): string {
   // TODO: generate code for constants
-  return properties
+  return methods
     .filter(prop => prop.name !== 'getConstants')
     .map((prop, index) => {
       // TODO: prop.optional === true
@@ -160,15 +160,15 @@ export function generateValidateMethods(
   aliases: AliasMap,
   options: CppCodegenOptions,
 ): [string, string] {
-  const properties = nativeModule.spec.properties;
+  const methods = nativeModule.spec.methods;
   const traversedProperties = renderProperties(
-    properties,
+    methods,
     aliases,
     false,
     options,
   );
   const traversedPropertyTuples = renderProperties(
-    properties,
+    methods,
     aliases,
     true,
     options,