If it is a List type and contains an Enum, delete the condition that …

…must not be Nullable.
elky84 · Dec 28, 2023 · 4b991ff · 4b991ff
1 parent d22bb54
commit 4b991ff
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 14 deletions.
diff --git a/ExcelCli/ExcelCli.csproj b/ExcelCli/ExcelCli.csproj
@@ -12,7 +12,7 @@
 		<PackAsTool>true</PackAsTool>
 		<ToolCommandName>excel2dotnet</ToolCommandName>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<Version>1.0.35</Version>
+		<Version>1.0.36</Version>
 
 		<PackageDescription>Excel To Dotnet</PackageDescription>
 		<RepositoryUrl>https://github.com/elky84/ExcelToDotnet</RepositoryUrl>
@@ -23,7 +23,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<None Include="..\README.md" Pack="true" PackagePath="\"/>
+		<None Include="..\README.md" Pack="true" PackagePath="\" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/ExcelToDotnet/ExcelToDotnet.csproj b/ExcelToDotnet/ExcelToDotnet.csproj
@@ -6,7 +6,7 @@
 		<Nullable>enable</Nullable>
 
 		<PackageId>ExcelToDotnet</PackageId>
-		<Version>1.0.35</Version>
+		<Version>1.0.36</Version>
 		<Authors>elky</Authors>
 		<Company>elky</Company>
 		<PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/ExcelToDotnet/Extend/CodeGenerateExtend.cs b/ExcelToDotnet/Extend/CodeGenerateExtend.cs
@@ -31,7 +31,7 @@ public static void GenerateCode(this List<string> strings, StreamWriter outputFi
                 {
                     strings.Insert(insertIndex, string.Format($"        [JsonConverter(typeof(JsonEnumConverter<{dataType.RemoveSpecialCharacters()}>))]"));
                 }
-                else if (dataType.StartsWith("List") && (dataType.EndsWith("Type>?") || dataType.EndsWith("Type>")))
+                else if (dataType.StartsWith("List") && (dataType.EndsWith("Type>?") || dataType.EndsWith("Type>") || dataType.EndsWith("Type?>")))
                 {
                     strings.Insert(insertIndex, string.Format($"        [JsonConverter(typeof(JsonEnumsConverter<{dataType.ExtractDataTypeInList().RemoveSpecialCharacters()}>))]"));
                 }

diff --git a/ExcelToDotnet/Validation.cs b/ExcelToDotnet/Validation.cs
@@ -570,21 +570,12 @@ public static void ValidateDataType(this DataTable dt, string keyword, List<stri
                     continue;
                 }
 
-                if (IsListType(dataType))
-                {
-                    if (dataType.Contains("Type") && dataType.Contains("?>"))
-                    {
-                        Failed($"[{keyword}] List타입이고, Enum을 담고 있다면 Nullable이 아니어야만 합니다 <Table:{dt.TableName}, Column:{dt.Columns[index].ColumnName}, dataType:{dataType}>");
-                    }
-                    continue;
-                }
-
                 if (File.Exists($"output/{keyword}/{dataType}.Json"))
                 {
                     continue;
                 }
 
-                if (!dataType.EndsWith("Type") && !dataType.EndsWith("Type?"))
+                if (!IsListType(dataType) && !dataType.EndsWith("Type") && !dataType.EndsWith("Type?"))
                 {
                     Failed($"[{keyword}] 참조 컬럼이 아니고, 기본형 타입, List 타입이 아니라면, Type 또는 Type? 으로 끝나야 합니다. <Table:{dt.TableName}, Column:{dt.Columns[index].ColumnName}, dataType:{dataType}>");
                 }

diff --git a/README.md b/README.md
@@ -218,6 +218,9 @@ execute file name `excel2dotnet` instead of `ExcelCli`
 
 ## Version History
 
+### v1.0.36
+* If it is a List type and contains an Enum, delete the condition that must not be Nullable.
+
 ### v1.0.35
 * Fix Probability validation error.