[release/6.0-rc2] Update source-gen APIs according to review (#59243)

* Update source-gen APIs according to review

* Rename fast-path func name and add src-gen/JsonNode interop support

* Address review feedback

* Disable src-gen tests in browser target OS

Co-authored-by: Layomi Akinrinade <[email protected]>

Author: github-actions[bot]

src/libraries/System.Text.Json/Common/JsonSourceGenerationOptionsAttribute.cs

@@ -30,11 +30,6 @@ sealed class JsonSourceGenerationOptionsAttribute : JsonAttribute
         /// </summary>
         public bool IgnoreReadOnlyProperties { get; set; }
 
-        /// <summary>
-        /// Specifies whether to ignore custom converters provided at run time.
-        /// </summary>
-        public bool IgnoreRuntimeCustomConverters { get; set; }
-
         /// <summary>
         /// Specifies whether to include fields for serialization and deserialization.
         /// </summary>

src/libraries/System.Text.Json/gen/JsonSourceGenerator.Emitter.cs

@@ -25,9 +25,12 @@ private sealed class Parser
             private const string SystemTextJsonNamespace = "System.Text.Json";
             private const string JsonConverterAttributeFullName = "System.Text.Json.Serialization.JsonConverterAttribute";
             private const string JsonConverterFactoryFullName = "System.Text.Json.Serialization.JsonConverterFactory";
+            private const string JsonArrayFullName = "System.Text.Json.Nodes.JsonArray";
             private const string JsonElementFullName = "System.Text.Json.JsonElement";
             private const string JsonExtensionDataAttributeFullName = "System.Text.Json.Serialization.JsonExtensionDataAttribute";
+            private const string JsonNodeFullName = "System.Text.Json.Nodes.JsonNode";
             private const string JsonObjectFullName = "System.Text.Json.Nodes.JsonObject";
+            private const string JsonValueFullName = "System.Text.Json.Nodes.JsonValue";
             private const string JsonIgnoreAttributeFullName = "System.Text.Json.Serialization.JsonIgnoreAttribute";
             private const string JsonIgnoreConditionFullName = "System.Text.Json.Serialization.JsonIgnoreCondition";
             private const string JsonIncludeAttributeFullName = "System.Text.Json.Serialization.JsonIncludeAttribute";
@@ -80,8 +83,11 @@ private sealed class Parser
             private readonly Type? _guidType;
             private readonly Type? _uriType;
             private readonly Type? _versionType;
+            private readonly Type? _jsonArrayType;
             private readonly Type? _jsonElementType;
+            private readonly Type? _jsonNodeType;
             private readonly Type? _jsonObjectType;
+            private readonly Type? _jsonValueType;
 
             // Unsupported types
             private readonly Type _typeType;
@@ -193,8 +199,11 @@ public Parser(Compilation compilation, in JsonSourceGenerationContext sourceGene
                 _guidType = _metadataLoadContext.Resolve(typeof(Guid));
                 _uriType = _metadataLoadContext.Resolve(typeof(Uri));
                 _versionType = _metadataLoadContext.Resolve(typeof(Version));
+                _jsonArrayType = _metadataLoadContext.Resolve(JsonArrayFullName);
                 _jsonElementType = _metadataLoadContext.Resolve(JsonElementFullName);
+                _jsonNodeType = _metadataLoadContext.Resolve(JsonNodeFullName);
                 _jsonObjectType = _metadataLoadContext.Resolve(JsonObjectFullName);
+                _jsonValueType = _metadataLoadContext.Resolve(JsonValueFullName);
 
                 // Unsupported types.
                 _typeType = _metadataLoadContext.Resolve(typeof(Type));
@@ -565,14 +574,6 @@ private static bool TryGetClassDeclarationList(INamedTypeSymbol typeSymbol, [Not
                                 }
                             }
                             break;
-                        case nameof(JsonSourceGenerationOptionsAttribute.IgnoreRuntimeCustomConverters):
-                            {
-                                if (bool.TryParse(propertyValueStr, out bool value))
-                                {
-                                    options.IgnoreRuntimeCustomConverters = value;
-                                }
-                            }
-                            break;
                         case nameof(JsonSourceGenerationOptionsAttribute.IncludeFields):
                             {
                                 if (bool.TryParse(propertyValueStr, out bool value))
@@ -640,7 +641,7 @@ private TypeGenerationSpec GetOrAddTypeGenerationSpec(Type type, JsonSourceGener
                 string? converterInstatiationLogic = null;
                 bool implementsIJsonOnSerialized = false;
                 bool implementsIJsonOnSerializing = false;
-                bool hasEncounteredInitOnlyProperties = false;
+                bool hasInitOnlyProperties = false;
                 bool hasTypeFactoryConverter = false;
                 bool hasPropertyFactoryConverters = false;
 
@@ -972,10 +973,10 @@ void CacheMemberHelper()
                                     _implicitlyRegisteredTypes.Add(dataExtensionPropGenSpec);
                                 }
 
-                                if (!hasEncounteredInitOnlyProperties && spec.CanUseSetter && spec.IsInitOnlySetter)
+                                if (!hasInitOnlyProperties && spec.CanUseSetter && spec.IsInitOnlySetter)
                                 {
                                     _sourceGenerationContext.ReportDiagnostic(Diagnostic.Create(InitOnlyPropertyDeserializationNotSupported, Location.None, new string[] { type.Name }));
-                                    hasEncounteredInitOnlyProperties = true;
+                                    hasInitOnlyProperties = true;
                                 }
 
                                 if (spec.HasJsonInclude && (!spec.CanUseGetter || !spec.CanUseSetter || !spec.IsPublic))
@@ -1454,8 +1455,11 @@ private void PopulateKnownTypes()
                 AddTypeIfNotNull(_knownTypes, _guidType);
                 AddTypeIfNotNull(_knownTypes, _uriType);
                 AddTypeIfNotNull(_knownTypes, _versionType);
+                AddTypeIfNotNull(_knownTypes, _jsonArrayType);
                 AddTypeIfNotNull(_knownTypes, _jsonElementType);
+                AddTypeIfNotNull(_knownTypes, _jsonNodeType);
                 AddTypeIfNotNull(_knownTypes, _jsonObjectType);
+                AddTypeIfNotNull(_knownTypes, _jsonValueType);
 
                 _knownUnsupportedTypes.Add(_typeType);
                 _knownUnsupportedTypes.Add(_serializationInfoType);

src/libraries/System.Text.Json/gen/JsonSourceGenerator.Parser.cs

@@ -72,15 +72,6 @@ internal class TypeGenerationSpec
         public bool HasPropertyFactoryConverters { get; private set; }
         public bool HasTypeFactoryConverter { get; private set; }
 
-        public string FastPathSerializeMethodName
-        {
-            get
-            {
-                Debug.Assert(GenerateSerializationLogic);
-                return $"{TypeInfoPropertyName}Serialize";
-            }
-        }
-
         public string? ImmutableCollectionBuilderName
         {
             get