Updated hidi parameters to control both local and remote inlining independently

Author: darrelmiller

src/Microsoft.OpenApi.Hidi/OpenApiService.cs

@@ -26,11 +26,12 @@ public static void ProcessOpenApiDocument(
             FileInfo output,
             OpenApiSpecVersion? version,
             OpenApiFormat? format,
+            bool inlineExternal,
+            bool inlineLocal,
             string filterByOperationIds,
             string filterByTags,
-            string filterByCollection,
-            bool inline,
-            bool resolveExternal)
+            string filterByCollection
+            )
         {
             if (string.IsNullOrEmpty(input))
             {
@@ -52,7 +53,7 @@ public static void ProcessOpenApiDocument(
 
             var result = new OpenApiStreamReader(new OpenApiReaderSettings
             {
-                ReferenceResolution = resolveExternal == true ? ReferenceResolutionSetting.ResolveAllReferences : ReferenceResolutionSetting.ResolveLocalReferences,
+                ReferenceResolution = inlineExternal == true ? ReferenceResolutionSetting.ResolveAllReferences : ReferenceResolutionSetting.ResolveLocalReferences,
                 RuleSet = ValidationRuleSet.GetDefaultRuleSet(),
                 BaseUrl = new Uri(inputUrl.AbsoluteUri)
             }
@@ -105,7 +106,8 @@ public static void ProcessOpenApiDocument(
 
             var settings = new OpenApiWriterSettings()
             {
-                ReferenceInline = inline ? ReferenceInlineSetting.InlineLocalReferences : ReferenceInlineSetting.DoNotInlineReferences
+                InlineLocalReferences = inlineLocal,
+                InlineExternalReferences = inlineExternal
             };
 
             var openApiFormat = format ?? GetOpenApiFormat(input);

src/Microsoft.OpenApi.Hidi/Program.cs

@@ -28,13 +28,13 @@ static async Task<int> Main(string[] args)
                 new Option("--output","Output OpenAPI description file", typeof(FileInfo), arity: ArgumentArity.ZeroOrOne),
                 new Option("--version", "OpenAPI specification version", typeof(OpenApiSpecVersion)),
                 new Option("--format", "File format",typeof(OpenApiFormat) ),
-                new Option("--inline", "Inline $ref instances", typeof(bool) ),
-                new Option("--resolveExternal","Resolve external $refs", typeof(bool)),
+                new Option("--inlineExternal", "Inline external $ref instances", typeof(bool) ),
+                new Option("--inlineLocal", "Inline local $ref instances", typeof(bool) ),
                 new Option("--filterByOperationIds", "Filters OpenApiDocument by OperationId(s) provided", typeof(string)),
                 new Option("--filterByTags", "Filters OpenApiDocument by Tag(s) provided", typeof(string)),
                 new Option("--filterByCollection", "Filters OpenApiDocument by Postman collection provided", typeof(string))
             };
-            transformCommand.Handler = CommandHandler.Create<string, FileInfo, OpenApiSpecVersion?, OpenApiFormat?, string, string, string, bool, bool>(
+            transformCommand.Handler = CommandHandler.Create<string, FileInfo, OpenApiSpecVersion?, OpenApiFormat?, bool, bool, string, string, string>(
                 OpenApiService.ProcessOpenApiDocument);
 
             rootCommand.Add(transformCommand);

src/Microsoft.OpenApi.Readers/OpenApiReaderSettings.cs

@@ -30,7 +30,7 @@ public enum ReferenceResolutionSetting
         /// </summary>
         ResolveLocalReferences,
         /// <summary>
-        /// Convert all references to references of valid domain objects.
+        /// Not used anymore. Will be removed in v2. Convert all references to references of valid domain objects.
         /// </summary>
         ResolveAllReferences
     }