Merge pull request #53 from skbkontur/a.dobrynin/datetimeoffset

added DateTimeOffset support
skbkontur · Nov 18, 2022 · 08fb140 · 08fb140
2 parents 0529cfd + 19072a5
commit 08fb140
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 0 deletions.
diff --git a/TypeScript.ContractGenerator.Tests/Files/CustomGenerator/nullable-types.ts b/TypeScript.ContractGenerator.Tests/Files/CustomGenerator/nullable-types.ts
@@ -14,6 +14,7 @@ export type SimpleNullableRootType = {
     sByte?: null | number;
     char?: null | string;
     dateTime?: null | (Date | string);
+    dateTimeOffset?: null | (Date | string);
     timeSpan?: null | string;
     guid?: null | string;
 };
diff --git a/TypeScript.ContractGenerator.Tests/Files/CustomGenerator/simple-types.ts b/TypeScript.ContractGenerator.Tests/Files/CustomGenerator/simple-types.ts
@@ -15,6 +15,7 @@ export type SimpleRootType = {
     char: string;
     string?: null | string;
     dateTime: (Date | string);
+    dateTimeOffset: (Date | string);
     timeSpan: string;
     guid: string;
 };
diff --git a/TypeScript.ContractGenerator.Tests/Files/SimpleGenerator/nullable-types.ts b/TypeScript.ContractGenerator.Tests/Files/SimpleGenerator/nullable-types.ts
@@ -14,6 +14,7 @@ export type SimpleNullableRootType = {
     sByte?: null | number;
     char?: null | string;
     dateTime?: null | (Date | string);
+    dateTimeOffset?: null | (Date | string);
     timeSpan?: null | (number | string);
     guid?: null | string;
 };
diff --git a/TypeScript.ContractGenerator.Tests/Files/SimpleGenerator/simple-types.ts b/TypeScript.ContractGenerator.Tests/Files/SimpleGenerator/simple-types.ts
@@ -15,6 +15,7 @@ export type SimpleRootType = {
     char: string;
     string?: null | string;
     dateTime: (Date | string);
+    dateTimeOffset: (Date | string);
     timeSpan: (number | string);
     guid: string;
 };
diff --git a/TypeScript.ContractGenerator.Tests/Types/SimpleNullableRootType.cs b/TypeScript.ContractGenerator.Tests/Types/SimpleNullableRootType.cs
@@ -18,6 +18,7 @@ public class SimpleNullableRootType
         public sbyte? SByte { get; set; }
         public char? Char { get; set; }
         public DateTime? DateTime { get; set; }
+        public DateTimeOffset? DateTimeOffset { get; set; }
         public TimeSpan? TimeSpan { get; set; }
         public Guid? Guid { get; set; }
     }

diff --git a/TypeScript.ContractGenerator.Tests/Types/SimpleRootType.cs b/TypeScript.ContractGenerator.Tests/Types/SimpleRootType.cs
@@ -19,6 +19,7 @@ public class SimpleRootType
         public char Char { get; set; }
         public string String { get; set; }
         public DateTime DateTime { get; set; }
+        public DateTimeOffset DateTimeOffset { get; set; }
         public TimeSpan TimeSpan { get; set; }
         public Guid Guid { get; set; }
     }

diff --git a/TypeScript.ContractGenerator/TypeBuilders/BuiltinTypeBuildingContext.cs b/TypeScript.ContractGenerator/TypeBuilders/BuiltinTypeBuildingContext.cs
@@ -39,6 +39,7 @@ protected override TypeScriptType ReferenceFromInternal(ITypeInfo type, TypeScri
                 {TypeInfo.From<double>(), "number"},
                 {TypeInfo.From<decimal>(), "number"},
                 {TypeInfo.From<DateTime>(), "(Date | string)"},
+                {TypeInfo.From<DateTimeOffset>(), "(Date | string)"},
                 {TypeInfo.From<TimeSpan>(), "(number | string)"},
                 {TypeInfo.From<string>(), "string"},
                 {TypeInfo.From<long>(), "number"},