Add SkipSchemas to TsClient plugin

vb-consulting · Jun 9, 2024 · bc9ad6c · bc9ad6c
1 parent dff7860
commit bc9ad6c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 8 deletions.
diff --git a/NpgsqlRestClient/App.cs b/NpgsqlRestClient/App.cs
@@ -279,6 +279,12 @@ public static List<IEndpointCreateHandler> CreateCodeGenHandlers(string connecti
                 ts.SkipPaths = skipPaths.ToArray();
             }
 
+            var skipSchemas = GetConfigEnumerable("SkipSchemas", tsClientCfg);
+            if (skipSchemas is not null)
+            {
+                ts.SkipSchemas = skipSchemas.ToArray();
+            }
+
             handlers.Add(new TsClient(ts));
         }
 

diff --git a/NpgsqlRestClient/appsettings.json b/NpgsqlRestClient/appsettings.json
@@ -534,13 +534,17 @@
             //
             "SkipRoutineNames": [],
             //
-            // Array of generated function names to skip
+            // Array of generated function names to skip (without schema)
             //
             "SkipFunctionNames": [],
             //
             // Array of url paths to skip
             //
-            "SkipPaths": []
+            "SkipPaths": [],
+            //
+            // Array of schema names to skip
+            //
+            "SkipSchemas": []
         },
 
         //

diff --git a/plugins/NpgsqlRest.TsClient/NpgsqlRest.TsClient.csproj b/plugins/NpgsqlRest.TsClient/NpgsqlRest.TsClient.csproj
@@ -28,10 +28,10 @@
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <PackageReadmeFile>README.MD</PackageReadmeFile>
         <DocumentationFile>bin\$(Configuration)\$(AssemblyName).xml</DocumentationFile>
-        <Version>1.7.0</Version>
-        <AssemblyVersion>1.7.0</AssemblyVersion>
-        <FileVersion>1.7.0</FileVersion>
-        <PackageVersion>1.7.0</PackageVersion>
+        <Version>1.8.0</Version>
+        <AssemblyVersion>1.8.0</AssemblyVersion>
+        <FileVersion>1.8.0</FileVersion>
+        <PackageVersion>1.8.0</PackageVersion>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">

diff --git a/plugins/NpgsqlRest.TsClient/README.md b/plugins/NpgsqlRest.TsClient/README.md
@@ -519,14 +519,19 @@ public class TsClientOptions(
     public string[] SkipRoutineNames { get; set; } = skipRoutineNames ?? [];
 
     /// <summary>
-    /// Array of generated function names to skip
+    /// Array of generated function names to skip (without schema)
     /// </summary>
     public string[] SkipFunctionNames { get; set; } = skipFunctionNames ?? [];
 
     /// <summary>
     /// Array of url paths to skip
     /// </summary>
     public string[] SkipPaths { get; set; } = skipPaths ?? [];
+
+    /// <summary>
+    /// Array of schema names to skip
+    /// </summary>
+    public string[] SkipSchemas { get; set; } = skipPaths ?? [];
 }
 ```
 

diff --git a/plugins/NpgsqlRest.TsClient/TsClient.cs b/plugins/NpgsqlRest.TsClient/TsClient.cs
@@ -172,6 +172,10 @@ void Handle(Routine routine, RoutineEndpoint endpoint)
             {
                 return;
             }
+            if (options.SkipSchemas.Contains(routine.Schema))
+            {
+                return;
+            }
             if (options.SkipPaths.Contains(endpoint.Url))
             {
                 return;

diff --git a/plugins/NpgsqlRest.TsClient/TsClientOptions.cs b/plugins/NpgsqlRest.TsClient/TsClientOptions.cs
@@ -97,12 +97,17 @@ public class TsClientOptions(
     public string[] SkipRoutineNames { get; set; } = skipRoutineNames ?? [];
 
     /// <summary>
-    /// Array of generated function names to skip
+    /// Array of generated function names to skip (without schema)
     /// </summary>
     public string[] SkipFunctionNames { get; set; } = skipFunctionNames ?? [];
 
     /// <summary>
     /// Array of url paths to skip
     /// </summary>
     public string[] SkipPaths { get; set; } = skipPaths ?? [];
+
+    /// <summary>
+    /// Array of schema names to skip
+    /// </summary>
+    public string[] SkipSchemas { get; set; } = skipPaths ?? [];
 }