Cleanup unused

Author: CorruptComputer

ReQuesty.Builder/CodeRenderers/CodeRenderer.cs

@@ -1,5 +1,4 @@
-using ReQuesty.Builder.CodeDOM;
-using ReQuesty.Builder.Configuration;
+using ReQuesty.Builder.CodeDOM;
 using ReQuesty.Builder.OrderComparers;
 using ReQuesty.Builder.Writers;
 
@@ -10,10 +9,8 @@ namespace ReQuesty.Builder.CodeRenderers;
 /// </summary>
 public class CodeRenderer
 {
-    public CodeRenderer(GenerationConfiguration configuration, CodeElementOrderComparer? elementComparer = null)
+    public CodeRenderer(CodeElementOrderComparer? elementComparer = null)
     {
-        ArgumentNullException.ThrowIfNull(configuration);
-        Configuration = configuration;
         _rendererElementComparer = elementComparer ?? new CodeElementOrderComparer();
     }
 
@@ -64,10 +61,6 @@ public async Task RenderCodeNamespaceToFilePerClassAsync(LanguageWriter writer,
         }
     }
     private readonly CodeElementOrderComparer _rendererElementComparer;
-    protected GenerationConfiguration Configuration
-    {
-        get; private set;
-    }
     private void RenderCode(LanguageWriter writer, CodeElement element)
     {
         writer.Write(element);
@@ -89,13 +82,11 @@ public virtual bool ShouldRenderNamespaceFile(CodeNamespace codeNamespace)
         }
         // if the module already has a class with the same name, it's going to be declared automatically
         string namespaceNameLastSegment = codeNamespace.Name.Split('.')[^1];
-        return Configuration.ShouldWriteBarrelsIfClassExists || codeNamespace.FindChildByName<CodeClass>(namespaceNameLastSegment, false) is null;
+        return codeNamespace.FindChildByName<CodeClass>(namespaceNameLastSegment, false) is null;
     }
 
-    public static CodeRenderer GetCodeRender(GenerationConfiguration config)
+    public static CodeRenderer GetCodeRender()
     {
-        ArgumentNullException.ThrowIfNull(config);
-        return new CodeRenderer(config);
+        return new CodeRenderer();
     }
-
 }

ReQuesty.Builder/CodeRenderers/TypeScriptCodeRenderer.cs

@@ -1,8 +1,6 @@
-using System.Text.Json.Nodes;
 using ReQuesty.Builder.CodeDOM;
 using ReQuesty.Builder.Extensions;
 using ReQuesty.Builder.Lock;
-using Microsoft.OpenApi.ApiManifest;
 using ReQuesty.Core;
 
 namespace ReQuesty.Builder.Configuration;
@@ -13,15 +11,6 @@ public static GenerationConfiguration DefaultConfiguration
     {
         get;
     } = new();
-    public bool ShouldGetApiManifest
-    {
-        get
-        {
-            return (string.IsNullOrEmpty(OpenAPIFilePath) || OpenAPIFilePath.Equals(DefaultConfiguration.OpenAPIFilePath, StringComparison.OrdinalIgnoreCase)) &&
-                (!string.IsNullOrEmpty(ApiManifestPath) || !ApiManifestPath.Equals(DefaultConfiguration.ApiManifestPath, StringComparison.OrdinalIgnoreCase)) &&
-                (ApiManifestPath.StartsWith("http", StringComparison.OrdinalIgnoreCase) || File.Exists(ApiManifestPath));
-        }
-    }
     public bool SkipGeneration
     {
         get; set;
@@ -31,10 +20,6 @@ public ConsumerOperation? Operation
         get; set;
     }
     public string OpenAPIFilePath { get; set; } = "openapi.yaml";
-    public string ApiManifestPath { get; set; } = "apimanifest.json";
-    // Optional filename suffix to be used when generating multiple API plugins for the same OpenAPI file.
-    // Note: It can not be set from the outside, it is only used internally when generating the plugin manifest.
-    internal string FileNameSuffix { get; set; } = "";
 
     public string OutputPath { get; set; } = "./output";
     public string ClientClassName { get; set; } = "ApiClient";
@@ -51,7 +36,6 @@ public string ModelsNamespaceName
         get => $"{ClientNamespaceName}{NamespaceNameSeparator}{ModelsNamespaceSegmentName}";
     }
     public GenerationLanguage Language { get; set; } = GenerationLanguage.CSharp;
-    public HashSet<PluginType> PluginTypes { get; set; } = [];
     public string? ApiRootUrl
     {
         get; set;
@@ -78,14 +62,6 @@ public HashSet<string> Deserializers
         "ReQuesty.Runtime.Serialization.Text.TextParseNodeFactory",
         "ReQuesty.Runtime.Serialization.Form.FormParseNodeFactory",
     };
-    public bool ShouldWriteBarrelsIfClassExists
-    {
-        get
-        {
-            return BarreledLanguagesWithConstantFileName.Contains(Language);
-        }
-    }
-    private static readonly HashSet<GenerationLanguage> BarreledLanguagesWithConstantFileName = [];
     public bool CleanOutput
     {
         get; set;
@@ -101,10 +77,6 @@ public StructuredMimeTypesCollection StructuredMimeTypes
     ];
     public HashSet<string> IncludePatterns { get; set; } = new(0, StringComparer.OrdinalIgnoreCase);
     public HashSet<string> ExcludePatterns { get; set; } = new(0, StringComparer.OrdinalIgnoreCase);
-    /// <summary>
-    /// The overrides loaded from the api manifest when refreshing a client, as opposed to the user provided ones.
-    /// </summary>
-    public HashSet<string> PatternsOverride { get; set; } = new(0, StringComparer.OrdinalIgnoreCase);
     public bool ClearCache
     {
         get; set;
@@ -115,13 +87,6 @@ public bool? IncludeReQuestyValidationRules
         get; set;
     }
 
-    // If set to true, this allows to parse extensions from manifest
-    // to use in query operations for RPC requests
-    public bool? IncludePluginExtensions
-    {
-        get; set;
-    }
-
     public bool NoWorkspace
     {
         get; set;
@@ -150,13 +115,10 @@ public object Clone()
             ClearCache = ClearCache,
             DisabledValidationRules = new(DisabledValidationRules ?? Enumerable.Empty<string>(), StringComparer.OrdinalIgnoreCase),
             IncludeReQuestyValidationRules = IncludeReQuestyValidationRules,
-            IncludePluginExtensions = IncludePluginExtensions,
             MaxDegreeOfParallelism = MaxDegreeOfParallelism,
             SkipGeneration = SkipGeneration,
             NoWorkspace = NoWorkspace,
             Operation = Operation,
-            PatternsOverride = new(PatternsOverride ?? Enumerable.Empty<string>(), StringComparer.OrdinalIgnoreCase),
-            PluginTypes = new(PluginTypes ?? Enumerable.Empty<PluginType>()),
             DisableSSLValidation = DisableSSLValidation,
             ExportPublicApi = ExportPublicApi,
         };
@@ -193,37 +155,6 @@ internal void UpdateConfigurationFromLanguagesInformation(LanguagesInformation l
     }
     public const string ReQuestyHashManifestExtensionKey = "x-requesty-hash";
     public const string ReQuestyVersionManifestExtensionKey = "x-requesty-version";
-    public ApiDependency ToApiDependency(string configurationHash, Dictionary<string, HashSet<string>> templatesWithOperations, string targetDirectory)
-    {
-        ApiDependency dependency = new()
-        {
-            ApiDescriptionUrl = NormalizeDescriptionLocation(targetDirectory),
-            ApiDeploymentBaseUrl = ApiRootUrl?.EndsWith('/') ?? false ? ApiRootUrl : $"{ApiRootUrl}/",
-            Extensions = [],
-            Requests = templatesWithOperations.SelectMany(static x => x.Value.Select(y => new RequestInfo { Method = y.ToUpperInvariant(), UriTemplate = x.Key.DeSanitizeUrlTemplateParameter() })).ToList(),
-        };
-
-        if (!string.IsNullOrEmpty(configurationHash))
-        {
-            dependency.Extensions.Add(ReQuestyHashManifestExtensionKey, JsonValue.Create(configurationHash));// only include non empty value.
-        }
-        dependency.Extensions.Add(ReQuestyVersionManifestExtensionKey, ReQuestyVersion.Current());
-        return dependency;
-    }
-    private string NormalizeDescriptionLocation(string targetDirectory)
-    {
-        if (!string.IsNullOrEmpty(OpenAPIFilePath) &&
-            !string.IsNullOrEmpty(targetDirectory) &&
-            !OpenAPIFilePath.StartsWith("http", StringComparison.OrdinalIgnoreCase) &&
-            Path.IsPathRooted(OpenAPIFilePath) &&
-            Path.GetFullPath(OpenAPIFilePath).StartsWith(Path.GetFullPath(targetDirectory), StringComparison.Ordinal))
-        {
-            return "./" + Path.GetRelativePath(targetDirectory, OpenAPIFilePath).NormalizePathSeparators();
-        }
-
-        return OpenAPIFilePath;
-    }
-    public bool IsPluginConfiguration => PluginTypes.Count != 0;
 
     public bool DisableSSLValidation
     {

ReQuesty.Builder/Configuration/GenerationConfiguration.cs

@@ -1,4 +1,4 @@
-using System.Text.Json.Nodes;
+using System.Text.Json.Nodes;
 using ReQuesty.Builder.OpenApiExtensions;
 using Microsoft.OpenApi;
 using Microsoft.OpenApi.Reader;
@@ -7,37 +7,11 @@ namespace ReQuesty.Builder.Extensions;
 
 public static class OpenApiSettingsExtensions
 {
-    /// <summary>
-    /// Adds the OpenAPI extensions used for plugins generation.
-    /// </summary>
-    public static void AddPluginsExtensions(this OpenApiReaderSettings settings)
-    {
-        ArgumentNullException.ThrowIfNull(settings);
-        settings.ExtensionParsers ??= new Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>>(StringComparer.OrdinalIgnoreCase);
-        settings.ExtensionParsers.TryAdd(OpenApiLogoExtension.Name, static (i, _) => OpenApiLogoExtension.Parse(i));
-        settings.ExtensionParsers.TryAdd(OpenApiDescriptionForModelExtension.Name, static (i, _) => OpenApiDescriptionForModelExtension.Parse(i));
-        settings.ExtensionParsers.TryAdd(OpenApiPrivacyPolicyUrlExtension.Name, static (i, _) => OpenApiPrivacyPolicyUrlExtension.Parse(i));
-        settings.ExtensionParsers.TryAdd(OpenApiLegalInfoUrlExtension.Name, static (i, _) => OpenApiLegalInfoUrlExtension.Parse(i));
-    }
-
     public static void AddGenerationExtensions(this OpenApiReaderSettings settings)
     {
         ArgumentNullException.ThrowIfNull(settings);
         settings.AddMicrosoftExtensionParsers();
         settings.ExtensionParsers ??= new Dictionary<string, Func<JsonNode, OpenApiSpecVersion, IOpenApiExtension>>(StringComparer.OrdinalIgnoreCase);
         settings.ExtensionParsers.TryAdd(OpenApiReQuestyExtension.Name, static (i, _) => OpenApiReQuestyExtension.Parse(i));
     }
-
-    public static HashSet<string> ReQuestySupportedExtensions()
-    {
-        OpenApiReaderSettings dummySettings = new();
-        dummySettings.AddGenerationExtensions();
-        dummySettings.AddPluginsExtensions();
-
-        HashSet<string> supportedExtensions = dummySettings.ExtensionParsers?.Keys.ToHashSet(StringComparer.OrdinalIgnoreCase) ?? [];
-
-        supportedExtensions.Add("x-openai-isConsequential");// add extension we don't parse to the list
-
-        return supportedExtensions;
-    }
 }