feat:

+ Generate methods with access modifiers specified in the generation attribute.
SoftStoneDevelop · May 9, 2023 · 1acfa58 · 1acfa58
1 parent 469a7ac
commit 1acfa58
Show file tree

Hide file tree

Showing 12 changed files with 58 additions and 30 deletions.
diff --git a/Src/DbConnectionTests/MsSql/QueryFixture.cs b/Src/DbConnectionTests/MsSql/QueryFixture.cs
@@ -1,4 +1,5 @@
 using DbConnectionTests.Model;
+using Gedaq.Common.Enums;
 using Gedaq.DbConnection.Attributes;
 using NUnit.Framework;
 using System;

diff --git a/Src/Gedaq/Base/Batch/BatchCommandBase.cs b/Src/Gedaq/Base/Batch/BatchCommandBase.cs
@@ -174,7 +174,7 @@ StringBuilder builder
         {
             builder.Append($@"
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static  {(methodType == MethodType.Async ? $"async Task<{ProviderInfo.BatchType()}>" : ProviderInfo.BatchType())} Create{source.MethodName}Batch{(methodType == MethodType.Async ? "Async" : "")}(
+        {source.AccessModifier.ToLowerInvariant()} static  {(methodType == MethodType.Async ? $"async Task<{ProviderInfo.BatchType()}>" : ProviderInfo.BatchType())} Create{source.MethodName}Batch{(methodType == MethodType.Async ? "Async" : "")}(
             {source.ContainTypeName.GCThisWordOrEmpty()}{sourceTypeName} {sourceParametrName}
 ");
             AddFormatParametrs(source, builder);
@@ -366,7 +366,7 @@ StringBuilder builder
         {
             builder.Append($@"
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static  void Set{source.MethodName}Parametrs(
+        {source.AccessModifier.ToLowerInvariant()} static  void Set{source.MethodName}Parametrs(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.BatchType()} batch
 ");
             if(source.HaveParametrs)
@@ -509,14 +509,14 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"
-        public static IEnumerable<IEnumerable<{type}>> Execute{source.MethodName}Batch({source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.BatchType()} batch)
+        {source.AccessModifier.ToLowerInvariant()} static IEnumerable<IEnumerable<{type}>> Execute{source.MethodName}Batch({source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.BatchType()} batch)
         {{
 ");
             }
             else
             {
                 builder.Append($@"
-        public static async IAsyncEnumerable<IAsyncEnumerable<{type}>> Execute{source.MethodName}BatchAsync(
+        {source.AccessModifier.ToLowerInvariant()} static async IAsyncEnumerable<IAsyncEnumerable<{type}>> Execute{source.MethodName}BatchAsync(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.BatchType()} batch,
             [EnumeratorCancellation] CancellationToken cancellationToken = default
             )
@@ -586,7 +586,7 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"
-        public static {BatchCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}Batch(
+        {source.AccessModifier.ToLowerInvariant()} static {BatchCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}Batch(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.BatchType()} batch
 ");
                 BatchCommonBase.WriteMethodParametrs(source, builder);
@@ -599,7 +599,7 @@ StringBuilder builder
             else
             {
                 builder.Append($@"
-        public static async Task<{BatchCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}BatchAsync(
+        {source.AccessModifier.ToLowerInvariant()} static async Task<{BatchCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}BatchAsync(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.BatchType()} batch,
             CancellationToken cancellationToken = default
             )

diff --git a/Src/Gedaq/Base/Batch/QueryBatchReadBase.cs b/Src/Gedaq/Base/Batch/QueryBatchReadBase.cs
@@ -51,13 +51,13 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"        
-        public static IEnumerable<IEnumerable<{type}>> {source.MethodName}(
+        {source.AccessModifier.ToLowerInvariant()} static IEnumerable<IEnumerable<{type}>> {source.MethodName}(
 ");
             }
             else
             {
                 builder.Append($@"        
-        public static async IAsyncEnumerable<IAsyncEnumerable<{type}>> {source.MethodName}Async(
+        {source.AccessModifier.ToLowerInvariant()} static async IAsyncEnumerable<IAsyncEnumerable<{type}>> {source.MethodName}Async(
 ");
             }
         }

diff --git a/Src/Gedaq/Base/Batch/QueryBatchScalarNoQueryBase.cs b/Src/Gedaq/Base/Batch/QueryBatchScalarNoQueryBase.cs
@@ -84,13 +84,13 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"
-        public static {BatchCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}(
+        {source.AccessModifier.ToLowerInvariant()} static {BatchCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}(
 ");
             }
             else
             {
                 builder.Append($@"
-        public static async Task<{BatchCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}Async(
+        {source.AccessModifier.ToLowerInvariant()} static async Task<{BatchCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}Async(
 ");
             }
         }
@@ -104,13 +104,13 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"        
-        public static System.Int32 NonQuery{source.MethodName}(
+        {source.AccessModifier.ToLowerInvariant()} static System.Int32 NonQuery{source.MethodName}(
 ");
             }
             else
             {
                 builder.Append($@"        
-        public static async Task<System.Int32> NonQuery{source.MethodName}Async(
+        {source.AccessModifier.ToLowerInvariant()} static async Task<System.Int32> NonQuery{source.MethodName}Async(
 ");
             }
         }

diff --git a/Src/Gedaq/Base/Model/BaseMethodInfo.cs b/Src/Gedaq/Base/Model/BaseMethodInfo.cs
@@ -62,6 +62,11 @@ private AccessModifier GetAccessModifier(
             INamedTypeSymbol type
             )
         {
+            if(accessModifier != AccessModifier.AsContainingClass)
+            {
+                return accessModifier;
+            }
+
             if (type.DeclaredAccessibility == Accessibility.Private)
             {
                 return AccessModifier.Private;

diff --git a/Src/Gedaq/Base/Query/CommandGeneratorBase.cs b/Src/Gedaq/Base/Query/CommandGeneratorBase.cs
@@ -45,7 +45,7 @@ StringBuilder builder
         {
             builder.Append($@"
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static  {(methodType == MethodType.Async ? $"async Task<{ProviderInfo.CommandType()}>" : ProviderInfo.CommandType())} Create{source.MethodName}Command{(methodType == MethodType.Async ? "Async" : "")}(
+        {source.AccessModifier.ToLowerInvariant()} static  {(methodType == MethodType.Async ? $"async Task<{ProviderInfo.CommandType()}>" : ProviderInfo.CommandType())} Create{source.MethodName}Command{(methodType == MethodType.Async ? "Async" : "")}(
             {source.ContainTypeName.GCThisWordOrEmpty()}{sourceTypeName} {sourceParametrName}
 ");
             QueryCommonBase.AddFormatParametrs(source, builder);
@@ -215,14 +215,14 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"
-        public static IEnumerable<{source.MapTypeName.GetFullTypeName(true)}> Execute{source.MethodName}Command({source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.CommandType()} command)
+        {source.AccessModifier.ToLowerInvariant()} static IEnumerable<{source.MapTypeName.GetFullTypeName(true)}> Execute{source.MethodName}Command({source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.CommandType()} command)
         {{
 ");
             }
             else
             {
                 builder.Append($@"
-        public static async IAsyncEnumerable<{source.MapTypeName.GetFullTypeName(true)}> Execute{source.MethodName}CommandAsync(
+        {source.AccessModifier.ToLowerInvariant()} static async IAsyncEnumerable<{source.MapTypeName.GetFullTypeName(true)}> Execute{source.MethodName}CommandAsync(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.CommandType()} command,
             [EnumeratorCancellation] CancellationToken cancellationToken = default
             )
@@ -291,7 +291,7 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"        
-        public static {QueryCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}Command(
+        {source.AccessModifier.ToLowerInvariant()} static {QueryCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}Command(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.CommandType()} command
 ");
                 QueryCommonBase.AddParametrs(source, builder, true);
@@ -303,7 +303,7 @@ StringBuilder builder
             else
             {
                 builder.Append($@"        
-        public static async Task<{QueryCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}CommandAsync(
+        {source.AccessModifier.ToLowerInvariant()} static async Task<{QueryCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}CommandAsync(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.CommandType()} command
 ");
                 QueryCommonBase.AddParametrs(source, builder, false);
@@ -339,7 +339,7 @@ StringBuilder builder
         {
             builder.Append($@"
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static void Set{source.MethodName}Parametrs(
+        {source.AccessModifier.ToLowerInvariant()} static void Set{source.MethodName}Parametrs(
             {source.ContainTypeName.GCThisWordOrEmpty()}{ProviderInfo.CommandType()} command
 ");
             QueryCommonBase.AddParametrs(source, builder, false);

diff --git a/Src/Gedaq/Base/Query/QueryReadBase.cs b/Src/Gedaq/Base/Query/QueryReadBase.cs
@@ -61,13 +61,13 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"        
-        public static IEnumerable<{source.MapTypeName.GetFullTypeName(true)}> {source.MethodName}(
+        {source.AccessModifier.ToLowerInvariant()} static IEnumerable<{source.MapTypeName.GetFullTypeName(true)}> {source.MethodName}(
 ");
             }
             else
             {
                 builder.Append($@"        
-        public static async IAsyncEnumerable<{source.MapTypeName.GetFullTypeName(true)}> {source.MethodName}Async(
+        {source.AccessModifier.ToLowerInvariant()} static async IAsyncEnumerable<{source.MapTypeName.GetFullTypeName(true)}> {source.MethodName}Async(
 ");
             }
         }

diff --git a/Src/Gedaq/Base/Query/QueryScalarNonQueryBase.cs b/Src/Gedaq/Base/Query/QueryScalarNonQueryBase.cs
@@ -130,13 +130,13 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"        
-        public static System.Int32 NonQuery{source.MethodName}(
+        {source.AccessModifier.ToLowerInvariant()} static System.Int32 NonQuery{source.MethodName}(
 ");
             }
             else
             {
                 builder.Append($@"        
-        public static async Task<System.Int32> NonQuery{source.MethodName}Async(
+        {source.AccessModifier.ToLowerInvariant()} static async Task<System.Int32> NonQuery{source.MethodName}Async(
 ");
             }
         }
@@ -150,13 +150,13 @@ StringBuilder builder
             if (methodType == MethodType.Sync)
             {
                 builder.Append($@"        
-        public static {QueryCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}(
+        {source.AccessModifier.ToLowerInvariant()} static {QueryCommonBase.GetScalarTypeName(source, ProviderInfo)} Scalar{source.MethodName}(
 ");
             }
             else
             {
                 builder.Append($@"        
-        public static async Task<{QueryCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}Async(
+        {source.AccessModifier.ToLowerInvariant()} static async Task<{QueryCommonBase.GetScalarTypeName(source, ProviderInfo)}> Scalar{source.MethodName}Async(
 ");
             }
         }

diff --git a/Src/Gedaq/Gedaq.csproj b/Src/Gedaq/Gedaq.csproj
@@ -10,7 +10,7 @@
 	</ItemGroup>
 	<PropertyGroup>
 		<PackageId>Gedaq</PackageId>
-		<PackageVersion>1.2.1.0</PackageVersion>
+		<PackageVersion>1.4.0.0</PackageVersion>
 		<Authors>Brevnov Vyacheslav Sergeevich</Authors>
 		<RepositoryUrl>https://github.com/SoftStoneDevelop/Gedaq</RepositoryUrl>
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>

diff --git a/Src/Gedaq/Helpers/TypeHelper.cs b/Src/Gedaq/Helpers/TypeHelper.cs
@@ -75,7 +75,29 @@ internal static string GCDeclarationName(
             string extansionPrefix
             )
         {
-            return $@"{methodInfo.AccessModifier.ToLowerInvariant()} {type.GCStaticWordOrEmpty()} {type.GCPartialWordOrEmpty()} class {(type.IsPatrial() ? type.Name : $"{methodInfo.MethodName}{extansionPrefix}Extension")}";
+            return $@"{type.ToAccessModifier().ToLowerInvariant()} {type.GCStaticWordOrEmpty()} {type.GCPartialWordOrEmpty()} class {(type.IsPatrial() ? type.Name : $"{methodInfo.MethodName}{extansionPrefix}Extension")}";
+        }
+
+        internal static AccessModifier ToAccessModifier(
+            this INamedTypeSymbol type
+            )
+        {
+            if (type.DeclaredAccessibility == Accessibility.Private)
+            {
+                return AccessModifier.Private;
+            }
+
+            if (type.DeclaredAccessibility == Accessibility.Protected)
+            {
+                return AccessModifier.Protected;
+            }
+
+            if (type.DeclaredAccessibility == Accessibility.Internal)
+            {
+                return AccessModifier.Internal;
+            }
+
+            return AccessModifier.Public;
         }
     }
     internal static class TypeHelper

diff --git a/Src/Gedaq/Npgsql/Generators/BinaryExportGenerator.cs b/Src/Gedaq/Npgsql/Generators/BinaryExportGenerator.cs
@@ -87,7 +87,7 @@ private void StartMethod(BinaryExport binaryExport, NpgsqlSourceType sourceType,
             if(methodType == MethodType.Async)
             {
                 _methodCode.Append($@"
-        public static async IAsyncEnumerable<{binaryExport.MapTypeName.GetFullTypeName(true, true)}> {binaryExport.MethodName}Async(
+        {binaryExport.AccessModifier.ToLowerInvariant()} static async IAsyncEnumerable<{binaryExport.MapTypeName.GetFullTypeName(true, true)}> {binaryExport.MethodName}Async(
             {binaryExport.ContainTypeName.GCThisWordOrEmpty()}{sourceType.ToTypeName()} {sourceType.ToParametrName()},
             TimeSpan? timeout = null,
             [EnumeratorCancellation] CancellationToken cancellationToken = default
@@ -98,7 +98,7 @@ private void StartMethod(BinaryExport binaryExport, NpgsqlSourceType sourceType,
             else
             {
                 _methodCode.Append($@"
-        public static IEnumerable<{binaryExport.MapTypeName.GetFullTypeName(true, true)}> {binaryExport.MethodName}(
+        {binaryExport.AccessModifier.ToLowerInvariant()} static IEnumerable<{binaryExport.MapTypeName.GetFullTypeName(true, true)}> {binaryExport.MethodName}(
             {binaryExport.ContainTypeName.GCThisWordOrEmpty()}{sourceType.ToTypeName()} {sourceType.ToParametrName()},
             TimeSpan? timeout = null
             )

diff --git a/Src/Gedaq/Npgsql/Generators/BinaryImportGenerator.cs b/Src/Gedaq/Npgsql/Generators/BinaryImportGenerator.cs
@@ -101,7 +101,7 @@ bool isAsyncCollection
             if (methodType == MethodType.Async)
             {
                 _methodCode.Append($@"
-        public static async Task {binaryImport.MethodName}Async(
+        {binaryImport.AccessModifier.ToLowerInvariant()} static async Task {binaryImport.MethodName}Async(
             {binaryImport.ContainTypeName.GCThisWordOrEmpty()}{sourceType.ToTypeName()} {sourceType.ToParametrName()},
             {collectionType} collection,
             TimeSpan? timeout = null,
@@ -113,7 +113,7 @@ bool isAsyncCollection
             else
             {
                 _methodCode.Append($@"
-        public static void {binaryImport.MethodName}(
+        {binaryImport.AccessModifier.ToLowerInvariant()} static void {binaryImport.MethodName}(
             {binaryImport.ContainTypeName.GCThisWordOrEmpty()}{sourceType.ToTypeName()} {sourceType.ToParametrName()},
             {collectionType} collection,
             TimeSpan? timeout = null