Refactor code to resolve Oneof and AnyOf schemas

Author: MaggieKimani1

src/Microsoft.OpenApi.Hidi/Formatters/PowerShellFormatter.cs

@@ -44,8 +44,8 @@ static PowerShellFormatter()
         // 6. Add AdditionalProperties to object schemas.
 
         public override void Visit(ref JsonSchema schema)
-        {
-            AddAdditionalPropertiesToSchema(schema);
+         {
+            AddAdditionalPropertiesToSchema(ref schema);
             schema = ResolveAnyOfSchema(ref schema);
             schema = ResolveOneOfSchema(ref schema);
 
@@ -174,7 +174,7 @@ private static IList<OpenApiParameter> ResolveFunctionParameters(IList<OpenApiPa
             return parameters;
         }
 
-        private void AddAdditionalPropertiesToSchema(JsonSchema schema)
+        private void AddAdditionalPropertiesToSchema(ref JsonSchema schema)
         {
             if (schema != null && !_schemaLoop.Contains(schema) && schema.GetJsonType().Equals(SchemaValueType.Object))
             {
@@ -200,6 +200,7 @@ private void AddAdditionalPropertiesToSchema(JsonSchema schema)
                     _schemaLoop.Push(additionalProps);
                 }
             }
+            
         }
 
         private static JsonSchema ResolveOneOfSchema(ref JsonSchema schema)
@@ -254,6 +255,14 @@ private static JsonSchema FlattenSchema(JsonSchema schema, JsonSchema newSchema)
         private static JsonSchema CopySchema(JsonSchema schema, JsonSchema newSchema)
         {
             var schemaBuilder = new JsonSchemaBuilder();
+            var keywords = schema.Keywords;
+            if (keywords != null)
+            {
+                foreach (var keyword in keywords)
+                {
+                    schemaBuilder.Add(keyword);
+                }
+            }
 
             if (schema.GetTitle() == null && newSchema.GetTitle() is { } title)
             {

src/Microsoft.OpenApi/Services/OpenApiWalker.cs

@@ -127,7 +127,7 @@ internal void Walk(OpenApiComponents components)
                 {
                     foreach (var item in components.Schemas)
                     {
-                        Walk(item.Key, () => Walk(item.Value, isComponent: true));
+                        Walk(item.Key, () => components.Schemas[item.Key] = Walk(item.Value, isComponent: true));
                     }
                 }
             });
@@ -498,8 +498,7 @@ internal void Walk(OpenApiPathItem pathItem, bool isComponent = false)
 
             _visitor.Visit(pathItem);
 
-            // The path may be a reference
-            if (pathItem != null && !ProcessAsReference(pathItem))
+            if (pathItem != null)
             {
                 Walk(OpenApiConstants.Parameters, () => Walk(pathItem.Parameters));
                 Walk(pathItem.Operations);
@@ -850,9 +849,20 @@ internal JsonSchema Walk(JsonSchema schema, bool isComponent = false)
             {
                 Walk("properties", () =>
                 {
+                    var props = new Dictionary<string, JsonSchema>();
+                    var builder = new JsonSchemaBuilder();
+                    foreach(var keyword in schema.Keywords)
+                    {
+                        builder.Add(keyword);
+                    }
+
                     foreach (var item in schema.GetProperties())
                     {
-                        Walk(item.Key, () => Walk(item.Value));
+                        var key = item.Key;
+                        JsonSchema newSchema = null;
+                        Walk(key, () => newSchema = Walk(item.Value));
+                        props.Add(key, newSchema);
+                        schema = builder.Properties(props);
                     }
                 });
             }