DateOnly for Angular Reactive Forms

zijianhuang · Feb 8, 2025 · 6e4b070 · 6e4b070
1 parent 7eac9d3
commit 6e4b070
Show file tree

Hide file tree

Showing 166 changed files with 110,848 additions and 110,840 deletions.
diff --git a/Fonlow.OpenApiClientGen/Fonlow.OpenApiClientGen.csproj b/Fonlow.OpenApiClientGen/Fonlow.OpenApiClientGen.csproj
@@ -11,7 +11,7 @@
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<NeutralLanguage>en</NeutralLanguage>
 		<Copyright>Copyright © Zijian Huang 2021-$([System.DateTime]::Now.Year)</Copyright>
-		<Version>3.2.3</Version>
+		<Version>3.2.4</Version>
 		<PackageTags>Swagger, Open API Specification, C#, .NET Core, Web API, TypeScript, Angular, YAML</PackageTags>
 		<PackageReleaseNotes>.NET 9</PackageReleaseNotes>
 		<AnalysisLevel>latest-all</AnalysisLevel>

diff --git a/OpenApiClientGenCore.NG2FormGroup/CodeObjectHelperForNg2FormGroup.cs b/OpenApiClientGenCore.NG2FormGroup/CodeObjectHelperForNg2FormGroup.cs
@@ -11,12 +11,12 @@ namespace Fonlow.TypeScriptCodeDom
 	public class CodeObjectHelperForNg2FormGroup : CodeObjectHelper
 	{
 		readonly CodeNamespaceCollection codeNamespaceCollection;
-		readonly bool careForDateOnly;
+		readonly bool ngDateOnlyFormControlEnabled;
 
-		public CodeObjectHelperForNg2FormGroup(CodeNamespaceCollection codeNamespaceCollection, bool careForDateOnly = false) : base(true)
+		public CodeObjectHelperForNg2FormGroup(CodeNamespaceCollection codeNamespaceCollection, bool ngDateOnlyFormControlEnabled = false) : base(true)
 		{
 			this.codeNamespaceCollection = codeNamespaceCollection;
-			this.careForDateOnly = careForDateOnly;
+			this.ngDateOnlyFormControlEnabled = ngDateOnlyFormControlEnabled;
 		}
 
 		/// <summary>
@@ -210,6 +210,7 @@ string GetCodeMemberFieldTextForAngularFormGroup(CodeMemberField codeMemberField
 			bool isFieldDateOnly = false;
 			var customAttributes = codeMemberField.CustomAttributes;
 			var fieldName = codeMemberField.Name.EndsWith('?') ? codeMemberField.Name.Substring(0, codeMemberField.Name.Length - 1) : codeMemberField.Name;
+			var tsTypeName = RefineAngularFormControlTypeName(codeMemberField);
 			FieldTypeInfo fieldTypeInfo = codeMemberField.Type.UserData[UserDataKeys.FieldTypeInfo] as FieldTypeInfo;
 			if (fieldTypeInfo.ClrType == typeof(DateOnly) || fieldTypeInfo.ClrType == typeof(DateOnly?))
 			{
@@ -259,11 +260,11 @@ string GetCodeMemberFieldTextForAngularFormGroup(CodeMemberField codeMemberField
 				Console.WriteLine();
 
 				var text = String.Join(", ", validatorList);
-				var tsTypeName = RefineAngularFormControlTypeName(codeMemberField);
+
 
-				if (isFieldDateOnly && careForDateOnly)
+				if (isFieldDateOnly && ngDateOnlyFormControlEnabled)
 				{
-					return $"{fieldName}: CreateDateOnlyFormControl()";
+					return $"{fieldName}: CreateDateOnlyFormControl()"; // DateOnly field is generally with a date picker component, no validator expected? Until someone find a def with validation rules.
 				}
 				else
 				{
@@ -273,8 +274,14 @@ string GetCodeMemberFieldTextForAngularFormGroup(CodeMemberField codeMemberField
 			}
 			else
 			{
-				var tsTypeName = RefineAngularFormControlTypeName(codeMemberField);
-				return $"{fieldName}: new FormControl<{tsTypeName}>(undefined)";
+				if (isFieldDateOnly && ngDateOnlyFormControlEnabled)
+				{
+					return $"{fieldName}: CreateDateOnlyFormControl()";
+				}
+				else
+				{
+					return $"{fieldName}: new FormControl<{tsTypeName}>(undefined)";
+				}
 			}
 		}
 

diff --git a/OpenApiClientGenCore.NG2FormGroup/OpenApiClientGenCore.NG2FormGroup.csproj b/OpenApiClientGenCore.NG2FormGroup/OpenApiClientGenCore.NG2FormGroup.csproj
@@ -7,7 +7,7 @@
 		<Copyright>Copyright © Zijian Huang 2021-$([System.DateTime]::Now.Year)</Copyright>
 		<Authors>Zijian Huang</Authors>
 		<RootNamespace>Fonlow.OpenApiClientGen.NG2FormGroup</RootNamespace>
-		<Version>2.2</Version>
+		<Version>2.2.1</Version>
 		<AnalysisLevel>latest-all</AnalysisLevel>
 		<PackageReleaseNotes>DateOnly FormControl with NgDateOnlyFormControlEnabled</PackageReleaseNotes>
 	</PropertyGroup>