Merge pull request #47 from altasoft/feature/DateAndTime

Feature/date and time

Author: temonk

README.md

@@ -282,7 +282,7 @@ public readonly partial struct PositiveInteger : IEquatable<PositiveInteger>
     /// <param name="result">When this method returns, contains the created PositiveInteger if the conversion succeeded, or null if the conversion failed.</param>
     /// <param name="errorMessage">When this method returns, contains the error message if the conversion failed; otherwise, null.</param>
     /// <returns>true if the conversion succeeded; otherwise, false.</returns>
-    public static bool TryCreate(int value,[NotNullWhen(true)]  out PositiveInteger? result, [NotNullWhen(false)]  out string? errorMessage)
+    public static bool TryCreate(int value,[NotNullWhen(true)] out PositiveInteger? result, [NotNullWhen(false)] out string? errorMessage)
     {
         var validationResult = Validate(value);
         if (!validationResult.IsValid)

src/AltaSoft.DomainPrimitives.Generator/DomainPrimitiveGenerator.cs

@@ -21,9 +21,9 @@ public sealed class DomainPrimitiveGenerator : IIncrementalGenerator
     /// <param name="context">The generator initialization context.</param>
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
-        //#if DEBUG
-        //        System.Diagnostics.Debugger.Launch();
-        //#endif
+//#if DEBUG
+//        System.Diagnostics.Debugger.Launch();
+//#endif
 
         var domainPrimitivesToGenerate = context.SyntaxProvider.CreateSyntaxProvider(
                 predicate: static (node, _) => IsSyntaxTargetForGeneration(node),

src/AltaSoft.DomainPrimitives.Generator/Executor.cs

@@ -171,10 +171,11 @@ internal static void Execute(
             return null;
         }
 
-        if (serializationAttribute is not null && serializationAttribute.ConstructorArguments.Length != 0)
+        if (serializationAttribute is not null && serializationAttribute.ConstructorArguments.Length > 0)
         {
-            var value = serializationAttribute.ConstructorArguments[0];
-            generatorData.SerializationFormat = value.Value?.ToString();
+            var format = serializationAttribute.ConstructorArguments[0].Value?.ToString() ?? string.Empty;
+            var allowStandardFormats = (bool?)serializationAttribute.ConstructorArguments[1].Value != false;
+            generatorData.SerializationInfo = (format, allowStandardFormats);
         }
 
         if (isNumeric && globalOptions.GenerateNumericOperators)
@@ -385,7 +386,7 @@ private static void Process(GeneratorData data, string ctorCode, DomainPrimitive
             usings.Add("System.Xml.Serialization");
         }
 
-        if (data.SerializationFormat is not null)
+        if (data.SerializationInfo is not null)
         {
             usings.Add("System.Globalization");
         }

src/AltaSoft.DomainPrimitives.Generator/Helpers/DiagnosticHelper.cs

@@ -22,11 +22,11 @@ internal static Diagnostic GeneralError(Location? location, Exception ex)
             new DiagnosticDescriptor(
                 "AL1000",
                 "An exception was thrown by the AltaSoft.DomainPrimitiveGenerator generator",
-                "An exception was thrown by the AltaSoft.DomainPrimitiveGenerator generator: `{0}`{1}{2}",
+                "An exception was thrown by the AltaSoft.DomainPrimitiveGenerator generator: `{0}`",
                 Category,
                 DiagnosticSeverity.Error,
                 isEnabledByDefault: true),
-            location, ex, SourceCodeBuilder.s_newLine, ex.StackTrace);
+            location, ex.ToString());
     }
 
     /// <summary>

src/AltaSoft.DomainPrimitives.Generator/Helpers/MethodGeneratorHelper.cs

@@ -84,7 +84,7 @@ void AddMapping()
                     .Append("Type = ").Append(typeName).AppendLine(",");
 
                 if (!string.IsNullOrEmpty(format))
-                    builder.Append("Format = ").Append(QuoteAndEscape(data.SerializationFormat ?? format)).AppendLine(",");
+                    builder.Append("Format = ").Append(QuoteAndEscape(data.SerializationInfo?.serializationFormat ?? format)).AppendLine(",");
 
                 var title = data.ClassName;
                 builder.Append("Title = ").Append(Quote(title)).AppendLine(",");
@@ -165,7 +165,7 @@ internal static void ProcessTypeConverter(GeneratorData data, SourceProductionCo
             .AppendLine("public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)")
             .OpenBracket();
 
-        if (data.SerializationFormat is not null)
+        if (data.SerializationInfo is not null)
         {
             builder.AppendLine("if (value is string s)")
                 .OpenBracket()
@@ -184,16 +184,16 @@ internal static void ProcessTypeConverter(GeneratorData data, SourceProductionCo
         else
         {
             builder.AppendLine("var result = base.ConvertFrom(context, culture, value);")
-            .AppendLine("if (result is null)")
-            .AppendIndentation().AppendLine("return null;")
-            .AppendLine("try")
-            .OpenBracket()
-            .AppendLine($"return new {data.ClassName}(({data.PrimitiveTypeFriendlyName})result);")
-            .CloseBracket()
-            .AppendLine("catch (InvalidDomainValueException ex)")
-            .OpenBracket()
-            .Append("throw new FormatException(\"Cannot parse ").Append(data.ClassName).AppendLine("\", ex);")
-            .CloseBracket();
+                .AppendLine("if (result is null)")
+                .AppendIndentation().AppendLine("return null;")
+                .AppendLine("try")
+                .OpenBracket()
+                .AppendLine($"return new {data.ClassName}(({data.PrimitiveTypeFriendlyName})result);")
+                .CloseBracket()
+                .AppendLine("catch (InvalidDomainValueException ex)")
+                .OpenBracket()
+                .Append("throw new FormatException(\"Cannot parse ").Append(data.ClassName).AppendLine("\", ex);")
+                .CloseBracket();
         }
         builder.CloseBracket().CloseBracket();
 
@@ -306,7 +306,7 @@ internal static void ProcessJsonConverter(GeneratorData data, SourceProductionCo
                     "System.Text.Json.Serialization",
                     "System.Globalization",
                     "System.Text.Json.Serialization.Metadata",
-                    "AltaSoft.DomainPrimitives",
+                    "AltaSoft.DomainPrimitives"
                 };
 
         var converterName = data.UnderlyingType.ToString();
@@ -321,7 +321,7 @@ internal static void ProcessJsonConverter(GeneratorData data, SourceProductionCo
             .Append("public override ").Append(data.ClassName).AppendLine(" Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)")
             .OpenBracket();
 
-        if (data.SerializationFormat is null)
+        if (data.SerializationInfo is null)
         {
             var rawValueStr = $"JsonInternalConverters.{converterName}Converter.Read(ref reader, typeToConvert, options){(primitiveTypeIsValueType ? "" : "!")}";
 
@@ -350,25 +350,25 @@ internal static void ProcessJsonConverter(GeneratorData data, SourceProductionCo
         .NewLine();
 
         builder.AppendInheritDoc().AppendLine($"public override void Write(Utf8JsonWriter writer, {data.ClassName} value, JsonSerializerOptions options)")
-            .OpenBracket()
-            .AppendLineIf(data.SerializationFormat is null, $"JsonInternalConverters.{converterName}Converter.Write(writer, ({data.PrimitiveTypeFriendlyName})value, options);")
-            .AppendLineIf(data.SerializationFormat is not null, $"writer.WriteStringValue(value.ToString({QuoteAndEscape(data.SerializationFormat)}, CultureInfo.InvariantCulture));")
-            .CloseBracket()
-            .NewLine();
+            .OpenBracket();
+        if (data.SerializationInfo is null)
+            builder.AppendLine($"JsonInternalConverters.{converterName}Converter.Write(writer, ({data.PrimitiveTypeFriendlyName})value, options);");
+        else
+            builder.AppendLine($"writer.WriteStringValue(value.ToString({QuoteAndEscape(data.SerializationInfo.Value.serializationFormat)}, CultureInfo.InvariantCulture));");
+        builder.CloseBracket().NewLine();
 
         builder.AppendInheritDoc()
             .Append("public override ").Append(data.ClassName).AppendLine(" ReadAsPropertyName(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)")
             .OpenBracket();
 
-        if (data.SerializationFormat is null)
+        if (data.SerializationInfo is null)
         {
-
             var rawValueStr = $"JsonInternalConverters.{converterName}Converter.ReadAsPropertyName(ref reader, typeToConvert, options){(primitiveTypeIsValueType ? "" : "!")}";
 
             builder.AppendLine("try")
                 .OpenBracket()
                 .AppendLineIf(data.GenerateImplicitOperators, $"return {rawValueStr};")
-                .AppendLineIf(!data.GenerateImplicitOperators, $"return new({rawValueStr});")
+                .AppendLineIf(!data.GenerateImplicitOperators, $"return new ({rawValueStr});")
                 .CloseBracket();
         }
         else
@@ -392,10 +392,12 @@ internal static void ProcessJsonConverter(GeneratorData data, SourceProductionCo
 
         builder.AppendInheritDoc()
             .Append("public override void WriteAsPropertyName(Utf8JsonWriter writer, ").Append(data.ClassName).AppendLine(" value, JsonSerializerOptions options)")
-            .OpenBracket()
-                .AppendLineIf(data.SerializationFormat is null, $"JsonInternalConverters.{converterName}Converter.WriteAsPropertyName(writer, ({data.PrimitiveTypeFriendlyName})value, options);")
-            .AppendLineIf(data.SerializationFormat is not null, $"writer.WritePropertyName(value.ToString({QuoteAndEscape(data.SerializationFormat)}, CultureInfo.InvariantCulture));")
-            .CloseBracket();
+            .OpenBracket();
+        if (data.SerializationInfo is null)
+            builder.AppendLine($"JsonInternalConverters.{converterName}Converter.WriteAsPropertyName(writer, ({data.PrimitiveTypeFriendlyName})value, options);");
+        else
+            builder.AppendLine($"writer.WritePropertyName(value.ToString({QuoteAndEscape(data.SerializationInfo.Value.serializationFormat)}, CultureInfo.InvariantCulture));");
+        builder.CloseBracket();
 
         builder.CloseBracket();
 
@@ -427,8 +429,8 @@ internal static void GenerateMandatoryMethods(GeneratorData data, SourceCodeBuil
             .AppendParamDescription("errorMessage", "When this method returns, contains the error message if the conversion failed; otherwise, null.")
             .AppendReturnsDescription("true if the conversion succeeded; otherwise, false.");
 
-        builder.Append("public static bool TryCreate(").Append(primitiveType).Append(" value, [NotNullWhen(true)]  out ").Append(data.ClassName)
-            .AppendLine("? result, [NotNullWhen(false)]  out string? errorMessage)")
+        builder.Append("public static bool TryCreate(").Append(primitiveType).Append(" value, [NotNullWhen(true)] out ").Append(data.ClassName)
+            .AppendLine("? result, [NotNullWhen(false)] out string? errorMessage)")
             .OpenBracket();
 
         if (data.UseTransformMethod)
@@ -796,7 +798,7 @@ public static void GenerateParsable(GeneratorData data, SourceCodeBuilder builde
         var underlyingType = data.ParentSymbols.Count == 0
             ? data.PrimitiveTypeFriendlyName
             : data.ParentSymbols[0].Name;
-        var format = data.SerializationFormat;
+        var format = data.SerializationInfo?.serializationFormat;
 
         builder.AppendInheritDoc()
             .AppendLine("[MethodImpl(MethodImplOptions.AggressiveInlining)]")
@@ -823,8 +825,17 @@ public static void GenerateParsable(GeneratorData data, SourceCodeBuilder builde
         }
         else
         {
-            builder.Append($"{underlyingType}.")
-                .AppendIfElse(format is null, "Parse(s, provider)", $"ParseExact(s, {QuoteAndEscape(format!)}, provider)");
+            builder.Append($"{underlyingType}.");
+            if (format is null && !data.UnderlyingType.IsDateOrTime())
+            {
+                builder.Append("Parse(s, provider)");
+            }
+            else
+            {
+                builder.Append(format is null
+                    ? "ParseFlexible(s, provider)"
+                    : $"ParseFlexible(s, {QuoteAndEscape(format)}, {(data.SerializationInfo!.Value.allowStandardFormats ? "true" : "false")}, provider)");
+            }
         }
 
         builder.AppendLine(!data.GenerateImplicitOperators ? ");" : ";");
@@ -849,21 +860,24 @@ public static void GenerateParsable(GeneratorData data, SourceCodeBuilder builde
         }
         else
         {
-            var style = "";
-            if (format is not null)
+            if (format is null && !data.UnderlyingType.IsDateOrTime())
             {
-                style = data.UnderlyingType == DomainPrimitiveUnderlyingType.TimeSpan ? "TimeSpanStyles.None" : "DateTimeStyles.None";
+                builder.Append($"if (!{underlyingType}.TryParse(s, provider, out var value))");
+            }
+            else
+            {
+                builder.Append(format is null
+                    ? $"if (!{underlyingType}.TryParseFlexible(s, provider, out var value))"
+                    : $"if (!{underlyingType}.TryParseFlexible(s, {QuoteAndEscape(format)}, {(data.SerializationInfo!.Value.allowStandardFormats ? "true" : "false")}, provider, out var value))");
             }
-
-            builder.AppendIf(format is null, $"if (!{underlyingType}.TryParse(s, provider, out var value))")
-                .AppendIf(format is not null, $"if (!{underlyingType}.TryParseExact(s, {QuoteAndEscape(format)}, provider, {style}, out var value))");
         }
 
-        builder.OpenBracket()
-        .AppendLine("result = default;")
-        .AppendLine("return false;")
-        .CloseBracket()
-        .NewLine();
+        builder
+            .OpenBracket()
+            .AppendLine("result = default;")
+            .AppendLine("return false;")
+            .CloseBracket()
+            .NewLine();
 
         if (!data.TypeSymbol.IsValueType)
         {
@@ -1037,7 +1051,7 @@ public static void GenerateIXmlSerializableMethods(GeneratorData data, SourceCod
 
         string method;
 
-        if (data.UnderlyingType.IsDateOrTime() && data.SerializationFormat is not null)
+        if (data.UnderlyingType.IsDateOrTime() && data.SerializationInfo is not null)
         {
             method = "ReadElementContentAs" + data.PrimitiveTypeFriendlyName;
         }
@@ -1056,9 +1070,14 @@ public static void GenerateIXmlSerializableMethods(GeneratorData data, SourceCod
         builder.AppendInheritDoc();
         builder.AppendLine("public void ReadXml(XmlReader reader)")
             .OpenBracket()
-            .Append("var value = reader.").Append(method)
-            .AppendLineIfElse(data.SerializationFormat is not null, $"({QuoteAndEscape(data.SerializationFormat)});", "();")
-            .AppendLine("ValidateOrThrow(value);")
+            .Append("var value = reader.").Append(method);
+
+        if (data.SerializationInfo is { } serInfo)
+            builder.AppendLine($"({QuoteAndEscape(serInfo.serializationFormat)}, {(serInfo.allowStandardFormats ? "true" : "false")});");
+        else
+            builder.AppendLine("();");
+
+        builder.AppendLine("ValidateOrThrow(value);")
             .AppendLine("System.Runtime.CompilerServices.Unsafe.AsRef(in _value) = value;")
             .AppendLine("System.Runtime.CompilerServices.Unsafe.AsRef(in _isInitialized) = true;")
             .CloseBracket()
@@ -1068,10 +1087,10 @@ public static void GenerateIXmlSerializableMethods(GeneratorData data, SourceCod
 
         if (string.Equals(data.PrimitiveTypeFriendlyName, "string", System.StringComparison.Ordinal))
             builder.AppendLine($"public void WriteXml(XmlWriter writer) => writer.WriteString({data.FieldName});");
-        else if (data.SerializationFormat is null)
+        else if (data.SerializationInfo is null)
             builder.AppendLine($"public void WriteXml(XmlWriter writer) => writer.WriteValue((({data.PrimitiveTypeFriendlyName}){data.FieldName}).ToXmlString());");
         else
-            builder.AppendLine($"public void WriteXml(XmlWriter writer) => writer.WriteString({data.FieldName}.ToString({QuoteAndEscape(data.SerializationFormat)}));");
+            builder.AppendLine($"public void WriteXml(XmlWriter writer) => writer.WriteString({data.FieldName}.ToString({QuoteAndEscape(data.SerializationInfo?.serializationFormat)}));");
         builder.NewLine();
     }
 

src/AltaSoft.DomainPrimitives.Generator/Helpers/SourceCodeBuilder.cs

@@ -236,6 +236,7 @@ public SourceCodeBuilder AppendUsings(IEnumerable<string> usings)
     /// <param name="condition">A Boolean value indicating whether to append the string.</param>
     /// <param name="line">The string to append if the condition is met.</param>
     /// <returns>A reference to this <see cref="SourceCodeBuilder"/> instance.</returns>
+    [Obsolete("Use Append instead.")]
     public SourceCodeBuilder AppendIf(bool condition, string line) => !condition ? this : Append(line);
 
     /// <summary>
@@ -245,6 +246,7 @@ public SourceCodeBuilder AppendUsings(IEnumerable<string> usings)
     /// <param name="ifLine">The string to append on a new line if the condition is true.</param>
     /// <param name="elseLine">The string to append on a new line if the condition is false.</param>
     /// <returns>A reference to this <see cref="SourceCodeBuilder"/> instance.</returns>
+    [Obsolete("Use AppendIfElse instead.")]
     public SourceCodeBuilder AppendIfElse(bool condition, string ifLine, string elseLine) => Append(condition ? ifLine : elseLine);
 
     /// <summary>
@@ -253,6 +255,7 @@ public SourceCodeBuilder AppendUsings(IEnumerable<string> usings)
     /// <param name="condition">A Boolean value indicating whether to append the string.</param>
     /// <param name="line">The string to append on a new line if the condition is met.</param>
     /// <returns>A reference to this <see cref="SourceCodeBuilder"/> instance.</returns>
+    [Obsolete("Use AppendLine instead.")]
     public SourceCodeBuilder AppendLineIf(bool condition, string line) => !condition ? this : AppendLine(line);
 
     /// <summary>
@@ -262,6 +265,7 @@ public SourceCodeBuilder AppendUsings(IEnumerable<string> usings)
     /// <param name="ifLine">The string to append on a new line if the condition is true.</param>
     /// <param name="elseLine">The string to append on a new line if the condition is false.</param>
     /// <returns>A reference to this <see cref="SourceCodeBuilder"/> instance.</returns>
+    [Obsolete("Use AppendLineIfElse instead.")]
     public SourceCodeBuilder AppendLineIfElse(bool condition, string ifLine, string elseLine) => AppendLine(condition ? ifLine : elseLine);
 
     /// <summary>
@@ -307,6 +311,7 @@ public SourceCodeBuilder AppendUsings(IEnumerable<string> usings)
     /// <param name="condition">A boolean indicating whether to append the line.</param>
     /// <param name="line">The line of text to be appended.</param>
     /// <returns>A reference to this <see cref="SourceCodeBuilder"/> instance.</returns>
+    [Obsolete("Use Continue instead.")]
     public SourceCodeBuilder ContinueIf(bool condition, string line) => !condition ? this : Continue(line);
 
     /// <summary>

src/AltaSoft.DomainPrimitives.Generator/Models/GeneratorData.cs

@@ -94,10 +94,10 @@ internal sealed class GeneratorData
     public bool GenerateImplicitOperators { get; set; }
 
     /// <summary>
-    /// Gets or sets the serialization format (if applicable).
+    /// Gets or sets the serialization information, including format and whether standard formats are allowed.
     /// </summary>
-    public string? SerializationFormat { get; set; }
-
+    public (string serializationFormat, bool allowStandardFormats)? SerializationInfo { get; set; }
+  
     /// <summary>
     /// Gets or sets a value indicating whether to generate ISpanFormattable methods.
     /// </summary>