@react-native-windows/codegen 0.71.3 → 0.72.0-preview.2

package/CHANGELOG.md

@@ -1,52 +1,111 @@
 # Change Log - @react-native-windows/codegen
 
-This log was last generated on Thu, 13 Apr 2023 20:50:07 GMT and should not be manually modified.
+This log was last generated on Thu, 04 May 2023 20:58:15 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.71.3
+## 0.72.0-preview.2
 
-Thu, 13 Apr 2023 20:50:07 GMT
+Thu, 04 May 2023 20:58:15 GMT
 
-### Patches
+### Changes
 
-- Fix RNW not being detected on case-sensitive file systems (4123478+tido64@users.noreply.github.com)
+- Backport Node 16 (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/fs to v0.72.0-preview.2
 
-## 0.71.2
+## 0.72.0-preview.1
 
-Mon, 27 Feb 2023 16:15:26 GMT
+Mon, 01 May 2023 16:43:58 GMT
 
-### Patches
+### Changes
+
+- Promote 0.72 to preview (34109996+chiaramooney@users.noreply.github.com)
+- Bump @react-native-windows/fs to v0.72.0-preview.1
+
+## 0.0.0-canary.54
+
+Tue, 21 Mar 2023 21:21:55 GMT
+
+### Changes
+
+- Bump @react-native-windows/fs to v0.0.0-canary.17
+- Bump @rnw-scripts/jest-unittest-config to v1.5.1
+- Bump @rnw-scripts/just-task to v2.3.6
+
+## 0.0.0-canary.53
+
+Thu, 02 Mar 2023 06:14:21 GMT
+
+### Changes
+
+- Merge branch 'YajurG-8875' of https://github.com/YajurG/react-native-windows into YajurG-8875 (email not defined)
+- Bump @react-native-windows/fs to v0.0.0-canary.16
+
+## 0.0.0-canary.52
+
+Sat, 25 Feb 2023 06:13:35 GMT
+
+### Changes
 
 - Move `@typescript-eslint/eslint-plugin` to `devDependencies` so they don't get installed by consumers (4123478+tido64@users.noreply.github.com)
-- Bump @react-native-windows/fs to v0.71.2
+- Bump @react-native-windows/fs to v0.0.0-canary.15
 
-## 0.71.1
+## 0.0.0-canary.51
 
-Mon, 13 Feb 2023 16:16:02 GMT
+Wed, 22 Feb 2023 06:14:08 GMT
 
-### Patches
+### Changes
+
+- Fix code to handle newer version of @react-native/codegen (30809111+acoates-ms@users.noreply.github.com)
+
+## 0.0.0-canary.50
+
+Fri, 10 Feb 2023 06:15:30 GMT
+
+### Changes
+
+- codegen-windows --check always fails (30809111+acoates-ms@users.noreply.github.com)
+
+## 0.0.0-canary.49
+
+Thu, 09 Feb 2023 06:16:42 GMT
+
+### Changes
 
 - Bump typescript version (30809111+acoates-ms@users.noreply.github.com)
-- Bump @react-native-windows/fs to v0.71.1
+- Bump @react-native-windows/fs to v0.0.0-canary.14
 
-## 0.71.0
+## 0.0.0-canary.48
 
-Mon, 23 Jan 2023 16:16:57 GMT
+Wed, 11 Jan 2023 06:15:29 GMT
 
-### Patches
+### Changes
+
+- integrate 12/2/22 (tatianakapos@microsoft.com)
+- Bump @react-native-windows/fs to v0.0.0-canary.13
+- Bump @rnw-scripts/jest-unittest-config to v1.5.0
+- Bump @rnw-scripts/just-task to v2.3.5
+
+## 0.0.0-canary.47
+
+Wed, 21 Dec 2022 06:15:26 GMT
+
+### Changes
 
-- Promote 0.71 to latest (34109996+chiaramooney@users.noreply.github.com)
-- Bump @react-native-windows/fs to v0.71.0
+- Support enum/union and T in Promise<T> in codegen (53799235+ZihanChen-MSFT@users.noreply.github.com)
 
-## 0.71.0-preview.1
+## 0.0.0-canary.46
 
-Mon, 12 Dec 2022 16:16:50 GMT
+Tue, 13 Dec 2022 06:15:22 GMT
 
 ### Changes
 
-- Promote 0.71 to preview (34109996+chiaramooney@users.noreply.github.com)
-- Bump @react-native-windows/fs to v0.71.0-preview.1
+- Standardize on the repository field in package.json (dannyvv@microsoft.com)
+- Bump @react-native-windows/fs to v0.0.0-canary.12
+- Bump @rnw-scripts/eslint-config to v1.1.15
+- Bump @rnw-scripts/jest-unittest-config to v1.4.3
+- Bump @rnw-scripts/just-task to v2.3.4
+- Bump @rnw-scripts/ts-config to v2.0.3
 
 ## 0.0.0-canary.45
 

package/README.md

@@ -1,6 +1,6 @@
 # @react-native-windows/codegen
 
-Generators for react-native-codegen targeting react-native-windows
+Generators for @react-native/codegen targeting react-native-windows
 
 ## Usage
 

package/lib-commonjs/Cli.js

@@ -66,5 +66,9 @@ if ((argv.file && argv.files) || (!argv.file && !argv.files)) {
     console.error('You must specify either --file or --files.');
     process.exit(1);
 }
-(0, index_1.runCodeGen)(argv);
+const changesNecessary = (0, index_1.runCodeGen)(argv);
+if (argv.test && changesNecessary) {
+    console.error('There is a change in the output of codegen.  Rerun "react-native codegen-windows" to regenerate.');
+    process.exit(2);
+}
 //# sourceMappingURL=Cli.js.map

package/lib-commonjs/Cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,kDAA0B;AAC1B,mCAAmC;AAEnC,MAAM,IAAI,GAAG,eAAK,CAAC,OAAO,CAAC;IACzB,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,0BAA0B;KACrC;IACD,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,8CAA8C;KACzD;IACD,sBAAsB,EAAE;QACtB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,sDAAsD;QAChE,OAAO,EAAE,KAAK;KACf;IACD,UAAU,EAAE;QACV,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,0CAA0C;QACpD,OAAO,EAAE,KAAK;KACf;IACD,cAAc,EAAE;QACd,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mDAAmD;QAC7D,OAAO,EAAE,KAAK;KACf;IACD,UAAU,EAAE;QACV,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,wDAAwD;QAClE,OAAO,EAAE,KAAK;KACf;IACD,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,+CAA+C;QACzD,OAAO,EAAE,KAAK;KACf;IACD,SAAS,EAAE;QACT,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,qDAAqD;QAC/D,OAAO,EAAE,aAAa;KACvB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,4DAA4D;KACvE;CACF,CAAC,CAAC,IAAI,CAAC;AAER,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;IAC5D,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n *\n * @format\n */\n\nimport yargs from 'yargs';\nimport {runCodeGen} from './index';\n\nconst argv = yargs.options({\n  file: {\n    type: 'string',\n    describe: 'file which contains spec',\n  },\n  files: {\n    type: 'string',\n    array: true,\n    describe: 'glob patterns for files which contains specs',\n  },\n  modulesTypeScriptTypes: {\n    type: 'boolean',\n    describe: 'generate turbo module definition files in TypeScript',\n    default: false,\n  },\n  modulesCxx: {\n    type: 'boolean',\n    describe: 'generate C++ JSI turbo module spec files',\n    default: false,\n  },\n  modulesWindows: {\n    type: 'boolean',\n    describe: 'generate turbo module spec files for REACT_MODULE',\n    default: false,\n  },\n  methodOnly: {\n    type: 'boolean',\n    describe: 'generate only method metadata in C++ turbo module spec',\n    default: false,\n  },\n  outputDirectory: {\n    type: 'string',\n    describe: 'output directory',\n    default: 'codegen',\n  },\n  test: {\n    type: 'boolean',\n    describe: 'Verify that the generated output is unchanged',\n    default: false,\n  },\n  namespace: {\n    type: 'string',\n    describe: 'C++/C# Namespace to put generated native modules in',\n    default: 'MyNamespace',\n  },\n  libraryName: {\n    type: 'string',\n    required: true,\n    describe: 'Used for part of the path generated within the codegen dir',\n  },\n}).argv;\n\nif ((argv.file && argv.files) || (!argv.file && !argv.files)) {\n  console.error('You must specify either --file or --files.');\n  process.exit(1);\n}\n\nrunCodeGen(argv);\n"]}
+{"version":3,"file":"Cli.js","sourceRoot":"","sources":["../src/Cli.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;;;AAEH,kDAA0B;AAC1B,mCAAmC;AAEnC,MAAM,IAAI,GAAG,eAAK,CAAC,OAAO,CAAC;IACzB,IAAI,EAAE;QACJ,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,0BAA0B;KACrC;IACD,KAAK,EAAE;QACL,IAAI,EAAE,QAAQ;QACd,KAAK,EAAE,IAAI;QACX,QAAQ,EAAE,8CAA8C;KACzD;IACD,sBAAsB,EAAE;QACtB,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,sDAAsD;QAChE,OAAO,EAAE,KAAK;KACf;IACD,UAAU,EAAE;QACV,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,0CAA0C;QACpD,OAAO,EAAE,KAAK;KACf;IACD,cAAc,EAAE;QACd,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,mDAAmD;QAC7D,OAAO,EAAE,KAAK;KACf;IACD,UAAU,EAAE;QACV,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,wDAAwD;QAClE,OAAO,EAAE,KAAK;KACf;IACD,eAAe,EAAE;QACf,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,kBAAkB;QAC5B,OAAO,EAAE,SAAS;KACnB;IACD,IAAI,EAAE;QACJ,IAAI,EAAE,SAAS;QACf,QAAQ,EAAE,+CAA+C;QACzD,OAAO,EAAE,KAAK;KACf;IACD,SAAS,EAAE;QACT,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,qDAAqD;QAC/D,OAAO,EAAE,aAAa;KACvB;IACD,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;QACd,QAAQ,EAAE,4DAA4D;KACvE;CACF,CAAC,CAAC,IAAI,CAAC;AAER,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;IAC5D,OAAO,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IAC5D,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB;AAED,MAAM,gBAAgB,GAAG,IAAA,kBAAU,EAAC,IAAI,CAAC,CAAC;AAE1C,IAAI,IAAI,CAAC,IAAI,IAAI,gBAAgB,EAAE;IACjC,OAAO,CAAC,KAAK,CACX,kGAAkG,CACnG,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;CACjB","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n *\n * @format\n */\n\nimport yargs from 'yargs';\nimport {runCodeGen} from './index';\n\nconst argv = yargs.options({\n  file: {\n    type: 'string',\n    describe: 'file which contains spec',\n  },\n  files: {\n    type: 'string',\n    array: true,\n    describe: 'glob patterns for files which contains specs',\n  },\n  modulesTypeScriptTypes: {\n    type: 'boolean',\n    describe: 'generate turbo module definition files in TypeScript',\n    default: false,\n  },\n  modulesCxx: {\n    type: 'boolean',\n    describe: 'generate C++ JSI turbo module spec files',\n    default: false,\n  },\n  modulesWindows: {\n    type: 'boolean',\n    describe: 'generate turbo module spec files for REACT_MODULE',\n    default: false,\n  },\n  methodOnly: {\n    type: 'boolean',\n    describe: 'generate only method metadata in C++ turbo module spec',\n    default: false,\n  },\n  outputDirectory: {\n    type: 'string',\n    describe: 'output directory',\n    default: 'codegen',\n  },\n  test: {\n    type: 'boolean',\n    describe: 'Verify that the generated output is unchanged',\n    default: false,\n  },\n  namespace: {\n    type: 'string',\n    describe: 'C++/C# Namespace to put generated native modules in',\n    default: 'MyNamespace',\n  },\n  libraryName: {\n    type: 'string',\n    required: true,\n    describe: 'Used for part of the path generated within the codegen dir',\n  },\n}).argv;\n\nif ((argv.file && argv.files) || (!argv.file && !argv.files)) {\n  console.error('You must specify either --file or --files.');\n  process.exit(1);\n}\n\nconst changesNecessary = runCodeGen(argv);\n\nif (argv.test && changesNecessary) {\n  console.error(\n    'There is a change in the output of codegen.  Rerun \"react-native codegen-windows\" to regenerate.',\n  );\n  process.exit(2);\n}\n"]}

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  * @format
  */
-import type { NativeModuleObjectTypeAnnotation } from 'react-native-tscodegen';
+import type { NativeModuleObjectTypeAnnotation } from '@react-native/codegen/lib/CodegenSchema';
 import { AliasMap } from './AliasManaging';
 export declare function createAliasMap(nativeModuleAliases: {
     [name: string]: NativeModuleObjectTypeAnnotation;

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-tscodegen';\nimport {AliasMap, getAliasCppName} from './AliasManaging';\nimport {translateField} from './ObjectTypes';\n\nfunction translateObjectBody(\n  type: NativeModuleObjectTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  prefix: string,\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      const first = `${prefix}REACT_FIELD(${prop.name})`;\n      const second = `${prefix}${translateField(\n        propType,\n        aliases,\n        `${baseAliasName}_${prop.name}`,\n      )} ${prop.name};`;\n      return `${first}\\n${second}`;\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 AliasCodeMap {\n  [name: string]: string;\n}\n\nfunction generateSingleAlias(\n  aliases: AliasMap,\n  aliasName: string,\n  aliasCode: AliasCodeMap,\n): void {\n  const aliasType = <NativeModuleObjectTypeAnnotation>aliases.types[aliasName];\n  aliasCode[aliasName] = `\nREACT_STRUCT(${getAliasCppName(aliasName)})\nstruct ${getAliasCppName(aliasName)} {\n${translateObjectBody(aliasType, aliases, aliasName, '    ')}\n};\n`;\n}\n\nfunction generateNestedAliasesInCorrectOrder(\n  aliases: AliasMap,\n  aliasCode: AliasCodeMap,\n  aliasOrder: string[],\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);\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(aliases, aliasCode, aliasOrder);\n    // all referenced C++ structs are generated\n    // put the current one following them\n    aliasOrder.push(aliasName);\n  }\n}\n\nexport function generateAliases(aliases: AliasMap): string {\n  const aliasCode: AliasCodeMap = {};\n  const aliasOrder: string[] = [];\n  generateNestedAliasesInCorrectOrder(aliases, aliasCode, aliasOrder);\n\n  // aliasOrder now has the correct order of C++ struct code\n  let traversedAliasedStructs = '';\n  for (const aliasName of aliasOrder) {\n    traversedAliasedStructs = `${traversedAliasedStructs}${aliasCode[aliasName]}`;\n  }\n  return traversedAliasedStructs;\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 {translateField} from './ObjectTypes';\n\nfunction translateObjectBody(\n  type: NativeModuleObjectTypeAnnotation,\n  aliases: AliasMap,\n  baseAliasName: string,\n  prefix: string,\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      const first = `${prefix}REACT_FIELD(${prop.name})`;\n      const second = `${prefix}${translateField(\n        propType,\n        aliases,\n        `${baseAliasName}_${prop.name}`,\n      )} ${prop.name};`;\n      return `${first}\\n${second}`;\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 AliasCodeMap {\n  [name: string]: string;\n}\n\nfunction generateSingleAlias(\n  aliases: AliasMap,\n  aliasName: string,\n  aliasCode: AliasCodeMap,\n): void {\n  const aliasType = <NativeModuleObjectTypeAnnotation>aliases.types[aliasName];\n  aliasCode[aliasName] = `\nREACT_STRUCT(${getAliasCppName(aliasName)})\nstruct ${getAliasCppName(aliasName)} {\n${translateObjectBody(aliasType, aliases, aliasName, '    ')}\n};\n`;\n}\n\nfunction generateNestedAliasesInCorrectOrder(\n  aliases: AliasMap,\n  aliasCode: AliasCodeMap,\n  aliasOrder: string[],\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);\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(aliases, aliasCode, aliasOrder);\n    // all referenced C++ structs are generated\n    // put the current one following them\n    aliasOrder.push(aliasName);\n  }\n}\n\nexport function generateAliases(aliases: AliasMap): string {\n  const aliasCode: AliasCodeMap = {};\n  const aliasOrder: string[] = [];\n  generateNestedAliasesInCorrectOrder(aliases, aliasCode, aliasOrder);\n\n  // aliasOrder now has the correct order of C++ struct code\n  let traversedAliasedStructs = '';\n  for (const aliasName of aliasOrder) {\n    traversedAliasedStructs = `${traversedAliasedStructs}${aliasCode[aliasName]}`;\n  }\n  return traversedAliasedStructs;\n}\n"]}

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  * @format
  */
-import type { NativeModuleObjectTypeAnnotation } from 'react-native-tscodegen';
+import type { NativeModuleObjectTypeAnnotation } from '@react-native/codegen/lib/CodegenSchema';
 export declare function setPreferredModuleName(moduleName: string): void;
 export declare function getAliasCppName(typeName: string): string;
 export interface AliasMap {

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

@@ -1 +1 @@
-{"version":3,"file":"AliasManaging.js","sourceRoot":"","sources":["../../src/generators/AliasManaging.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAIb,IAAI,mBAAmB,GAAW,EAAE,CAAC;AAErC,SAAgB,sBAAsB,CAAC,UAAkB;IACvD,mBAAmB,GAAG,UAAU,CAAC;AACnC,CAAC;AAFD,wDAEC;AAED,SAAgB,eAAe,CAAC,QAAgB;IAC9C,OAAO,GAAG,mBAAmB,QAAQ,QAAQ,EAAE,CAAC;AAClD,CAAC;AAFD,0CAEC;AAOD,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAKnD,SAAS,qBAAqB,CAC5B,OAAiB,EACjB,aAAqB,EACrB,QAAwB;IAExB,QAAQ,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC;IAC5C,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC;IACxC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACjC,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAgB,wBAAwB,CACtC,OAAiB,EACjB,aAAqB,EACrB,UAA4C;IAE5C,iDAAiD;IACjD,6CAA6C;IAC7C,yBAAyB;IACzB,uFAAuF;IACvF,MAAM,QAAQ,GAAmB,UAAU,CAAC;IAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAI,GAAG,KAAK,SAAS,EAAE;QACrB,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;KAC7B;IAED,iDAAiD;IACjD,+BAA+B;IAC/B,8DAA8D;IAC9D,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,eAAe,CACpB,qBAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,CACxD,CAAC;KACH;IAED,qCAAqC;IACrC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,aAAa,GAAG,KAAK,EAAE,CAAC,KAAK,SAAS,EAAE;QAC9D,KAAK,EAAE,CAAC;KACT;IAED,OAAO,eAAe,CACpB,qBAAqB,CAAC,OAAO,EAAE,GAAG,aAAa,GAAG,KAAK,EAAE,EAAE,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AAjCD,4DAiCC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {NativeModuleObjectTypeAnnotation} from 'react-native-tscodegen';\n\nlet preferredModuleName: string = '';\n\nexport function setPreferredModuleName(moduleName: string): void {\n  preferredModuleName = moduleName;\n}\n\nexport function getAliasCppName(typeName: string): string {\n  return `${preferredModuleName}Spec_${typeName}`;\n}\n\nexport interface AliasMap {\n  types: {[name: string]: NativeModuleObjectTypeAnnotation | undefined};\n  jobs: string[];\n}\n\nconst ExtendedObjectKey = '$RNW-TURBOMODULE-ALIAS';\ninterface ExtendedObject extends NativeModuleObjectTypeAnnotation {\n  '$RNW-TURBOMODULE-ALIAS'?: string;\n}\n\nfunction recordAnonymouseAlias(\n  aliases: AliasMap,\n  baseAliasName: string,\n  extended: ExtendedObject,\n): string {\n  extended[ExtendedObjectKey] = baseAliasName;\n  aliases.types[baseAliasName] = extended;\n  aliases.jobs.push(baseAliasName);\n  return baseAliasName;\n}\n\nexport function getAnonymousAliasCppName(\n  aliases: AliasMap,\n  baseAliasName: string,\n  objectType: NativeModuleObjectTypeAnnotation,\n): string {\n  // someone found an anonymous object literal type\n  // if the ExtendedObjectKey flag has been set\n  // then it is a known one\n  // this happens because method signatures are generate twice in spec and error messages\n  const extended = <ExtendedObject>objectType;\n  const key = extended[ExtendedObjectKey];\n  if (key !== undefined) {\n    return getAliasCppName(key);\n  }\n\n  // if the ExtendedObjectKey flag has not been set\n  // it means it is a unknown one\n  // associate the name with this object literal type and return\n  if (aliases.types[baseAliasName] === undefined) {\n    return getAliasCppName(\n      recordAnonymouseAlias(aliases, baseAliasName, extended),\n    );\n  }\n\n  // sometimes names could be anonymous\n  let index = 2;\n  while (aliases.types[`${baseAliasName}${index}`] !== undefined) {\n    index++;\n  }\n\n  return getAliasCppName(\n    recordAnonymouseAlias(aliases, `${baseAliasName}${index}`, extended),\n  );\n}\n"]}
+{"version":3,"file":"AliasManaging.js","sourceRoot":"","sources":["../../src/generators/AliasManaging.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAIb,IAAI,mBAAmB,GAAW,EAAE,CAAC;AAErC,SAAgB,sBAAsB,CAAC,UAAkB;IACvD,mBAAmB,GAAG,UAAU,CAAC;AACnC,CAAC;AAFD,wDAEC;AAED,SAAgB,eAAe,CAAC,QAAgB;IAC9C,OAAO,GAAG,mBAAmB,QAAQ,QAAQ,EAAE,CAAC;AAClD,CAAC;AAFD,0CAEC;AAOD,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAKnD,SAAS,qBAAqB,CAC5B,OAAiB,EACjB,aAAqB,EACrB,QAAwB;IAExB,QAAQ,CAAC,iBAAiB,CAAC,GAAG,aAAa,CAAC;IAC5C,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,QAAQ,CAAC;IACxC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACjC,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,SAAgB,wBAAwB,CACtC,OAAiB,EACjB,aAAqB,EACrB,UAA4C;IAE5C,iDAAiD;IACjD,6CAA6C;IAC7C,yBAAyB;IACzB,uFAAuF;IACvF,MAAM,QAAQ,GAAmB,UAAU,CAAC;IAC5C,MAAM,GAAG,GAAG,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACxC,IAAI,GAAG,KAAK,SAAS,EAAE;QACrB,OAAO,eAAe,CAAC,GAAG,CAAC,CAAC;KAC7B;IAED,iDAAiD;IACjD,+BAA+B;IAC/B,8DAA8D;IAC9D,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,SAAS,EAAE;QAC9C,OAAO,eAAe,CACpB,qBAAqB,CAAC,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,CACxD,CAAC;KACH;IAED,qCAAqC;IACrC,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,aAAa,GAAG,KAAK,EAAE,CAAC,KAAK,SAAS,EAAE;QAC9D,KAAK,EAAE,CAAC;KACT;IAED,OAAO,eAAe,CACpB,qBAAqB,CAAC,OAAO,EAAE,GAAG,aAAa,GAAG,KAAK,EAAE,EAAE,QAAQ,CAAC,CACrE,CAAC;AACJ,CAAC;AAjCD,4DAiCC","sourcesContent":["/**\n * Copyright (c) Microsoft Corporation.\n * Licensed under the MIT License.\n * @format\n */\n\n'use strict';\n\nimport type {NativeModuleObjectTypeAnnotation} from '@react-native/codegen/lib/CodegenSchema';\n\nlet preferredModuleName: string = '';\n\nexport function setPreferredModuleName(moduleName: string): void {\n  preferredModuleName = moduleName;\n}\n\nexport function getAliasCppName(typeName: string): string {\n  return `${preferredModuleName}Spec_${typeName}`;\n}\n\nexport interface AliasMap {\n  types: {[name: string]: NativeModuleObjectTypeAnnotation | undefined};\n  jobs: string[];\n}\n\nconst ExtendedObjectKey = '$RNW-TURBOMODULE-ALIAS';\ninterface ExtendedObject extends NativeModuleObjectTypeAnnotation {\n  '$RNW-TURBOMODULE-ALIAS'?: string;\n}\n\nfunction recordAnonymouseAlias(\n  aliases: AliasMap,\n  baseAliasName: string,\n  extended: ExtendedObject,\n): string {\n  extended[ExtendedObjectKey] = baseAliasName;\n  aliases.types[baseAliasName] = extended;\n  aliases.jobs.push(baseAliasName);\n  return baseAliasName;\n}\n\nexport function getAnonymousAliasCppName(\n  aliases: AliasMap,\n  baseAliasName: string,\n  objectType: NativeModuleObjectTypeAnnotation,\n): string {\n  // someone found an anonymous object literal type\n  // if the ExtendedObjectKey flag has been set\n  // then it is a known one\n  // this happens because method signatures are generate twice in spec and error messages\n  const extended = <ExtendedObject>objectType;\n  const key = extended[ExtendedObjectKey];\n  if (key !== undefined) {\n    return getAliasCppName(key);\n  }\n\n  // if the ExtendedObjectKey flag has not been set\n  // it means it is a unknown one\n  // associate the name with this object literal type and return\n  if (aliases.types[baseAliasName] === undefined) {\n    return getAliasCppName(\n      recordAnonymouseAlias(aliases, baseAliasName, extended),\n    );\n  }\n\n  // sometimes names could be anonymous\n  let index = 2;\n  while (aliases.types[`${baseAliasName}${index}`] !== undefined) {\n    index++;\n  }\n\n  return getAliasCppName(\n    recordAnonymouseAlias(aliases, `${baseAliasName}${index}`, extended),\n  );\n}\n"]}

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  * @format
  */
-import type { SchemaType } from 'react-native-tscodegen';
+import type { SchemaType } from '@react-native/codegen/lib/CodegenSchema';
 type FilesOutput = Map<string, string>;
 export declare function createNM2Generator({ methodOnly, namespace, }: {
     methodOnly: boolean;

package/lib-commonjs/generators/GenerateNM2.js

@@ -53,7 +53,7 @@ function createNM2Generator({ methodOnly, namespace, }) {
             if (nativeModule.type === 'NativeModule') {
                 console.log(`Generating Native${preferredModuleName}Spec.g.h`);
                 // copy all explicit to a map
-                const aliases = (0, AliasGen_1.createAliasMap)(nativeModule.aliases);
+                const aliases = (0, AliasGen_1.createAliasMap)(nativeModule.aliasMap);
                 // prepare methods
                 const methods = (0, ValidateMethods_1.generateValidateMethods)(nativeModule, aliases);
                 let tuples = `

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

@@ -1 +1 @@
-{"version":3,"file":"GenerateNM2.js","sourceRoot":"","sources":["../../src/generators/GenerateNM2.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAGb,mDAAiE;AACjE,yCAA2D;AAC3D,2DAA8D;AAC9D,uDAA0D;AAI1D,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BtB,CAAC;AAEF,SAAgB,kBAAkB,CAAC,EACjC,UAAU,EACV,SAAS,GAIV;IACC,OAAO,CACL,YAAoB,EACpB,MAAkB,EAClB,eAAuB,EACV,EAAE;QACf,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;QAExC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACpD,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAChD,4CAA4C;YAC5C,0DAA0D;YAC1D,iCAAiC;YACjC,MAAM,mBAAmB,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC;gBACzD,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;gBACtB,CAAC,CAAC,UAAU,CAAC;YACf,IAAA,sCAAsB,EAAC,mBAAmB,CAAC,CAAC;YAE5C,IAAI,YAAY,CAAC,IAAI,KAAK,cAAc,EAAE;gBACxC,OAAO,CAAC,GAAG,CAAC,oBAAoB,mBAAmB,UAAU,CAAC,CAAC;gBAE/D,6BAA6B;gBAC7B,MAAM,OAAO,GAAa,IAAA,yBAAc,EAAC,YAAY,CAAC,OAAO,CAAC,CAAC;gBAE/D,kBAAkB;gBAClB,MAAM,OAAO,GAAG,IAAA,yCAAuB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;gBAC/D,IAAI,MAAM,GAAG;;EAEnB,OAAO,CAAC,CAAC,CAAC;KACP,CAAC;gBACE,IAAI,MAAM,GAAG;wFACmE,CAAC;gBACjF,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAExB,oBAAoB;gBACpB,MAAM,SAAS,GAAG,IAAA,6CAAyB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;gBACnE,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,UAAU,EAAE;oBAC1C,MAAM,GAAG;;EAEjB,SAAS,CAAC,CAAC,CAAC;MACR,MAAM,EAAE,CAAC;oBACL,MAAM,GAAG;6FAC0E,MAAM,EAAE,CAAC;oBAC5F,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC;;EAEhC,MAAM,EAAE,CAAC;iBACF;gBAED,4BAA4B;gBAC5B,MAAM,uBAAuB,GAAG,IAAA,0BAAe,EAAC,OAAO,CAAC,CAAC;gBAEzD,KAAK,CAAC,GAAG,CACP,SAAS,mBAAmB,UAAU,EACtC,cAAc;qBACX,OAAO,CAAC,+BAA+B,EAAE,uBAAuB,CAAC;qBACjE,OAAO,CAAC,8BAA8B,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;qBAC5D,OAAO,CAAC,8BAA8B,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;qBAC5D,OAAO,CAAC,8BAA8B,EAAE,MAAM,CAAC;qBAC/C,OAAO,CAAC,oBAAoB,EAAE,mBAAmB,CAAC;qBAClD,OAAO,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAC1C,CAAC;aACH;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAxED,gDAwEC","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-tscodegen';\nimport {AliasMap, setPreferredModuleName} from './AliasManaging';\nimport {createAliasMap, generateAliases} from './AliasGen';\nimport {generateValidateConstants} from './ValidateConstants';\nimport {generateValidateMethods} from './ValidateMethods';\n\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 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\n#include \"NativeModules.h\"\n#include <tuple>\n\nnamespace ::_NAMESPACE_:: {\n::_MODULE_ALIASED_STRUCTS_::\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};\n\n} // namespace ::_NAMESPACE_::\n`;\n\nexport function createNM2Generator({\n  methodOnly,\n  namespace,\n}: {\n  methodOnly: boolean;\n  namespace: string;\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.aliases);\n\n        // prepare methods\n        const methods = generateValidateMethods(nativeModule, aliases);\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 traversedAliasedStructs = generateAliases(aliases);\n\n        files.set(\n          `Native${preferredModuleName}Spec.g.h`,\n          moduleTemplate\n            .replace(/::_MODULE_ALIASED_STRUCTS_::/g, traversedAliasedStructs)\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(/::_NAMESPACE_::/g, namespace),\n        );\n      }\n    }\n\n    return files;\n  };\n}\n"]}
+{"version":3,"file":"GenerateNM2.js","sourceRoot":"","sources":["../../src/generators/GenerateNM2.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAGb,mDAAiE;AACjE,yCAA2D;AAC3D,2DAA8D;AAC9D,uDAA0D;AAI1D,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2BtB,CAAC;AAEF,SAAgB,kBAAkB,CAAC,EACjC,UAAU,EACV,SAAS,GAIV;IACC,OAAO,CACL,YAAoB,EACpB,MAAkB,EAClB,eAAuB,EACV,EAAE;QACf,MAAM,KAAK,GAAG,IAAI,GAAG,EAAkB,CAAC;QAExC,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;YACpD,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;YAChD,4CAA4C;YAC5C,0DAA0D;YAC1D,iCAAiC;YACjC,MAAM,mBAAmB,GAAG,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC;gBACzD,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;gBACtB,CAAC,CAAC,UAAU,CAAC;YACf,IAAA,sCAAsB,EAAC,mBAAmB,CAAC,CAAC;YAE5C,IAAI,YAAY,CAAC,IAAI,KAAK,cAAc,EAAE;gBACxC,OAAO,CAAC,GAAG,CAAC,oBAAoB,mBAAmB,UAAU,CAAC,CAAC;gBAE/D,6BAA6B;gBAC7B,MAAM,OAAO,GAAa,IAAA,yBAAc,EAAC,YAAY,CAAC,QAAQ,CAAC,CAAC;gBAEhE,kBAAkB;gBAClB,MAAM,OAAO,GAAG,IAAA,yCAAuB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;gBAC/D,IAAI,MAAM,GAAG;;EAEnB,OAAO,CAAC,CAAC,CAAC;KACP,CAAC;gBACE,IAAI,MAAM,GAAG;wFACmE,CAAC;gBACjF,IAAI,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAExB,oBAAoB;gBACpB,MAAM,SAAS,GAAG,IAAA,6CAAyB,EAAC,YAAY,EAAE,OAAO,CAAC,CAAC;gBACnE,IAAI,SAAS,KAAK,SAAS,IAAI,CAAC,UAAU,EAAE;oBAC1C,MAAM,GAAG;;EAEjB,SAAS,CAAC,CAAC,CAAC;MACR,MAAM,EAAE,CAAC;oBACL,MAAM,GAAG;6FAC0E,MAAM,EAAE,CAAC;oBAC5F,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC;;EAEhC,MAAM,EAAE,CAAC;iBACF;gBAED,4BAA4B;gBAC5B,MAAM,uBAAuB,GAAG,IAAA,0BAAe,EAAC,OAAO,CAAC,CAAC;gBAEzD,KAAK,CAAC,GAAG,CACP,SAAS,mBAAmB,UAAU,EACtC,cAAc;qBACX,OAAO,CAAC,+BAA+B,EAAE,uBAAuB,CAAC;qBACjE,OAAO,CAAC,8BAA8B,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;qBAC5D,OAAO,CAAC,8BAA8B,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;qBAC5D,OAAO,CAAC,8BAA8B,EAAE,MAAM,CAAC;qBAC/C,OAAO,CAAC,oBAAoB,EAAE,mBAAmB,CAAC;qBAClD,OAAO,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAC1C,CAAC;aACH;SACF;QAED,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;AACJ,CAAC;AAxED,gDAwEC","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';\n\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 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\n#include \"NativeModules.h\"\n#include <tuple>\n\nnamespace ::_NAMESPACE_:: {\n::_MODULE_ALIASED_STRUCTS_::\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};\n\n} // namespace ::_NAMESPACE_::\n`;\n\nexport function createNM2Generator({\n  methodOnly,\n  namespace,\n}: {\n  methodOnly: boolean;\n  namespace: string;\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        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 traversedAliasedStructs = generateAliases(aliases);\n\n        files.set(\n          `Native${preferredModuleName}Spec.g.h`,\n          moduleTemplate\n            .replace(/::_MODULE_ALIASED_STRUCTS_::/g, traversedAliasedStructs)\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(/::_NAMESPACE_::/g, namespace),\n        );\n      }\n    }\n\n    return files;\n  };\n}\n"]}

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  * @format
  */
-import type { NativeModuleSchema, SchemaType } from 'react-native-tscodegen';
+import type { NativeModuleSchema, SchemaType } from '@react-native/codegen/lib/CodegenSchema';
 export declare function setOptionalTurboModule(schema: NativeModuleSchema, optional: boolean): void;
 export declare function getOptionalTurboModule(schema: NativeModuleSchema): boolean;
 type FilesOutput = Map<string, string>;

package/lib-commonjs/generators/GenerateTypeScript.js

@@ -144,8 +144,8 @@ function generateTypeScript(_libraryName, schema, _moduleSpecName) {
             : moduleName;
         if (nativeModule.type === 'NativeModule') {
             console.log(`Generating ${preferredModuleName}Spec.g.ts`);
-            const aliasCode = Object.keys(nativeModule.aliases)
-                .map(name => translateAlias(name, nativeModule.aliases[name]))
+            const aliasCode = Object.keys(nativeModule.aliasMap)
+                .map(name => translateAlias(name, nativeModule.aliasMap[name]))
                 .join('');
             const constantType = tryGetConstantType(nativeModule);
             const constantCode = constantType === undefined

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-tscodegen';\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.aliases)\n        .map(name => translateAlias(name, nativeModule.aliases[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.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"]}

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

@@ -3,6 +3,7 @@
  * Licensed under the MIT License.
  * @format
  */
-import type { NativeModuleBaseTypeAnnotation, Nullable } from 'react-native-tscodegen';
+import type { NativeModuleBaseTypeAnnotation, Nullable } from '@react-native/codegen/lib/CodegenSchema';
 import { AliasMap } from './AliasManaging';
+export declare function translateFieldOrReturnType(type: Nullable<NativeModuleBaseTypeAnnotation>, aliases: AliasMap, baseAliasName: string, callerName: 'translateField' | 'translateReturnType'): string;
 export declare function translateField(type: Nullable<NativeModuleBaseTypeAnnotation>, aliases: AliasMap, baseAliasName: string): string;

package/lib-commonjs/generators/ObjectTypes.js

@@ -5,9 +5,22 @@
  */
 'use strict';
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.translateField = void 0;
+exports.translateField = exports.translateFieldOrReturnType = void 0;
 const AliasManaging_1 = require("./AliasManaging");
-function translateField(type, aliases, baseAliasName) {
+function translateUnionReturnType(type) {
+    const memberType = type.memberType;
+    switch (type.memberType) {
+        case 'StringTypeAnnotation':
+            return 'std::string';
+        case 'NumberTypeAnnotation':
+            return 'double';
+        case 'ObjectTypeAnnotation':
+            return '::React::JSValue';
+        default:
+            throw new Error(`Unknown enum/union member type in translateReturnType: ${memberType}`);
+    }
+}
+function translateFieldOrReturnType(type, aliases, baseAliasName, callerName) {
     // avoid: Property 'type' does not exist on type 'never'
     const returnType = type.type;
     switch (type.type) {
@@ -23,7 +36,7 @@ function translateField(type, aliases, baseAliasName) {
             return 'bool';
         case 'ArrayTypeAnnotation':
             if (type.elementType) {
-                return `std::vector<${translateField(type.elementType, aliases, `${baseAliasName}_element`)}>`;
+                return `std::vector<${translateFieldOrReturnType(type.elementType, aliases, `${baseAliasName}_element`, callerName)}>`;
             }
             else {
                 return `::React::JSValueArray`;
@@ -38,16 +51,23 @@ function translateField(type, aliases, baseAliasName) {
             // (#6597)
             // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
             if (name !== 'RootTag')
-                throw new Error(`Unknown reserved function: ${name} in translateReturnType`);
+                throw new Error(`Unknown reserved function: ${name} in ${callerName}`);
             return 'double';
         }
         case 'TypeAliasTypeAnnotation':
             return (0, AliasManaging_1.getAliasCppName)(type.name);
         case 'NullableTypeAnnotation':
-            return `std::optional<${translateField(type.typeAnnotation, aliases, baseAliasName)}>`;
+            return `std::optional<${translateFieldOrReturnType(type.typeAnnotation, aliases, baseAliasName, callerName)}>`;
+        case 'EnumDeclaration':
+        case 'UnionTypeAnnotation':
+            return translateUnionReturnType(type);
         default:
-            throw new Error(`Unhandled type in translateReturnType: ${returnType}`);
+            throw new Error(`Unhandled type in ${callerName}: ${returnType}`);
     }
 }
+exports.translateFieldOrReturnType = translateFieldOrReturnType;
+function translateField(type, aliases, baseAliasName) {
+    return translateFieldOrReturnType(type, aliases, baseAliasName, 'translateField');
+}
 exports.translateField = translateField;
 //# sourceMappingURL=ObjectTypes.js.map

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;;;AAMb,mDAIyB;AAEzB,SAAgB,cAAc,CAC5B,IAA8C,EAC9C,OAAiB,EACjB,aAAqB;IAErB,wDAAwD;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;IAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,sBAAsB;YACzB,OAAO,aAAa,CAAC;QACvB,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,cAAc,CAClC,IAAI,CAAC,WAAW,EAChB,OAAO,EACP,GAAG,aAAa,UAAU,CAC3B,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,CACb,8BAA8B,IAAI,yBAAyB,CAC5D,CAAC;YACJ,OAAO,QAAQ,CAAC;SACjB;QACD,KAAK,yBAAyB;YAC5B,OAAO,IAAA,+BAAe,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,KAAK,wBAAwB;YAC3B,OAAO,iBAAiB,cAAc,CACpC,IAAI,CAAC,cAAc,EACnB,OAAO,EACP,aAAa,CACd,GAAG,CAAC;QACP;YACE,MAAM,IAAI,KAAK,CAAC,0CAA0C,UAAU,EAAE,CAAC,CAAC;KAC3E;AACH,CAAC;AAtDD,wCAsDC","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  Nullable,\n} from 'react-native-tscodegen';\nimport {\n  AliasMap,\n  getAliasCppName,\n  getAnonymousAliasCppName,\n} from './AliasManaging';\n\nexport function translateField(\n  type: Nullable<NativeModuleBaseTypeAnnotation>,\n  aliases: AliasMap,\n  baseAliasName: string,\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 'std::string';\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<${translateField(\n          type.elementType,\n          aliases,\n          `${baseAliasName}_element`,\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(\n          `Unknown reserved function: ${name} in translateReturnType`,\n        );\n      return 'double';\n    }\n    case 'TypeAliasTypeAnnotation':\n      return getAliasCppName(type.name);\n    case 'NullableTypeAnnotation':\n      return `std::optional<${translateField(\n        type.typeAnnotation,\n        aliases,\n        baseAliasName,\n      )}>`;\n    default:\n      throw new Error(`Unhandled type in translateReturnType: ${returnType}`);\n  }\n}\n"]}
+{"version":3,"file":"ObjectTypes.js","sourceRoot":"","sources":["../../src/generators/ObjectTypes.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,YAAY,CAAC;;;AAQb,mDAIyB;AAEzB,SAAS,wBAAwB,CAC/B,IAAmE;IAEnE,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;IACnC,QAAQ,IAAI,CAAC,UAAU,EAAE;QACvB,KAAK,sBAAsB;YACzB,OAAO,aAAa,CAAC;QACvB,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,IAA8C,EAC9C,OAAiB,EACjB,aAAqB,EACrB,UAAoD;IAEpD,wDAAwD;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC;IAC7B,QAAQ,IAAI,CAAC,IAAI,EAAE;QACjB,KAAK,sBAAsB;YACzB,OAAO,aAAa,CAAC;QACvB,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,CACX,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,CACX,GAAG,CAAC;QACP,KAAK,iBAAiB,CAAC;QACvB,KAAK,qBAAqB;YACxB,OAAO,wBAAwB,CAAC,IAAI,CAAC,CAAC;QACxC;YACE,MAAM,IAAI,KAAK,CAAC,qBAAqB,UAAU,KAAK,UAAU,EAAE,CAAC,CAAC;KACrE;AACH,CAAC;AA1DD,gEA0DC;AAED,SAAgB,cAAc,CAC5B,IAA8C,EAC9C,OAAiB,EACjB,aAAqB;IAErB,OAAO,0BAA0B,CAC/B,IAAI,EACJ,OAAO,EACP,aAAa,EACb,gBAAgB,CACjB,CAAC;AACJ,CAAC;AAXD,wCAWC","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  Nullable,\n} from '@react-native/codegen/lib/CodegenSchema';\nimport {\n  AliasMap,\n  getAliasCppName,\n  getAnonymousAliasCppName,\n} from './AliasManaging';\n\nfunction translateUnionReturnType(\n  type: NativeModuleEnumDeclaration | NativeModuleUnionTypeAnnotation,\n): string {\n  const memberType = type.memberType;\n  switch (type.memberType) {\n    case 'StringTypeAnnotation':\n      return 'std::string';\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<NativeModuleBaseTypeAnnotation>,\n  aliases: AliasMap,\n  baseAliasName: string,\n  callerName: 'translateField' | 'translateReturnType',\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 'std::string';\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        )}>`;\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      )}>`;\n    case 'EnumDeclaration':\n    case 'UnionTypeAnnotation':\n      return translateUnionReturnType(type);\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): string {\n  return translateFieldOrReturnType(\n    type,\n    aliases,\n    baseAliasName,\n    'translateField',\n  );\n}\n"]}

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

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  * @format
  */
-import type { NamedShape, NativeModuleParamTypeAnnotation, Nullable } from 'react-native-tscodegen';
+import type { NamedShape, NativeModuleParamTypeAnnotation, Nullable } from '@react-native/codegen/lib/CodegenSchema';
 import { AliasMap } from './AliasManaging';
 type NativeModuleParamShape = NamedShape<Nullable<NativeModuleParamTypeAnnotation>>;
 export declare function translateSpecArgs(params: ReadonlyArray<NativeModuleParamShape>, aliases: AliasMap, baseAliasName: string): string[];

package/lib-commonjs/generators/ParamTypes.js

@@ -17,6 +17,50 @@ function decorateType(type, target) {
             return type;
     }
 }
+function translateUnionReturnType(type, target) {
+    const memberType = type.memberType;
+    switch (type.memberType) {
+        case 'StringTypeAnnotation':
+            return 'std::string';
+        case 'NumberTypeAnnotation':
+            return 'double';
+        case 'ObjectTypeAnnotation':
+            return decorateType('::React::JSValue', target);
+        default:
+            throw new Error(`Unknown enum/union member type in translateReturnType: ${memberType}`);
+    }
+}
+function translateFunction(param, aliases, baseAliasName, target) {
+    // TODO: type.returnTypeAnnotation
+    switch (target) {
+        case 'spec':
+            return `Callback<${param.params
+                .map((p) => translateSpecFunctionParam(p, aliases, `${baseAliasName}_${p.name}`))
+                .join(', ')}>`;
+        case 'template':
+            return `std::function<void(${param.params
+                .map((p) => translateCallbackParam(p, aliases, `${baseAliasName}_${p.name}`))
+                .join(', ')})>`;
+        default:
+            return `std::function<void(${param.params
+                .map((p) => translateCallbackParam(p, aliases, `${baseAliasName}_${p.name}`))
+                .join(', ')})> const &`;
+    }
+}
+function translateArray(param, aliases, baseAliasName, target) {
+    if (param.elementType) {
+        switch (target) {
+            case 'spec':
+            case 'template':
+                return `std::vector<${translateNullableParamType(param.elementType, aliases, `${baseAliasName}_element`, 'template', 'template')}>`;
+            default:
+                return `std::vector<${translateNullableParamType(param.elementType, aliases, `${baseAliasName}_element`, 'template', 'template')}> const &`;
+        }
+    }
+    else {
+        return decorateType('::React::JSValueArray', target);
+    }
+}
 function translateParam(param, aliases, baseAliasName, target) {
     // avoid: Property 'type' does not exist on type 'never'
     const paramType = param.type;
@@ -31,36 +75,10 @@ function translateParam(param, aliases, baseAliasName, target) {
             return 'int';
         case 'BooleanTypeAnnotation':
             return 'bool';
-        case 'FunctionTypeAnnotation': {
-            // TODO: type.returnTypeAnnotation
-            switch (target) {
-                case 'spec':
-                    return `Callback<${param.params
-                        .map((p) => translateSpecFunctionParam(p, aliases, `${baseAliasName}_${p.name}`))
-                        .join(', ')}>`;
-                case 'template':
-                    return `std::function<void(${param.params
-                        .map((p) => translateCallbackParam(p, aliases, `${baseAliasName}_${p.name}`))
-                        .join(', ')})>`;
-                default:
-                    return `std::function<void(${param.params
-                        .map((p) => translateCallbackParam(p, aliases, `${baseAliasName}_${p.name}`))
-                        .join(', ')})> const &`;
-            }
-        }
+        case 'FunctionTypeAnnotation':
+            return translateFunction(param, aliases, baseAliasName, target);
         case 'ArrayTypeAnnotation':
-            if (param.elementType) {
-                switch (target) {
-                    case 'spec':
-                    case 'template':
-                        return `std::vector<${translateNullableParamType(param.elementType, aliases, `${baseAliasName}_element`, 'template', 'template')}>`;
-                    default:
-                        return `std::vector<${translateNullableParamType(param.elementType, aliases, `${baseAliasName}_element`, 'template', 'template')}> const &`;
-                }
-            }
-            else {
-                return decorateType('::React::JSValueArray', target);
-            }
+            return translateArray(param, aliases, baseAliasName, target);
         case 'GenericObjectTypeAnnotation':
             return decorateType('::React::JSValue', target);
         case 'ObjectTypeAnnotation':
@@ -76,6 +94,9 @@ function translateParam(param, aliases, baseAliasName, target) {
         }
         case 'TypeAliasTypeAnnotation':
             return decorateType((0, AliasManaging_1.getAliasCppName)(param.name), target);
+        case 'EnumDeclaration':
+        case 'UnionTypeAnnotation':
+            return translateUnionReturnType(param, target);
         default:
             throw new Error(`Unhandled type in translateParam: ${paramType}`);
     }