Fix swagger tests

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Header.cs

@@ -3,11 +3,23 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using SwaggerApiParser.SwaggerApiView;
 
 namespace SwaggerApiParser.Specs
 {
     public class Header : Items
     {
         public string description { get; set; }
+
+        public new CodeFileToken[] TokenSerialize(SerializeContext context)
+        {
+            List<CodeFileToken> ret = new List<CodeFileToken>();
+            ret.AddRange(TokenSerializer.KeyValueTokens("type", type, true, context.IteratorPath.CurrentNextPath("type")));
+
+            if (description != null)
+                ret.AddRange(TokenSerializer.KeyValueTokens("description", description, true, context.IteratorPath.CurrentNextPath("description")));
+
+            return ret.ToArray();
+        }
     }
 }

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Items.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using SwaggerApiParser.SwaggerApiView;
 
 namespace SwaggerApiParser.Specs
 {

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Schema.cs

@@ -166,11 +166,11 @@ private CodeFileToken[] TokenSerializeInternal(SerializeContext context, Schema
             }
 
             // Now recurse into nested model definitions so all properties are grouped with their models.
-            while (this.propertyQueue.TryDequeue(out var property))
-            {
-                var (item, childContext) = property;
-                ret.AddRange(item.TokenSerializeInternal(childContext, item, flattenedTableItems, serializeRef));
-            }
+            //while (this.propertyQueue.TryDequeue(out var property))
+            //{
+            //    var (item, childContext) = property;
+            //    ret.AddRange(item.TokenSerializeInternal(childContext, item, flattenedTableItems, serializeRef));
+            //}
 
             return ret.ToArray();
         }

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/SchemaCache.cs

@@ -205,7 +205,11 @@ public Schema GetResolvedSchema(Schema root, string currentSwaggerFilePath, Link
                 var schema = this.GetSchemaFromCache(root.@ref, currentSwaggerFilePath);
                 var ret = this.GetResolvedSchema(schema, Utils.GetReferencedSwaggerFile(root.@ref, currentSwaggerFilePath), refChain);
                 // write back resolved cache
-                this.ResolvedCache.TryAdd(GetResolvedCacheRefKey(root.@ref, currentSwaggerFilePath), schema);
+                if (root.@ref != null)
+                {
+                    this.ResolvedCache.TryAdd(GetResolvedCacheRefKey(root.@ref, currentSwaggerFilePath), schema);
+                }
+
                 refChain.RemoveLast();
 
                 if (ret == null)
@@ -222,7 +226,8 @@ public Schema GetResolvedSchema(Schema root, string currentSwaggerFilePath, Link
             {
                 foreach (var allOfItem in root.allOf)
                 {
-                    var resolvedChild = this.GetResolvedSchema(allOfItem, currentSwaggerFilePath, refChain);
+                    var @ref = root.@ref ?? root.originalRef;
+                    var resolvedChild = this.GetResolvedSchema(allOfItem, Utils.GetReferencedSwaggerFile(@ref, currentSwaggerFilePath), refChain);
                     if (resolvedChild == null)
                     {
                         continue;
@@ -247,15 +252,13 @@ public Schema GetResolvedSchema(Schema root, string currentSwaggerFilePath, Link
 
             if (root.additionalProperties.ValueKind == JsonValueKind.Object) 
             {
-                var additionalProperties = JsonSerializer.Deserialize<Dictionary<string, string>>(root.additionalProperties);
+                var additionalProperties = JsonSerializer.Deserialize<Dictionary<string, object>>(root.additionalProperties);
                 if (additionalProperties.ContainsKey("$ref"))
                 {
                     var schema = new Schema();
                     schema.@ref = additionalProperties["$ref"].ToString();
                     var refKey = GetRefKey(schema.@ref);
-                    schema = GetResolvedSchema(schema, currentSwaggerFilePath, refChain);
                     root.properties[refKey] = schema;
-                    Utils.AddSchemaToRootDefinition(schema, definitions);
                 }
             }
 
@@ -268,9 +271,10 @@ public Schema GetResolvedSchema(Schema root, string currentSwaggerFilePath, Link
                         continue;
                     }
 
-                    if (!refChain.Contains(rootProperty.Value.@ref) && !refChain.Contains(rootProperty.Value.@ref) && !refChain.Contains(rootProperty.Value.items?.@ref))
+                    if (!refChain.Contains(rootProperty.Value.@ref) && !refChain.Contains(rootProperty.Value.items?.@ref))
                     {
-                        var property = this.GetResolvedSchema(rootProperty.Value, currentSwaggerFilePath, refChain);
+                        var @ref = root.@ref ?? root.originalRef;
+                        var property = this.GetResolvedSchema(rootProperty.Value, Utils.GetReferencedSwaggerFile(@ref, currentSwaggerFilePath), refChain);
                         root.properties[rootProperty.Key] = property;
                         Utils.AddSchemaToRootDefinition(property, definitions);
                     }

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Specs/Security.cs

@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using System.Text.Json;
-using System.Text.Json.Serialization;
-using SwaggerApiParser.Converters;
 
 namespace SwaggerApiParser.Specs
 {

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerAPIViewGenerator.cs

@@ -118,6 +118,8 @@ public static async Task<SwaggerApiViewSpec> GenerateSwaggerApiView(Swagger swag
                                     }
                                     while (param != null && param.IsRefObject());
                                 }
+
+                                referenceSwaggerFilePath = Utils.GetReferencedSwaggerFile(parameter.@ref, referenceSwaggerFilePath);
                             }
 
                             var swaggerApiViewOperationParameter = new SwaggerApiViewParameter

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiParser.csproj

@@ -32,7 +32,7 @@
 
   <ItemGroup>
     <PackageReference Include="Markdig.Signed" Version="0.30.2" />
-    <PackageReference Include="NuGet.CommandLine" Version="6.2.2">
+    <PackageReference Include="NuGet.CommandLine" Version="6.2.4">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/SwaggerApiView/SwaggerApiViewResponse.cs

@@ -26,8 +26,12 @@ public CodeFileToken[] TokenSerialize(SerializeContext context)
                 ret.Add(TokenSerializer.NewLine());
                 foreach (var header in headers)
                 {
-                    ret.AddRange(TokenSerializer.KeyValueTokens(header.Key, ""));
+                    ret.Add(new CodeFileToken(header.Key, CodeFileTokenKind.FoldableSectionHeading));
+                    ret.Add(TokenSerializer.Colon());
+                    ret.Add(TokenSerializer.NewLine());
+                    ret.Add(TokenSerializer.FoldableContentStart());
                     ret.AddRange(header.Value.TokenSerialize(context));
+                    ret.Add(TokenSerializer.FoldableContentEnd());
                 }
                 ret.Add(TokenSerializer.NewLine());
 

tools/apiview/parsers/swagger-api-parser/SwaggerApiParser/Utils.cs

@@ -258,6 +258,11 @@ public static void SerializePatternedObjects(IDictionary<string, JsonElement> pa
 
         public static void AddSchemaToRootDefinition(Schema schema, Dictionary<string, Definition> definitions)
         {
+            if (schema == null)
+            {
+                return;
+            }
+
             if (!String.IsNullOrEmpty(schema.originalRef))
             {
                 var schemaKey = Utils.GetDefinitionType(schema.originalRef);