Fix external metadata

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/InputExternalTypeMetadataConverter.cs

@@ -9,38 +9,35 @@ namespace Microsoft.TypeSpec.Generator.Input
 {
     internal class InputExternalTypeMetadataConverter : JsonConverter<InputExternalTypeMetadata>
     {
-        private readonly TypeSpecReferenceHandler _referenceHandler;
-
-        public InputExternalTypeMetadataConverter(TypeSpecReferenceHandler referenceHandler)
-        {
-            _referenceHandler = referenceHandler;
-        }
-
         public override InputExternalTypeMetadata? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType == JsonTokenType.Null)
             {
                 return null;
             }
 
-            return reader.ReadReferenceAndResolve<InputExternalTypeMetadata>(_referenceHandler.CurrentResolver) ?? CreateInputExternalTypeMetadata(ref reader, null, options, _referenceHandler.CurrentResolver);
+            return CreateInputExternalTypeMetadata(ref reader);
         }
 
         public override void Write(Utf8JsonWriter writer, InputExternalTypeMetadata value, JsonSerializerOptions options)
             => throw new NotSupportedException("Writing not supported");
 
-        public static InputExternalTypeMetadata CreateInputExternalTypeMetadata(ref Utf8JsonReader reader, string? id, JsonSerializerOptions options, ReferenceResolver resolver)
+        public static InputExternalTypeMetadata CreateInputExternalTypeMetadata(ref Utf8JsonReader reader)
         {
             string? identity = null;
             string? package = null;
             string? minVersion = null;
 
+            if (reader.TokenType == JsonTokenType.StartObject)
+            {
+                reader.Read();
+            }
+
             while (reader.TokenType != JsonTokenType.EndObject)
             {
-                var isKnownProperty = reader.TryReadReferenceId(ref id)
-                    || reader.TryReadString("identity", ref identity)
-                    || reader.TryReadString("package", ref package)
-                    || reader.TryReadString("minVersion", ref minVersion);
+                var isKnownProperty = reader.TryReadString("identity", ref identity)
+                                      || reader.TryReadString("package", ref package)
+                                      || reader.TryReadString("minVersion", ref minVersion);
 
                 if (!isKnownProperty)
                 {
@@ -52,11 +49,6 @@ public static InputExternalTypeMetadata CreateInputExternalTypeMetadata(ref Utf8
 
             var externalTypeProperties = new InputExternalTypeMetadata(identity, package, minVersion);
 
-            if (id != null)
-            {
-                resolver.AddReference(id, externalTypeProperties);
-            }
-
             return externalTypeProperties;
         }
     }

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/src/InputTypes/Serialization/TypeSpecSerialization.cs

@@ -72,6 +72,7 @@ public static class TypeSpecSerialization
                     new TypeSpecInputExampleValueConverter(),
                     new TypeSpecInputParameterExampleConverter(),
                     new TypeSpecInputOperationExampleConverter(),
+                    new InputExternalTypeMetadataConverter(),
                 }
             };
 

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TestData/TypeSpecInputConverterTests/LoadsModelWithExternalMetadataEndToEnd/tspCodeModel.json

@@ -0,0 +1,23 @@
+{
+  "$id": "1",
+  "name": "TestNamespace",
+  "models": [
+    {
+      "$id": "2",
+      "kind": "model",
+      "name": "ExternalModel",
+      "namespace": "TestNamespace",
+      "crossLanguageDefinitionId": "TestNamespace.ExternalModel",
+      "usage": "None",
+      "properties": [],
+      "external": {
+        "identity": "System.Text.Json.JsonElement",
+        "package": "System.Text.Json",
+        "minVersion": "8.0.0"
+      }
+    }
+  ],
+  "clients": [],
+  "enums": []
+}
+

packages/http-client-csharp/generator/Microsoft.TypeSpec.Generator.Input/test/TypeSpecInputConverterTests.cs

@@ -463,7 +463,7 @@ public void DeserializeUnionWithExternalMetadata()
                     new InputTypeConverter(referenceHandler),
                     new InputUnionTypeConverter(referenceHandler),
                     new InputPrimitiveTypeConverter(referenceHandler),
-                    new InputExternalTypeMetadataConverter(referenceHandler)
+                    new InputExternalTypeMetadataConverter()
                 }
             };
 
@@ -502,7 +502,7 @@ public void DeserializeModelWithExternalMetadata()
                 {
                     new InputTypeConverter(referenceHandler),
                     new InputModelTypeConverter(referenceHandler),
-                    new InputExternalTypeMetadataConverter(referenceHandler)
+                    new InputExternalTypeMetadataConverter()
                 }
             };
 
@@ -537,7 +537,7 @@ public void DeserializeArrayWithExternalMetadata()
                     new InputTypeConverter(referenceHandler),
                     new InputArrayTypeConverter(referenceHandler),
                     new InputPrimitiveTypeConverter(referenceHandler),
-                    new InputExternalTypeMetadataConverter(referenceHandler)
+                    new InputExternalTypeMetadataConverter()
                 }
             };
 
@@ -572,7 +572,7 @@ public void DeserializeDictionaryWithExternalMetadata()
                     new InputTypeConverter(referenceHandler),
                     new InputDictionaryTypeConverter(referenceHandler),
                     new InputPrimitiveTypeConverter(referenceHandler),
-                    new InputExternalTypeMetadataConverter(referenceHandler)
+                    new InputExternalTypeMetadataConverter()
                 }
             };
 
@@ -610,7 +610,7 @@ public void DeserializeEnumWithExternalMetadata()
                     new InputTypeConverter(referenceHandler),
                     new InputEnumTypeConverter(referenceHandler),
                     new InputPrimitiveTypeConverter(referenceHandler),
-                    new InputExternalTypeMetadataConverter(referenceHandler)
+                    new InputExternalTypeMetadataConverter()
                 }
             };
 
@@ -621,5 +621,23 @@ public void DeserializeEnumWithExternalMetadata()
             Assert.IsNull(enumType.External.Package);
             Assert.IsNull(enumType.External.MinVersion);
         }
+
+        [Test]
+        public void LoadsModelWithExternalMetadataEndToEnd()
+        {
+            var directory = Helpers.GetAssetFileOrDirectoryPath(false);
+            // this tspCodeModel.json contains a partial part of the full tspCodeModel.json
+            var content = File.ReadAllText(Path.Combine(directory, "tspCodeModel.json"));
+            var inputNamespace = TypeSpecSerialization.Deserialize(content);
+
+            Assert.IsNotNull(inputNamespace);
+
+            var externalModel = inputNamespace!.Models.SingleOrDefault(m => m.Name == "ExternalModel");
+            Assert.IsNotNull(externalModel);
+            Assert.IsNotNull(externalModel!.External, "External metadata should be populated");
+            Assert.AreEqual("System.Text.Json.JsonElement", externalModel.External!.Identity);
+            Assert.AreEqual("System.Text.Json", externalModel.External.Package);
+            Assert.AreEqual("8.0.0", externalModel.External.MinVersion);
+        }
     }
 }