react-native-windows 0.70.8 → 0.71.0-preview.1

package/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.Module.cs

@@ -38,6 +38,11 @@ namespace Microsoft.ReactNative.Managed.CodeGen
           addMemberStatements.Add(AddConstantProvider(constantProvider));
         }
 
+        foreach (var getConstants in module.GetConstants)
+        {
+          addMemberStatements.Add(AddGetConstants(getConstants));
+        }
+
         foreach (var method in module.Methods)
         {
           addMemberStatements.Add(AddMethod(method));
@@ -162,62 +167,98 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       );
     }
 
+    internal StatementSyntax AddGetConstants(ReactGetConstants getConstants)
+    {
+      // generates:
+      //  moduleBuilder.AddConstantProvider( (IJSValueWriter writer) => {
+      //     var provider = new ReactConstantProvider(writer);
+      //     var constants = module.GetConstantsName();
+      //     provider.WriteProperties(constants);
+      //  });
+
+      return InvocationStatement(
+        MemberAccessExpression(ReactNativeNames.ModuleBuilder, ReactNativeNames.AddConstantProvider),
+
+        ParenthesizedLambdaExpression(
+          parameterList: ParameterList(
+              Parameter(ReactNativeNames.WriterLocalName)
+                .WithType(ReactTypes.IJSValueWriter.ToTypeSyntax())),
+          block: Block(
+            LocalDeclarationStatement(
+              ReactTypes.ReactConstantProvider,
+              ReactNativeNames.ProviderLocalName,
+              ObjectCreationExpression(
+                ReactTypes.ReactConstantProvider,
+                IdentifierName(ReactNativeNames.WriterLocalName))),
+            LocalDeclarationStatement(
+              ReactNativeNames.ConstantsLocalName,
+              InvocationExpression(
+                MemberAccessExpression(ReactNativeNames.Module, Identifier(getConstants.Method.Name)))),
+            InvocationStatement(
+              MemberAccessExpression(ReactNativeNames.ProviderLocalName, ReactNativeNames.WritePropertiesMethodName),
+              IdentifierName(ReactNativeNames.ConstantsLocalName))),
+          expressionBody: null
+        )
+      );
+    }
+
     internal StatementSyntax AddMethod(ReactMethod method)
     {
       var statements = new List<StatementSyntax>();
-
       var parameters = method.Method.Parameters;
 
-      var readArgsArguments = new List<ArgumentSyntax>(parameters.Length);
-      readArgsArguments.Add(Argument(IdentifierName(ReactNativeNames.ReaderLocalName)));
       var args = new List<ExpressionSyntax>(parameters.Length);
-
-      // generates:
-      //   (out ArgType0 arg0, out ArgType1 arg1, ...);
-      // as well as
-      //   (arg0, arg1, ... )
-      for (int i = 0; i < method.EffectiveParameters.Count; i++)
+      List<ArgumentSyntax>? readArgsArguments = null;
+      if (method.EffectiveParameters.Count > 0)
       {
-        var param = method.EffectiveParameters[i];
-        var variableName = "arg" + i.ToString(CultureInfo.InvariantCulture);
-
-        readArgsArguments.Add(Argument(
-          nameColon: null,
-          refKindKeyword: Token(SyntaxKind.OutKeyword),
-          expression: DeclarationExpression(
-            param.Type.ToTypeSyntax(),
-            SingleVariableDesignation(
-              Identifier(variableName))
-          )
-        ));
+        readArgsArguments = new List<ArgumentSyntax>(method.EffectiveParameters.Count + 1) {
+          Argument(IdentifierName(ReactNativeNames.ReaderLocalName))
+        };
+
+        // generates output arguments:
+        //   (..., out ArgType0 arg0, out ArgType1 arg1, ...);
+        readArgsArguments.AddRange(method.EffectiveParameters.Select((param, i) => Argument(
+            nameColon: null,
+            refKindKeyword: Token(SyntaxKind.OutKeyword),
+            expression: DeclarationExpression(
+              param.Type.ToTypeSyntax(),
+              SingleVariableDesignation(ReactNativeNames.ArgLocalNames[i])))));
 
-        args.Add(IdentifierName(variableName));
+        // generates:
+        //   (arg0, arg1, ... )
+        args.AddRange(method.EffectiveParameters.Select((_, i) => IdentifierName(ReactNativeNames.ArgLocalNames[i])));
       }
 
       switch (method.ReturnStyle)
       {
         case ReactMethod.MethodReturnStyle.Promise:
           args.Add(ObjectCreationExpression(
-            ReactTypes.ReactPromise.Construct(method.EffectiveReturnType),
+            SymbolEqualityComparer.Default.Equals(method.EffectiveReturnType, ReactTypes.SystemVoid)
+              ? ReactTypes.ReactPromiseOfVoid
+              : ReactTypes.ReactPromise.Construct(method.EffectiveReturnType),
             IdentifierName(ReactNativeNames.WriterLocalName),
             IdentifierName(ReactNativeNames.ResolveLocalName),
             IdentifierName(ReactNativeNames.RejectLocalName)
           ));
           break;
         case ReactMethod.MethodReturnStyle.Callback:
-          args.Add(GeneratePromiseInvocation(isReject: false));
+          args.Add(GenerateCallbackInvocation(ReactNativeNames.ResolveLocalName, method.ResolveParameterCount));
           break;
         case ReactMethod.MethodReturnStyle.TwoCallbacks:
-          args.Add(GeneratePromiseInvocation(isReject: false));
-          args.Add(GeneratePromiseInvocation(isReject: true));
+          args.Add(GenerateCallbackInvocation(ReactNativeNames.ResolveLocalName, method.ResolveParameterCount));
+          args.Add(GenerateCallbackInvocation(ReactNativeNames.RejectLocalName, method.RejectParameterCount));
           break;
       }
 
-      // generates:
-      //  reader.ReadArgs( ... )
-      statements.Add(InvocationStatement(
-        MemberAccessExpression(ReactTypes.JSValueReader, ReactNativeNames.ReadArgsMethodName),
-        readArgsArguments));
+      // Generate reader call only if we have argumentes to read.
+      if (readArgsArguments != null)
+      {
+        // generates:
+        //  reader.ReadArgs( ... )
+        statements.Add(InvocationStatement(
+          MemberAccessExpression(ReactTypes.JSValueReader, ReactNativeNames.ReadArgsMethodName),
+          readArgsArguments));
+      }
 
       var methodCall = InvocationStatement(
         MemberAccessExpression(ReactNativeNames.Module, Identifier(method.Method.Name)),
@@ -255,7 +296,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
         else
         {
           if (method.IsSynchronous)
-            {
+          {
             // generate:
             //   writer.WriteValue(result);
             var writeValue = InvocationExpression(
@@ -349,26 +390,22 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       }
     }
 
-    internal ExpressionSyntax GeneratePromiseInvocation(bool isReject)
+    internal ExpressionSyntax GenerateCallbackInvocation(SyntaxToken callbackName, int parameterCount)
     {
       // generates:
-      //    value1 => resolve|reject(JSValueWriter.WriteArgs(writer, value1)
+      //    (value0, value1, ...) => resolve|reject(JSValueWriter.WriteArgs(writer, value0, value1))
       return ParenthesizedLambdaExpression(
         parameterList: ParameterList(
-          SeparatedList<ParameterSyntax>(
-            new[]
-            {
-              Parameter(ReactNativeNames.ValueLocalName)
-            })),
+          SeparatedList(
+            ReactNativeNames.ValueLocalNames.Take(parameterCount).Select(name => Parameter(name)).ToArray())),
         block: null,
         expressionBody: InvocationExpression(
-          IdentifierName(isReject ? ReactNativeNames.RejectLocalName : ReactNativeNames.ResolveLocalName),
+          IdentifierName(callbackName),
           InvocationExpression(
             MemberAccessExpression(ReactTypes.JSValueWriter, ReactNativeNames.WriteArgsMethodName),
-            IdentifierName(ReactNativeNames.WriterLocalName),
-            IdentifierName(ReactNativeNames.ValueLocalName))
-          )
-        );
+            Enumerable.Concat(
+              Enumerable.Repeat(IdentifierName(ReactNativeNames.WriterLocalName), 1),
+              ReactNativeNames.ValueLocalNames.Take(parameterCount).Select(name => IdentifierName(name))))));
     }
 
     internal StatementSyntax AddEvent(ReactEvent evnt)

package/Microsoft.ReactNative.Managed.CodeGen/CodeGenerator.Serializers.cs

@@ -4,6 +4,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.ContractsLight;
 using System.Linq;
 using static Microsoft.CodeAnalysis.CSharp.SyntaxFactory;
@@ -123,7 +124,6 @@ namespace Microsoft.ReactNative.Managed.CodeGen
 
     internal MemberDeclarationSyntax CreateObjectSerializers(IEnumerable<INamedTypeSymbol> symbols)
     {
-
       var registrationCalls = new List<StatementSyntax>();
 
       foreach (var symbol in symbols)
@@ -152,6 +152,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
           }
 
           string name;
+          string jsonPropertyName;
           ISymbol type;
           bool emitRead;
           bool emitWrite;
@@ -160,6 +161,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
             if (member is IFieldSymbol field)
             {
               name = field.Name;
+              jsonPropertyName = TryGetJSNameFromAttribute(field, out var jsName) ? jsName : name;
               type = field.Type;
               emitRead = !field.IsConst && !field.IsReadOnly;
               emitWrite = true;
@@ -168,6 +170,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
               (member is IPropertySymbol property)
             {
               name = property.Name;
+              jsonPropertyName = TryGetJSNameFromAttribute(property, out var jsName) ? jsName : name;
               type = property.Type;
               emitRead = !property.IsReadOnly;
               emitWrite = !property.IsWriteOnly;
@@ -179,7 +182,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
 
             if (emitRead)
             {
-              readOperations.Add(ReadSwitch(name, type));
+              readOperations.Add(ReadSwitch(name, jsonPropertyName, type));
             }
 
             if (emitWrite)
@@ -192,7 +195,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
                       ReactTypes.JSValueWriter.ToTypeSyntax(),
                       GenericName(ReactNativeNames.WriteObjectPropertyMethodName, type.ToTypeSyntax())),
                     IdentifierName(ReactNativeNames.WriterLocalName),
-                    LiteralExpression(name),
+                    LiteralExpression(jsonPropertyName),
                     MemberAccessExpression(ReactNativeNames.ValueLocalName, Identifier(name)))
                 )
               );
@@ -281,11 +284,21 @@ namespace Microsoft.ReactNative.Managed.CodeGen
         //     writer.WriteNull();
         //   }
         // }
-        registrationCalls.Add(
-          CodeGenWrite(
-            symbol,
-            statements: new[]
-            {
+        if (symbol.TypeKind == TypeKind.Struct)
+        {
+          registrationCalls.Add(
+            CodeGenWrite(
+              symbol,
+              statements: writeOperations.ToArray())
+          );
+        }
+        else
+        {
+          registrationCalls.Add(
+            CodeGenWrite(
+              symbol,
+              statements: new[]
+              {
               IfStatement(
                 BinaryExpression(
                   SyntaxKind.NotEqualsExpression,
@@ -302,8 +315,9 @@ namespace Microsoft.ReactNative.Managed.CodeGen
                   )
                 )
               )
-            })
-        );
+              })
+          );
+        }
       }
 
       return MethodDeclaration(
@@ -322,11 +336,36 @@ namespace Microsoft.ReactNative.Managed.CodeGen
              symbol.DeclaredAccessibility == Accessibility.Internal;
     }
 
-    private SwitchSectionSyntax ReadSwitch(string fieldName, ISymbol fieldType)
+    private bool TryGetJSNameFromAttribute(ISymbol member, [NotNullWhen(returnValue: true)] out string? jsName)
+    {
+      jsName = null;
+      AttributeData? attr = member.GetAttributes().FirstOrDefault(
+        a => a.AttributeClass != null
+          && a.AttributeClass.Equals(ReactTypes.ReactPropertyAttribute, SymbolEqualityComparer.Default));
+      if (attr != null)
+      {
+        if (attr.ConstructorArguments.Length > 0)
+        {
+          jsName = attr.ConstructorArguments[0].Value as string;
+        }
+
+        foreach (var namedArgument in attr.NamedArguments)
+        {
+          if (namedArgument.Key == nameof(ReactPropertyAttribute.PropertyName))
+          {
+            jsName = namedArgument.Value.Value as string;
+          }
+        }
+      }
+
+      return jsName != null;
+    }
+
+    private SwitchSectionSyntax ReadSwitch(string fieldName, string jsonPropertyName, ISymbol fieldType)
     {
       return SwitchSection(
         new SyntaxList<SwitchLabelSyntax>(
-          CaseSwitchLabel(LiteralExpression(fieldName))
+          CaseSwitchLabel(LiteralExpression(jsonPropertyName))
         ),
         new SyntaxList<StatementSyntax>(
           new StatementSyntax[]
@@ -360,13 +399,13 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     {
       Contract.Requires(expression != null ^ statements != null, "Only one of the args can be null.");
       // Generates:
-      //   JSValueReaderCodeGen<SymbolType>.ReadValue = (reader, out value) => value = ...readExpression...;
+      //   JSValueReaderOf<SymbolType>.ReadValue = (reader, out value) => value = ...readExpression...;
       return
         ExpressionStatement(
           AssignmentExpression(
             SyntaxKind.SimpleAssignmentExpression,
             MemberAccessExpression(
-              ReactTypes.JSValueReaderCodeGen.Construct(symbol),
+              ReactTypes.JSValueReaderOf.Construct(symbol),
               ReactNativeNames.ReadValueMethodName),
             ParenthesizedLambdaExpression(
               parameterList: ParameterList(
@@ -399,13 +438,13 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       Contract.Requires(expression != null ^ statements != null, "Only one of the args can be null.");
 
       // Generates:
-      //   JSValueWriterCodeGen<SymbolType>.WriteValue = (writer, value) =>  ...writeExpression...;
+      //   JSValueWriterOf<SymbolType>.WriteValue = (writer, value) =>  ...writeExpression...;
       return
         ExpressionStatement(
           AssignmentExpression(
             SyntaxKind.SimpleAssignmentExpression,
             MemberAccessExpression(
-              ReactTypes.JSValueWriterCodeGen.Construct(symbol),
+              ReactTypes.JSValueWriterOf.Construct(symbol),
               ReactNativeNames.WriteValueMethodName),
             ParenthesizedLambdaExpression(
               parameterList: ParameterList(
@@ -443,7 +482,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
             AssignmentExpression(
               SyntaxKind.SimpleAssignmentExpression,
               MemberAccessExpression(
-                ReactTypes.JSValueReaderCodeGen.Construct(type),
+                ReactTypes.JSValueReaderOf.Construct(type),
                 ReactNativeNames.ReadValueMethodName),
               MemberAccessExpression(
                 method.ContainingType,
@@ -485,7 +524,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
             AssignmentExpression(
               SyntaxKind.SimpleAssignmentExpression,
               MemberAccessExpression(
-                ReactTypes.JSValueWriterCodeGen.Construct(type),
+                ReactTypes.JSValueWriterOf.Construct(type),
                 ReactNativeNames.WriteValueMethodName),
               MemberAccessExpression(
                 method.ContainingType,

package/Microsoft.ReactNative.Managed.CodeGen/DiagnosticDescriptors.cs

@@ -35,7 +35,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1002"),
       category: ReactNativeNames.ErrorCategory,
       title: "Unexpected attribute arguments",
-      messageFormat: "Unexpected named attribute '{0}' encountered on attribute '{1}'. Did you mix versions of React Native Windows and the Sdk?",
+      messageFormat: "Unexpected named attribute '{0}' encountered on attribute '{1}'. You may have mixed versions of React Native Windows and the Sdk.",
       defaultSeverity: DiagnosticSeverity.Error,
       isEnabledByDefault: true);
 
@@ -51,7 +51,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1003"),
       category: ReactNativeNames.ErrorCategory,
       title: "Cannot serialie type",
-      messageFormat: "Types that are serialized for React bust have a default parameter-less constructor.",
+      messageFormat: "Types that are serialized for React bust have a default parameter-less constructor",
       defaultSeverity: DiagnosticSeverity.Error,
       isEnabledByDefault: true);
 
@@ -123,7 +123,7 @@ namespace Microsoft.ReactNative.Managed.CodeGen
       id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1012"),
       category: ReactNativeNames.ErrorCategory,
       title: "ReactModule ConstantProviders must have one parameter of type ReactContext",
-      messageFormat: "ConstantProviders of ReactModules must have one parameter of type '{0}'. Encountered '{1}' arguments on constantProvider '{2}' of module '{3}'.",
+      messageFormat: "ConstantProviders of ReactModules must have one parameter of type '{0}'. Encountered '{1}' parameters on constantProvider '{2}' of module '{3}'.",
       defaultSeverity: DiagnosticSeverity.Error,
       isEnabledByDefault: true);
 
@@ -146,9 +146,41 @@ namespace Microsoft.ReactNative.Managed.CodeGen
     public static readonly DiagnosticDescriptor MethodShouldNotReturnTaskWhenSynchronous = new DiagnosticDescriptor(
       id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1015"),
       category: ReactNativeNames.ErrorCategory,
-      title: "ReactModule Methods should not return ",
+      title: "ReactModule Methods should not return",
       messageFormat: "Methods of ReactModules should not return a Task when they are synchronous. Change the attribute from '[ReactSyncMethod]' to '[ReactMethod]' for method '{0}' of module '{1}'.",
       defaultSeverity: DiagnosticSeverity.Error,
       isEnabledByDefault: true);
+
+    public static readonly DiagnosticDescriptor GetConstantsMustBePublicOrInternal = new DiagnosticDescriptor(
+      id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1016"),
+      category: ReactNativeNames.ErrorCategory,
+      title: "ReactModule GetConstants method must be public or internal",
+      messageFormat: "GetConstants of ReactModules must be public or internal. Visibility of GetConstants '{0}' of module '{1}' is '{2}'.",
+      defaultSeverity: DiagnosticSeverity.Error,
+      isEnabledByDefault: true);
+
+    public static readonly DiagnosticDescriptor GetConstantsMustNotReturnVoid = new DiagnosticDescriptor(
+      id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1017"),
+      category: ReactNativeNames.ErrorCategory,
+      title: "ReactModule GetConstants must not return void",
+      messageFormat: "GetConstants of ReactModules must not return void. Encountered type '{0}' as return type of GetConstants '{1}' of module '{2}'.",
+      defaultSeverity: DiagnosticSeverity.Error,
+      isEnabledByDefault: true);
+
+    public static readonly DiagnosticDescriptor GetConstantsMustReturnStructOrClass = new DiagnosticDescriptor(
+      id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1018"),
+      category: ReactNativeNames.ErrorCategory,
+      title: "ReactModule GetConstants must return struct or class instance",
+      messageFormat: "GetConstants of ReactModules must return struct or class instance. Encountered type '{0}' as return type of GetConstants '{1}' of module '{2}'.",
+      defaultSeverity: DiagnosticSeverity.Error,
+      isEnabledByDefault: true);
+
+    public static readonly DiagnosticDescriptor GetConstantsMustNotHaveParameters = new DiagnosticDescriptor(
+      id: Invariant($"{ReactNativeNames.ErrorCodePrefix}1019"),
+      category: ReactNativeNames.ErrorCategory,
+      title: "ReactModule GetConstants must not have parameters",
+      messageFormat: "GetConstants of ReactModules must not have parameters. Encountered '{0}' parameters on GetConstants '{1}' of module '{2}'.",
+      defaultSeverity: DiagnosticSeverity.Error,
+      isEnabledByDefault: true);
   };
 }

package/Microsoft.ReactNative.Managed.CodeGen/Microsoft.ReactNative.Managed.CodeGen.csproj

@@ -3,8 +3,8 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
 
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <Platforms>x64;x86;ARM;ARM64</Platforms>
+    <TargetFramework>net6.0</TargetFramework>
+    <Platforms>x64;x86;ARM64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
 
     <Platform>x64</Platform>
@@ -26,9 +26,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Humanizer" Version="2.8.11" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.7.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.7.0" />
+    <PackageReference Include="Humanizer" Version="2.14.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.3.1" />
     <PackageReference Include="RuntimeContracts" Version="0.3.0" />
 
     <!-- 

package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactAssembly.cs

@@ -12,11 +12,11 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
 
     public ICollection<ReactModule> Modules { get; } = new List<ReactModule>();
 
-    public IDictionary<ITypeSymbol, IMethodSymbol> JSReaderFunctions { get; } = new Dictionary<ITypeSymbol, IMethodSymbol>();
+    public IDictionary<ITypeSymbol, IMethodSymbol> JSReaderFunctions { get; } = new Dictionary<ITypeSymbol, IMethodSymbol>(SymbolEqualityComparer.Default);
 
-    public IDictionary<ITypeSymbol, IMethodSymbol> JSWriterFunctions { get; } = new Dictionary<ITypeSymbol, IMethodSymbol>();
+    public IDictionary<ITypeSymbol, IMethodSymbol> JSWriterFunctions { get; } = new Dictionary<ITypeSymbol, IMethodSymbol>(SymbolEqualityComparer.Default);
 
-    public IDictionary<INamedTypeSymbol, TypeKind> SerializableTypes { get; } = new Dictionary<INamedTypeSymbol, TypeKind>();
+    public IDictionary<INamedTypeSymbol, TypeKind> SerializableTypes { get; } = new Dictionary<INamedTypeSymbol, TypeKind>(SymbolEqualityComparer.Default);
   }
 
 }

package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactGetConstants.cs

@@ -0,0 +1,17 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using Microsoft.CodeAnalysis;
+
+namespace Microsoft.ReactNative.Managed.CodeGen.Model
+{
+  public class ReactGetConstants
+  {
+    public IMethodSymbol Method { get; }
+
+    public ReactGetConstants(IMethodSymbol method)
+    {
+      Method = method;
+    }
+  }
+}

package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactMethod.cs

@@ -19,17 +19,26 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
 
     public ITypeSymbol EffectiveReturnType { get; }
 
+    public int ResolveParameterCount { get; }
+
+    public int RejectParameterCount { get; }
+
     public IReadOnlyList<IParameterSymbol> EffectiveParameters { get; }
 
-    public ReactMethod(IMethodSymbol method, string name, MethodReturnStyle returnStyle, ITypeSymbol effectiveReturnType, IReadOnlyList<IParameterSymbol> effectiveParameters, bool isSynchronous)
+    public ReactMethod(IMethodSymbol method, string name, MethodReturnStyle returnStyle,
+      ITypeSymbol effectiveReturnType, IReadOnlyList<IParameterSymbol> effectiveParameters,
+      bool isSynchronous, int resolveParameterCount, int rejectParameterCount)
     {
-      Contract.Requires(!(IsSynchronous && returnStyle == MethodReturnStyle.Task), "Task style methods are required to be asynchronous");
+      Contract.Requires(!(IsSynchronous && returnStyle == MethodReturnStyle.Task),
+        "Task style methods are required to be asynchronous");
       Method = method;
       Name = name;
       ReturnStyle = returnStyle;
       EffectiveReturnType = effectiveReturnType;
       EffectiveParameters = effectiveParameters;
       IsSynchronous = isSynchronous;
+      ResolveParameterCount = resolveParameterCount;
+      RejectParameterCount = rejectParameterCount;
     }
 
     public enum MethodReturnStyle

package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactModule.cs

@@ -20,6 +20,8 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
 
     public ICollection<ReactConstantProvider> ConstantProviders { get; } = new List<ReactConstantProvider>();
 
+    public ICollection<ReactGetConstants> GetConstants { get; } = new List<ReactGetConstants>();
+
     public ICollection<ReactMethod> Methods { get; } = new List<ReactMethod>();
 
     public ICollection<ReactFunction> Functions { get; } = new List<ReactFunction>();

package/Microsoft.ReactNative.Managed.CodeGen/Model/ReactTypes.cs

@@ -38,10 +38,11 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
         public INamedTypeSymbol JSValueReader { get; }
         public INamedTypeSymbol JSValueWriterGenerator { get; }
         public INamedTypeSymbol JSValueReaderGenerator { get; }
-        public INamedTypeSymbol JSValueWriterCodeGen { get; }
-        public INamedTypeSymbol JSValueReaderCodeGen { get; }
+        public INamedTypeSymbol JSValueWriterOf { get; }
+        public INamedTypeSymbol JSValueReaderOf { get; }
         public INamedTypeSymbol IReactPromise { get; }
         public INamedTypeSymbol ReactPromise { get; }
+        public INamedTypeSymbol ReactPromiseOfVoid { get; }
         public INamedTypeSymbol MethodReturnType { get; }
         public INamedTypeSymbol MethodResultCallback { get; }
         public INamedTypeSymbol ReactConstantProvider { get; }
@@ -49,10 +50,12 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
         public INamedTypeSymbol ReactInitializerAttribute { get; }
         public INamedTypeSymbol ReactConstantAttribute { get; }
         public INamedTypeSymbol ReactConstantProviderAttribute { get; }
+        public INamedTypeSymbol ReactGetConstantsAttribute { get; }
         public INamedTypeSymbol ReactMethodAttribute { get; }
         public INamedTypeSymbol ReactSyncMethodAttribute { get; }
         public INamedTypeSymbol ReactEventAttribute { get; }
         public INamedTypeSymbol ReactFunctionAttribute { get; }
+        public INamedTypeSymbol ReactPropertyAttribute { get; }
         public INamedTypeSymbol ReactTaskExtensions { get; }
 
         private readonly ICollection<Diagnostic> m_diagnostics = new List<Diagnostic>();
@@ -78,22 +81,25 @@ namespace Microsoft.ReactNative.Managed.CodeGen.Model
             ReactConstantProvider = FindReactNativeManagedType(compilation, "ReactConstantProvider");
             IReactPromise = FindReactNativeManagedType(compilation, "IReactPromise`1");
             ReactPromise = FindReactNativeManagedType(compilation, "ReactPromise`1");
+            ReactPromiseOfVoid = FindReactNativeManagedType(compilation, "ReactPromise");
             JSValue = FindReactNativeManagedType(compilation, "JSValue");
             JSValueWriter = FindReactNativeManagedType(compilation, "JSValueWriter");
             JSValueReader = FindReactNativeManagedType(compilation, "JSValueReader");
             JSValueWriterGenerator = FindReactNativeManagedType(compilation, "JSValueWriterGenerator");
             JSValueReaderGenerator = FindReactNativeManagedType(compilation, "JSValueReaderGenerator");
-            JSValueWriterCodeGen = FindReactNativeManagedType(compilation, "JSValueWriterCodeGen`1");
-            JSValueReaderCodeGen = FindReactNativeManagedType(compilation, "JSValueReaderCodeGen`1");
+            JSValueWriterOf = FindReactNativeManagedType(compilation, "JSValueWriterOf`1");
+            JSValueReaderOf = FindReactNativeManagedType(compilation, "JSValueReaderOf`1");
 
             ReactModuleAttribute = FindReactNativeManagedType(compilation, "ReactModuleAttribute");
             ReactInitializerAttribute = FindReactNativeManagedType(compilation, "ReactInitializerAttribute");
             ReactConstantAttribute = FindReactNativeManagedType(compilation, "ReactConstantAttribute");
             ReactConstantProviderAttribute = FindReactNativeManagedType(compilation, "ReactConstantProviderAttribute");
+            ReactGetConstantsAttribute = FindReactNativeManagedType(compilation, "ReactGetConstantsAttribute");
             ReactMethodAttribute = FindReactNativeManagedType(compilation, "ReactMethodAttribute");
             ReactSyncMethodAttribute = FindReactNativeManagedType(compilation, "ReactSyncMethodAttribute");
             ReactEventAttribute = FindReactNativeManagedType(compilation, "ReactEventAttribute");
             ReactFunctionAttribute = FindReactNativeManagedType(compilation, "ReactFunctionAttribute");
+            ReactPropertyAttribute = FindReactNativeManagedType(compilation, "ReactPropertyAttribute");
             ReactTaskExtensions = FindReactNativeManagedType(compilation, "ReactTaskExtensions");
         }
 

package/Microsoft.ReactNative.Managed.CodeGen/Properties/PublishProfiles/DeployAsTool-Debug.pubxml

@@ -6,7 +6,7 @@
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Debug</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PublishDir>$(OutDir)publish</PublishDir>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>

package/Microsoft.ReactNative.Managed.CodeGen/Properties/PublishProfiles/DeployAsTool-Release.pubxml

@@ -6,7 +6,7 @@
     <PublishProtocol>FileSystem</PublishProtocol>
     <Configuration>Release</Configuration>
     <Platform>x64</Platform>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <PublishDir>$(OutDir)publish</PublishDir>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>