Add DateTimeOffset for Csv Schema Inference

.gitignore

@@ -23,4 +23,5 @@ paket-files
 TestResults
 *.log
 .vscode
-.idea
+.idea
+.ionide

docs/content/library/CsvProvider.fsx

@@ -269,6 +269,9 @@ specify the units of measure. This will override both `AssumeMissingValues` and
 * `date`
 * `date?`
 * `date option`
+* `datetimeoffset`
+* `datetimeoffset?`
+* `datetimeoffset option`
 * `guid`
 * `guid?`
 * `guid option`

docs/content/library/XmlProvider.fsx

@@ -403,7 +403,7 @@ When the file includes other schema files, the `ResolutionFolder` parameter can
 The uri may also refer to online resources:
 *)
 
-type RssXsd = XmlProvider<Schema = "http://europa.eu/rapid/conf/RSS20.xsd">
+type RssXsd = XmlProvider<Schema = "https://www.w3schools.com/xml/note.xsd">
 
 (**
 

src/CommonRuntime/StructuralTypes.fs

@@ -1,4 +1,4 @@
-namespace FSharp.Data.Runtime.StructuralTypes
+namespace FSharp.Data.Runtime.StructuralTypes
 
 open System
 open FSharp.Data.Runtime
@@ -33,6 +33,7 @@ and [<RequireQualifiedAccess>] InferedTypeTag =
   | Json
   | DateTime
   | TimeSpan
+  | DateTimeOffset
   | Guid
   // Collections and sum types
   | Collection 
@@ -123,6 +124,7 @@ type InferedTypeTag with
     | String -> "String"
     | DateTime -> "DateTime"
     | TimeSpan -> "TimeSpan"
+    | DateTimeOffset -> "DateTimeOffset"
     | Guid -> "Guid"
     | Collection -> "Array"
     | Heterogeneous -> "Choice"
@@ -147,6 +149,7 @@ type InferedTypeTag with
     | "String" -> String 
     | "DateTime" -> DateTime
     | "TimeSpan" -> TimeSpan
+    | "DateTimeOffset" -> DateTimeOffset
     | "Guid" -> Guid
     | "Array" -> Collection
     | "Choice" -> Heterogeneous

src/Csv/CsvInference.fs

@@ -13,32 +13,35 @@ open FSharp.Data.Runtime.StructuralInference
 /// The schema may be set explicitly. This table specifies the mapping
 /// from the names that users can use to the types used.
 let private nameToType =
-  ["int" ,           (typeof<int>     , TypeWrapper.None    )
-   "int64",          (typeof<int64>   , TypeWrapper.None    )
-   "bool",           (typeof<bool>    , TypeWrapper.None    )
-   "float",          (typeof<float>   , TypeWrapper.None    )
-   "decimal",        (typeof<decimal> , TypeWrapper.None    )
-   "date",           (typeof<DateTime>, TypeWrapper.None    )
-   "timespan",       (typeof<TimeSpan>, TypeWrapper.None    )
-   "guid",           (typeof<Guid>    , TypeWrapper.None    )
-   "string",         (typeof<String>  , TypeWrapper.None    )
-   "int?",           (typeof<int>     , TypeWrapper.Nullable)
-   "int64?",         (typeof<int64>   , TypeWrapper.Nullable)
-   "bool?",          (typeof<bool>    , TypeWrapper.Nullable)
-   "float?",         (typeof<float>   , TypeWrapper.Nullable)
-   "decimal?",       (typeof<decimal> , TypeWrapper.Nullable)
-   "date?",          (typeof<DateTime>, TypeWrapper.Nullable)
-   "timespan?",      (typeof<TimeSpan>, TypeWrapper.Nullable)
-   "guid?",          (typeof<Guid>    , TypeWrapper.Nullable)
-   "int option",     (typeof<int>     , TypeWrapper.Option  )
-   "int64 option",   (typeof<int64>   , TypeWrapper.Option  )
-   "bool option",    (typeof<bool>    , TypeWrapper.Option  )
-   "float option",   (typeof<float>   , TypeWrapper.Option  )
-   "decimal option", (typeof<decimal> , TypeWrapper.Option  )
-   "date option",    (typeof<DateTime>, TypeWrapper.Option  )
-   "timespan option",(typeof<TimeSpan>, TypeWrapper.Option  )
-   "guid option",    (typeof<Guid>    , TypeWrapper.Option  )
-   "string option",  (typeof<string>  , TypeWrapper.Option  )]
+  ["int" ,                 (typeof<int>           , TypeWrapper.None    )
+   "int64",                (typeof<int64>         , TypeWrapper.None    )
+   "bool",                 (typeof<bool>          , TypeWrapper.None    )
+   "float",                (typeof<float>         , TypeWrapper.None    )
+   "decimal",              (typeof<decimal>       , TypeWrapper.None    )
+   "date",                 (typeof<DateTime>      , TypeWrapper.None    )
+   "datetimeoffset",       (typeof<DateTimeOffset>, TypeWrapper.None    )
+   "timespan",             (typeof<TimeSpan>      , TypeWrapper.None    )
+   "guid",                 (typeof<Guid>          , TypeWrapper.None    )
+   "string",               (typeof<String>        , TypeWrapper.None    )
+   "int?",                 (typeof<int>           , TypeWrapper.Nullable)
+   "int64?",               (typeof<int64>         , TypeWrapper.Nullable)
+   "bool?",                (typeof<bool>          , TypeWrapper.Nullable)
+   "float?",               (typeof<float>         , TypeWrapper.Nullable)
+   "decimal?",             (typeof<decimal>       , TypeWrapper.Nullable)
+   "date?",                (typeof<DateTime>      , TypeWrapper.Nullable)
+   "datetimeoffset?",      (typeof<DateTimeOffset>, TypeWrapper.Nullable)
+   "timespan?",            (typeof<TimeSpan>      , TypeWrapper.Nullable)
+   "guid?",                (typeof<Guid>          , TypeWrapper.Nullable)
+   "int option",           (typeof<int>           , TypeWrapper.Option  )
+   "int64 option",         (typeof<int64>         , TypeWrapper.Option  )
+   "bool option",          (typeof<bool>          , TypeWrapper.Option  )
+   "float option",         (typeof<float>         , TypeWrapper.Option  )
+   "decimal option",       (typeof<decimal>       , TypeWrapper.Option  )
+   "date option",          (typeof<DateTime>      , TypeWrapper.Option  )
+   "datetimeoffset option",(typeof<DateTimeOffset>, TypeWrapper.Option  )
+   "timespan option",      (typeof<TimeSpan>      , TypeWrapper.Option  )
+   "guid option",          (typeof<Guid>          , TypeWrapper.Option  )
+   "string option",        (typeof<string>        , TypeWrapper.Option  )]
   |> dict
 
 let private nameAndTypeRegex = lazy Regex(@"^(?<name>.+)\((?<type>.+)\)$", RegexOptions.Compiled ||| RegexOptions.RightToLeft)

src/Json/JsonRuntime.fs

@@ -201,6 +201,9 @@ type JsonRuntime =
         let cultureInfo = TextRuntime.GetCulture cultureStr
         fun json -> (JsonConversions.AsDateTimeOffset cultureInfo json).IsSome ||
                     (JsonConversions.AsDateTime cultureInfo json).IsSome
+    | InferedTypeTag.DateTimeOffset ->
+        let cultureInfo = TextRuntime.GetCulture cultureStr
+        fun json -> (JsonConversions.AsDateTimeOffset cultureInfo json).IsSome
     | InferedTypeTag.TimeSpan -> 
         JsonConversions.AsTimeSpan (TextRuntime.GetCulture cultureStr)
         >> Option.isSome

src/WorldBank/WorldBankProvider.fs

@@ -24,7 +24,7 @@ type public WorldBankProvider(cfg:TypeProviderConfig) as this =
     let asm = System.Reflection.Assembly.GetExecutingAssembly()
     let ns = "FSharp.Data" 
 
-    let defaultServiceUrl = "http://api.worldbank.org"
+    let defaultServiceUrl = "http://api.worldbank.org/v2"
     let cacheDuration = TimeSpan.FromDays 30.0
     let restCache = createInternetFileCache "WorldBankSchema" cacheDuration
 

src/WorldBank/WorldBankRuntime.fs

@@ -1,4 +1,4 @@
-// --------------------------------------------------------------------------------------
+// --------------------------------------------------------------------------------------
 // WorldBank type provider - runtime components 
 // --------------------------------------------------------------------------------------
 
@@ -184,7 +184,7 @@ module Implementation =
                           countryOrRegionCode
                           "indicators"
                           indicatorCode ]
-                        [ "date", "1900:2050" ]
+                        [ "date", "" ]
                         "date"
                     return 
                       seq { for k, v in data do

tests/FSharp.Data.DesignTime.Tests/SignatureTestCases.config

@@ -33,7 +33,6 @@ Xml,TypeInference.xml,false,false,,false,
 Xml,SampleAzureServiceManagement.xml,false,false,,true,
 Xml,TimeSpans.xml,false,false,,true,
 Xml,,false,false,,false,po.xsd
-Xml,,false,false,,false,http://europa.eu/rapid/conf/RSS20.xsd
 Xml,,false,false,,false,homonim.xsd
 Xml,,false,false,,false,IncludeFromWeb.xsd
 Json,WorldBank.json,false,WorldBank,,true