fix: Move loading api

Author: pomianowski

.editorconfig

@@ -15,8 +15,25 @@ indent_size = 4
 indent_style = space
 
 # New line preferences
-end_of_line = unset
+end_of_line = crlf
 insert_final_newline = false
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
 
 #### Build files ####
 
@@ -50,10 +67,10 @@ file_header_template = This Source Code Form is subject to the terms of the MIT
 #### .NET Coding Conventions ####
 
 # this. and Me. preferences
-dotnet_style_qualification_for_event = false:warning
-dotnet_style_qualification_for_field = true:warning
-dotnet_style_qualification_for_method = false:warning
-dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_event = false:none
+dotnet_style_qualification_for_field = false:none
+dotnet_style_qualification_for_method = false:none
+dotnet_style_qualification_for_property = false:none
 
 # Language keywords vs BCL types preferences
 dotnet_style_predefined_type_for_locals_parameters_members = true:warning
@@ -99,13 +116,13 @@ csharp_style_var_for_built_in_types = false:warning
 csharp_style_var_when_type_is_apparent = false:warning
 
 # Expression-bodied members
-csharp_style_expression_bodied_accessors = false:silent
+csharp_style_expression_bodied_accessors = true:silent
 csharp_style_expression_bodied_constructors = false:silent
-csharp_style_expression_bodied_indexers = false:silent
+csharp_style_expression_bodied_indexers = true:silent
 csharp_style_expression_bodied_lambdas = true:silent
 csharp_style_expression_bodied_methods = false:silent
 csharp_style_expression_bodied_operators = false:silent
-csharp_style_expression_bodied_properties = false:silent
+csharp_style_expression_bodied_properties = true:silent
 
 # Pattern matching preferences
 csharp_style_prefer_pattern_matching = true:suggestion
@@ -119,9 +136,9 @@ csharp_style_conditional_delegate_call = true:suggestion
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
 
 # Code-block preferences
-csharp_prefer_braces = true:suggestion
-csharp_using_directive_placement = outside_namespace:warning
-csharp_style_namespace_declarations = file_scoped:warning
+csharp_prefer_braces = true:silent
+csharp_using_directive_placement = outside_namespace:silent
+csharp_style_namespace_declarations = block_scoped:silent
 csharp_style_unused_value_assignment_preference = discard_variable:none
 csharp_style_unused_value_expression_statement_preference = discard_variable:none
 csharp_style_allow_blank_lines_between_consecutive_braces_experimental = false:warning
@@ -147,7 +164,7 @@ csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true
 csharp_indent_case_contents_when_block = false
-csharp_indent_labels = no_change
+csharp_indent_labels = one_less_than_current
 csharp_indent_switch_labels = true
 
 # Space preferences
@@ -387,3 +404,10 @@ dotnet_diagnostic.SA1629.severity = none
 dotnet_diagnostic.SA1633.severity = none
 dotnet_diagnostic.SA1634.severity = none
 dotnet_diagnostic.SA1652.severity = none
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_prefer_null_check_over_type_check = true:suggestion

Directory.Build.props

@@ -5,8 +5,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <Version>1.0.0</Version>
-    <AssemblyVersion>1.0.0</AssemblyVersion>
-    <PackageVersion>1.0.0-preview.5</PackageVersion>
+    <AssemblyVersion>$(Version)</AssemblyVersion>
+    <PackageVersion>$(Version)-preview.6</PackageVersion>
   </PropertyGroup>
   <PropertyGroup>
     <Company>lepo.co</Company>

Directory.Build.targets

@@ -81,4 +81,5 @@
       <Compile Include="$(GeneratedSkipLocalsInitFile)" />
     </ItemGroup>
   </Target>
+
 </Project>

src/OpenApi.Client.Cli/Commands/GenerateCommand.cs

@@ -37,45 +37,19 @@ public override async Task<int> ExecuteAsync(CommandContext context, GenerateCom
 
         await using FileStream fileStream = new(settings.File, FileMode.Open, FileAccess.Read);
 
-        ReadResult readResult = await OpenApiDocument.LoadAsync(
-            fileStream,
-            format: null,
-            settings: null,
-            cancellationToken: cancellationTokenSource.Token
-        );
-
-        if (readResult.Diagnostic?.Errors.Count > 0)
-        {
-            foreach (OpenApiError? serializationResultError in readResult.Diagnostic.Errors)
-            {
-                AnsiConsole.MarkupLine($"[red]Error:[/] {serializationResultError.Message}");
-            }
-
-            return -1;
-        }
-
-        if (readResult.Document is null)
-        {
-            AnsiConsole.MarkupLine("[red]Error:[/] Serialized JSON returned empty API.");
-
-            return -2;
-        }
-
         ClientGenerator generator = new(
-            readResult.Document,
             new GeneratorData
             {
                 NamespaceName = settings.Namespace,
                 ClassName = settings.ClassName,
                 Access = Accessibility.Public,
                 SerializationTool = SerializationTool.SystemTextJson,
-                Location = Location.None,
-                SelectedFile = "",
+                Source = fileStream,
                 Templates = null,
             }
         );
 
-        GenerationResult generatorResult = generator.Generate();
+        GenerationResult generatorResult = await generator.GenerateAsync(cancellationTokenSource.Token);
 
         //OpenApiContract contract = OpenApiContractParser.Parse(
         //    settings.Namespace,