@react-native-windows/codegen 0.71.5 → 0.71.7

package/src/generators/ValidateMethods.ts

@@ -12,6 +12,7 @@ import type {
   NativeModuleSchema,
 } from 'react-native-tscodegen';
 import {AliasMap} from './AliasManaging';
+import type {CppCodegenOptions} from './ObjectTypes';
 import {translateArgs, translateSpecArgs} from './ParamTypes';
 import {translateImplReturnType, translateSpecReturnType} from './ReturnTypes';
 
@@ -27,8 +28,9 @@ function getPossibleMethodSignatures(
   funcType: NativeModuleFunctionTypeAnnotation,
   aliases: AliasMap,
   baseAliasName: string,
+  options: CppCodegenOptions,
 ): string[] {
-  const args = translateArgs(funcType.params, aliases, baseAliasName);
+  const args = translateArgs(funcType.params, aliases, baseAliasName, options);
   if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
     if (funcType.returnTypeAnnotation.elementType) {
       args.push(
@@ -36,6 +38,7 @@ function getPossibleMethodSignatures(
           funcType.returnTypeAnnotation.elementType,
           aliases,
           baseAliasName,
+          options,
         )}> &&result`,
       );
     } else {
@@ -50,6 +53,7 @@ function getPossibleMethodSignatures(
     funcType.returnTypeAnnotation,
     aliases,
     baseAliasName,
+    options,
   )} ${prop.name}(${args.join(', ')}) noexcept { /* implementation */ }`;
 
   const staticsig = `REACT_${isMethodSync(funcType) ? 'SYNC_' : ''}METHOD(${
@@ -58,6 +62,7 @@ function getPossibleMethodSignatures(
     funcType.returnTypeAnnotation,
     aliases,
     baseAliasName,
+    options,
   )} ${prop.name}(${args.join(', ')}) noexcept { /* implementation */ }`;
 
   return [sig, staticsig];
@@ -68,8 +73,15 @@ function translatePossibleMethodSignatures(
   funcType: NativeModuleFunctionTypeAnnotation,
   aliases: AliasMap,
   baseAliasName: string,
+  options: CppCodegenOptions,
 ): string {
-  return getPossibleMethodSignatures(prop, funcType, aliases, baseAliasName)
+  return getPossibleMethodSignatures(
+    prop,
+    funcType,
+    aliases,
+    baseAliasName,
+    options,
+  )
     .map(sig => `"    ${sig}\\n"`)
     .join('\n          ');
 }
@@ -78,6 +90,7 @@ function renderProperties(
   properties: ReadonlyArray<NativeModulePropertyShape>,
   aliases: AliasMap,
   tuple: boolean,
+  options: CppCodegenOptions,
 ): string {
   // TODO: generate code for constants
   return properties
@@ -95,12 +108,14 @@ function renderProperties(
         funcType.params,
         aliases,
         propAliasName,
+        options,
       );
 
       const translatedReturnParam = translateSpecReturnType(
         funcType.returnTypeAnnotation,
         aliases,
         propAliasName,
+        options,
       );
 
       if (funcType.returnTypeAnnotation.type === 'PromiseTypeAnnotation') {
@@ -110,6 +125,7 @@ function renderProperties(
               funcType.returnTypeAnnotation.elementType,
               aliases,
               propAliasName,
+              options,
             )}>`,
           );
         } else {
@@ -132,6 +148,7 @@ function renderProperties(
             funcType,
             aliases,
             propAliasName,
+            options,
           )});`;
       }
     })
@@ -141,9 +158,20 @@ function renderProperties(
 export function generateValidateMethods(
   nativeModule: NativeModuleSchema,
   aliases: AliasMap,
+  options: CppCodegenOptions,
 ): [string, string] {
   const properties = nativeModule.spec.properties;
-  const traversedProperties = renderProperties(properties, aliases, false);
-  const traversedPropertyTuples = renderProperties(properties, aliases, true);
+  const traversedProperties = renderProperties(
+    properties,
+    aliases,
+    false,
+    options,
+  );
+  const traversedPropertyTuples = renderProperties(
+    properties,
+    aliases,
+    true,
+    options,
+  );
   return [traversedPropertyTuples, traversedProperties];
 }

package/src/index.ts

@@ -8,6 +8,7 @@
 import path from 'path';
 import fs from '@react-native-windows/fs';
 import globby from 'globby';
+import type {CppStringTypes} from './generators/GenerateNM2';
 import {createNM2Generator} from './generators/GenerateNM2';
 import {
   generateTypeScript,
@@ -15,7 +16,9 @@ import {
 } from './generators/GenerateTypeScript';
 import type {SchemaType} from 'react-native-tscodegen';
 
-// Load react-native-codegen from react-native
+export type {CppStringTypes} from './generators/GenerateNM2';
+
+// Load @react-native/codegen from react-native
 const rnPath = path.dirname(require.resolve('react-native/package.json'));
 const rncodegenPath = path.dirname(
   require.resolve('react-native-codegen/package.json', {paths: [rnPath]}),
@@ -31,15 +34,20 @@ const schemaValidator = require(path.resolve(
   'lib/SchemaValidator',
 ));
 
-interface Options {
+export interface SharedOptions {
   libraryName: string;
   methodOnly: boolean;
   modulesCxx: boolean;
-  moduleSpecName: string;
   modulesTypeScriptTypes: boolean;
   modulesWindows: boolean;
   namespace: string;
   outputDirectory: string;
+  cppStringType: CppStringTypes;
+  separateDataTypes: boolean;
+}
+
+interface Options extends SharedOptions {
+  moduleSpecName: string;
   schema: SchemaType;
 }
 
@@ -183,11 +191,13 @@ export function generate(
     libraryName,
     methodOnly,
     modulesCxx,
-    moduleSpecName,
     modulesTypeScriptTypes,
     modulesWindows,
     namespace,
     outputDirectory,
+    cppStringType,
+    separateDataTypes,
+    moduleSpecName,
     schema,
   }: Options,
   {/*generators,*/ test}: Config,
@@ -210,6 +220,8 @@ export function generate(
   const generateNM2 = createNM2Generator({
     methodOnly,
     namespace,
+    cppStringType,
+    separateDataTypes,
   });
 
   const generateJsiModuleH = require(path.resolve(
@@ -315,18 +327,11 @@ export function generate(
   return writeMapToFiles(generatedFiles, outputDirectory);
 }
 
-export type CodeGenOptions = {
+export interface CodeGenOptions extends SharedOptions {
   file?: string;
   files?: string[];
-  libraryName: string;
-  methodOnly: boolean;
-  modulesCxx: boolean;
-  modulesTypeScriptTypes: boolean;
-  modulesWindows: boolean;
-  namespace: string;
-  outputDirectory: string;
   test: boolean;
-};
+}
 
 export function runCodeGen(options: CodeGenOptions): boolean {
   if (!options.file && !options.files)
@@ -345,17 +350,21 @@ export function runCodeGen(options: CodeGenOptions): boolean {
     modulesWindows,
     namespace,
     outputDirectory,
+    cppStringType,
+    separateDataTypes,
   } = options;
   return generate(
     {
       libraryName,
       methodOnly,
       modulesCxx,
-      moduleSpecName,
       modulesTypeScriptTypes,
       modulesWindows,
       namespace,
       outputDirectory,
+      cppStringType,
+      separateDataTypes,
+      moduleSpecName,
       schema,
     },
     {generators: [], test: options.test},