Merge branch 'main' of https://github.com/fsprojects/FSharp.Data

Author: dsyme

src/FSharp.Data.DesignTime/Csv/CsvGenerator.fs

@@ -99,6 +99,35 @@ module internal CsvTypeBuilder =
         for field in fields do
             rowType.AddMember field.ProvidedProperty
 
+        // Add With* methods so users can create a modified copy of a row
+        // e.g. myRow.WithAmount(42.0) returns a new Row identical to myRow except Amount = 42.0
+        for targetIdx, targetField in List.indexed fields do
+            let methodName = "With" + targetField.ProvidedProperty.Name
+
+            let withMethod =
+                ProvidedMethod(
+                    methodName,
+                    [ ProvidedParameter(targetField.ProvidedParameter.Name, targetField.ProvidedProperty.PropertyType) ],
+                    rowType,
+                    invokeCode =
+                        fun args ->
+                            let row = args.[0]
+                            let newVal = args.[1]
+
+                            match fields with
+                            | [ _ ] ->
+                                // Single-column CSV: Row erases to the value itself
+                                newVal
+                            | _ ->
+                                let tupleArgs =
+                                    fields
+                                    |> List.mapi (fun i _ -> if i = targetIdx then newVal else Expr.TupleGet(row, i))
+
+                                Expr.NewTuple tupleArgs
+                )
+
+            rowType.AddMember withMethod
+
         // The erased csv type will be parameterised by the tuple type
         let csvErasedTypeWithRowErasedType =
             typedefof<CsvFile<_>>.MakeGenericType(rowErasedType)

src/FSharp.Data.DesignTime/Json/JsonGenerator.fs

@@ -651,7 +651,7 @@ module JsonTypeBuilder =
 
                               let name = makeUnique prop.Name
 
-                              prop.Name,
+                              (prop.Name, name),
                               [ ProvidedProperty(name, convertedType, getterCode = getter) ],
                               ProvidedParameter(
                                   (if ctx.UseOriginalNames then
@@ -661,7 +661,8 @@ module JsonTypeBuilder =
                                   replaceJDocWithJValue ctx convertedType
                               ) ]
 
-                    let names, properties, parameters = List.unzip3 members
+                    let namePairs, properties, parameters = List.unzip3 members
+                    let names = namePairs |> List.map fst
                     let properties = properties |> List.concat
                     objectTy.AddMembers properties
 
@@ -685,6 +686,34 @@ module JsonTypeBuilder =
                         let ctor = ProvidedConstructor(parameters, invokeCode = ctorCode)
                         objectTy.AddMember ctor
 
+                        // Add With* methods: WithPropName(newValue) returns a new record with one field updated
+                        for i, (rawName, displayName) in List.indexed namePairs do
+                            let param = parameters.[i]
+                            let cultureStr = ctx.CultureStr
+
+                            let withMethod =
+                                ProvidedMethod(
+                                    "With" + displayName,
+                                    [ ProvidedParameter(param.Name, param.ParameterType) ],
+                                    objectTy,
+                                    invokeCode =
+                                        fun args ->
+                                            let jDoc = args.[0]
+                                            let newVal = args.[1]
+                                            let newValObj = Expr.Coerce(newVal, typeof<obj>)
+
+                                            <@@
+                                                JsonRuntime.WithRecordProperty(
+                                                    (%%jDoc: IJsonDocument),
+                                                    rawName,
+                                                    %%newValObj,
+                                                    cultureStr
+                                                )
+                                            @@>
+                                )
+
+                            objectTy.AddMember withMethod
+
                     ()
 
                 if ctx.GenerateConstructors then

src/FSharp.Data.DesignTime/Xml/XmlProvider.fs

@@ -51,7 +51,8 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
         let schema = args.[8] :?> string
         let inferenceMode = args.[9] :?> InferenceMode
         let preferDateOnly = args.[10] :?> bool
-        let useOriginalNames = args.[11] :?> bool
+        let dtdProcessing = args.[11] :?> string
+        let useOriginalNames = args.[12] :?> bool
 
         let inferenceMode =
             InferenceMode'.FromPublicApi(inferenceMode, inferTypesFromValues)
@@ -103,7 +104,8 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
 
                 { GeneratedType = tpType
                   RepresentationType = result.ConvertedType
-                  CreateFromTextReader = fun reader -> result.Converter <@@ XmlElement.Create(%reader) @@>
+                  CreateFromTextReader =
+                    fun reader -> result.Converter <@@ XmlElement.Create(%reader, dtdProcessing) @@>
                   CreateListFromTextReader = None
                   CreateFromTextReaderForSampleList =
                     fun reader -> // hack: this will actually parse the schema
@@ -117,10 +119,10 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
                     use _holder = IO.logTime "Parsing" sample
 
                     if sampleIsList then
-                        XmlElement.CreateList(new StringReader(value))
+                        XmlElement.CreateList(new StringReader(value), dtdProcessing)
                         |> Array.map (fun doc -> doc.XElement)
                     else
-                        [| XDocument.Parse(value).Root |]
+                        [| XmlElement.Create(new StringReader(value), dtdProcessing).XElement |]
 
                 let inferedType =
                     use _holder = IO.logTime "Inference" sample
@@ -159,10 +161,11 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
 
                 { GeneratedType = tpType
                   RepresentationType = result.ConvertedType
-                  CreateFromTextReader = fun reader -> result.Converter <@@ XmlElement.Create(%reader) @@>
+                  CreateFromTextReader =
+                    fun reader -> result.Converter <@@ XmlElement.Create(%reader, dtdProcessing) @@>
                   CreateListFromTextReader = None
                   CreateFromTextReaderForSampleList =
-                    fun reader -> result.Converter <@@ XmlElement.CreateList(%reader) @@>
+                    fun reader -> result.Converter <@@ XmlElement.CreateList(%reader, dtdProcessing) @@>
                   CreateFromValue = None }
 
         let source =
@@ -199,6 +202,7 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
               parameterDefaultValue = InferenceMode.BackwardCompatible
           )
           ProvidedStaticParameter("PreferDateOnly", typeof<bool>, parameterDefaultValue = false)
+          ProvidedStaticParameter("DtdProcessing", typeof<string>, parameterDefaultValue = "Ignore")
           ProvidedStaticParameter("UseOriginalNames", typeof<bool>, parameterDefaultValue = false) ]
 
     let helpText =
@@ -224,6 +228,7 @@ type public XmlProvider(cfg: TypeProviderConfig) as this =
               Note inline schemas are not used from Xsd documents.
            </param>
            <param name='PreferDateOnly'>When true on .NET 6+, date-only strings are inferred as DateOnly and time-only strings as TimeOnly. Defaults to false for backward compatibility.</param>
+           <param name='DtdProcessing'>Controls how DTD declarations in the XML are handled. Accepted values: "Ignore" (default, silently skips DTD processing, safe for most cases), "Prohibit" (throws on any DTD declaration), "Parse" (enables full DTD processing including entity expansion, use with caution).</param>
            <param name='UseOriginalNames'>When true, XML element and attribute names are used as-is for generated property names instead of being normalized to PascalCase. Defaults to false.</param>"""
 
 

src/FSharp.Data.Json.Core/JsonRuntime.fs

@@ -351,6 +351,31 @@ type JsonRuntime =
 
         JsonDocument.Create(json, "")
 
+    // Returns a new JSON record document with one property replaced (or added if absent).
+    // Used by generated With* methods.
+    static member WithRecordProperty(doc: IJsonDocument, name: string, value: obj, cultureStr: string) =
+        let cultureInfo = TextRuntime.GetCulture cultureStr
+        let newPropValue = JsonRuntime.ToJsonValue cultureInfo value
+        let existingProps = JsonRuntime.GetRecordProperties(doc)
+        let mutable found = false
+
+        let updatedProps =
+            existingProps
+            |> Array.map (fun (k, v) ->
+                if k = name then
+                    found <- true
+                    k, newPropValue
+                else
+                    k, v)
+
+        let finalProps =
+            if found then
+                updatedProps
+            else
+                Array.append updatedProps [| name, newPropValue |]
+
+        JsonDocument.Create(JsonValue.Record finalProps, "")
+
     // Creates a JsonValue.Record, omitting null fields, and wraps it in a json document
     static member CreateRecordOmitNulls(properties, cultureStr) =
         let cultureInfo = TextRuntime.GetCulture cultureStr

src/FSharp.Data.WorldBank.Core/WorldBankRuntime.fs

@@ -247,8 +247,7 @@ module Implementation =
         /// At runtime, download the data
         member internal __.GetDataAsync(countryOrRegionCode, indicatorCode) =
             async {
-                let! data =
-                    getData [ "countries"; countryOrRegionCode; "indicators"; indicatorCode ] [ "date", "" ] "date"
+                let! data = getData [ "countries"; countryOrRegionCode; "indicators"; indicatorCode ] [] "date"
 
                 return
                     seq {

src/FSharp.Data.Xml.Core/XmlRuntime.fs

@@ -6,6 +6,7 @@ namespace FSharp.Data.Runtime.BaseTypes
 
 open System.ComponentModel
 open System.IO
+open System.Xml
 open System.Xml.Linq
 
 #nowarn "10001"
@@ -54,9 +55,37 @@ type XmlElement =
                                10001,
                                IsHidden = true,
                                IsError = false)>]
-    static member Create(reader: TextReader) =
+    static member Create(reader: TextReader) = XmlElement.Create(reader, "Prohibit")
+
+    /// <exclude />
+    [<EditorBrowsableAttribute(EditorBrowsableState.Never)>]
+    [<CompilerMessageAttribute("This method is intended for use in generated code only.",
+                               10001,
+                               IsHidden = true,
+                               IsError = false)>]
+    static member CreateList(reader: TextReader) =
+        XmlElement.CreateList(reader, "Prohibit")
+
+    /// <exclude />
+    [<EditorBrowsableAttribute(EditorBrowsableState.Never)>]
+    [<CompilerMessageAttribute("This method is intended for use in generated code only.",
+                               10001,
+                               IsHidden = true,
+                               IsError = false)>]
+    static member Create(reader: TextReader, dtdProcessing: string) =
         use reader = reader
-        let element = XDocument.Load(reader, LoadOptions.PreserveWhitespace).Root
+
+        let dtd =
+            match dtdProcessing with
+            | "Ignore" -> DtdProcessing.Ignore
+            | "Parse" -> DtdProcessing.Parse
+            | _ -> DtdProcessing.Prohibit
+
+        let xmlReaderSettings =
+            new XmlReaderSettings(DtdProcessing = dtd, XmlResolver = null, MaxCharactersFromEntities = 1024L * 1024L)
+
+        use xmlReader = XmlReader.Create(reader, xmlReaderSettings)
+        let element = XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace).Root
         { XElement = element }
 
     /// <exclude />
@@ -65,16 +94,30 @@ type XmlElement =
                                10001,
                                IsHidden = true,
                                IsError = false)>]
-    static member CreateList(reader: TextReader) =
+    static member CreateList(reader: TextReader, dtdProcessing: string) =
         use reader = reader
         let text = reader.ReadToEnd()
 
+        let dtd =
+            match dtdProcessing with
+            | "Ignore" -> DtdProcessing.Ignore
+            | "Parse" -> DtdProcessing.Parse
+            | _ -> DtdProcessing.Prohibit
+
+        let xmlReaderSettings =
+            new XmlReaderSettings(DtdProcessing = dtd, XmlResolver = null, MaxCharactersFromEntities = 1024L * 1024L)
+
+        let parseWithReader xmlText =
+            use stringReader = new StringReader(xmlText)
+            use xmlReader = XmlReader.Create(stringReader, xmlReaderSettings)
+            XDocument.Load(xmlReader, LoadOptions.PreserveWhitespace)
+
         try
-            XDocument.Parse(text, LoadOptions.PreserveWhitespace).Root.Elements()
+            (parseWithReader text).Root.Elements()
             |> Seq.map (fun value -> { XElement = value })
             |> Seq.toArray
         with _ when text.TrimStart().StartsWith "<" ->
-            XDocument.Parse("<root>" + text + "</root>", LoadOptions.PreserveWhitespace).Root.Elements()
+            (parseWithReader ("<root>" + text + "</root>")).Root.Elements()
             |> Seq.map (fun value -> { XElement = value })
             |> Seq.toArray
 

tests/FSharp.Data.DesignTime.Tests/TypeProviderInstantiation.fs

@@ -42,6 +42,7 @@ type internal XmlProviderArgs =
       Schema : string
       InferenceMode: InferenceMode
       PreferDateOnly : bool
+      DtdProcessing : string
       UseOriginalNames : bool }
 
 type internal JsonProviderArgs =
@@ -119,6 +120,7 @@ type internal TypeProviderInstantiation =
                    box x.Schema
                    box x.InferenceMode
                    box x.PreferDateOnly
+                   box x.DtdProcessing
                    box x.UseOriginalNames |] 
             | Json x -> 
                 (fun cfg -> new JsonProvider(cfg) :> TypeProviderForNamespaces),
@@ -257,6 +259,7 @@ type internal TypeProviderInstantiation =
                   Schema = args.[6]
                   InferenceMode = args.[7] |> InferenceMode.Parse
                   PreferDateOnly = false
+                  DtdProcessing = "Ignore"
                   UseOriginalNames = false }
         | "Json" ->
             // Handle special case for Schema.json tests where some fields might be empty

tests/FSharp.Data.DesignTime.Tests/expected/Csv,AirQuality.csv,;,,True,False,False,,,.expected

@@ -246,4 +246,52 @@ class CsvProvider+Row : float * float * decimal * int * int * int
     member Wind: decimal with get
     (let _,_,t3,_,_,_ = this in t3)
 
+    member WithDay: day:int -> CsvProvider+Row
+    (let t1,_,_,_,_,_ = this in t1),
+    (let _,t2,_,_,_,_ = this in t2),
+    (let _,_,t3,_,_,_ = this in t3),
+    (let _,_,_,t4,_,_ = this in t4),
+    (let _,_,_,_,t5,_ = this in t5),
+    day
+
+    member WithMonth: month:int -> CsvProvider+Row
+    (let t1,_,_,_,_,_ = this in t1),
+    (let _,t2,_,_,_,_ = this in t2),
+    (let _,_,t3,_,_,_ = this in t3),
+    (let _,_,_,t4,_,_ = this in t4),
+    month,
+    (let _,_,_,_,_,t6 = this in t6)
+
+    member WithOzone: ozone:float -> CsvProvider+Row
+    ozone,
+    (let _,t2,_,_,_,_ = this in t2),
+    (let _,_,t3,_,_,_ = this in t3),
+    (let _,_,_,t4,_,_ = this in t4),
+    (let _,_,_,_,t5,_ = this in t5),
+    (let _,_,_,_,_,t6 = this in t6)
+
+    member WithSolar.R: solarR:float -> CsvProvider+Row
+    (let t1,_,_,_,_,_ = this in t1),
+    solarR,
+    (let _,_,t3,_,_,_ = this in t3),
+    (let _,_,_,t4,_,_ = this in t4),
+    (let _,_,_,_,t5,_ = this in t5),
+    (let _,_,_,_,_,t6 = this in t6)
+
+    member WithTemp: temp:int -> CsvProvider+Row
+    (let t1,_,_,_,_,_ = this in t1),
+    (let _,t2,_,_,_,_ = this in t2),
+    (let _,_,t3,_,_,_ = this in t3),
+    temp,
+    (let _,_,_,_,t5,_ = this in t5),
+    (let _,_,_,_,_,t6 = this in t6)
+
+    member WithWind: wind:decimal -> CsvProvider+Row
+    (let t1,_,_,_,_,_ = this in t1),
+    (let _,t2,_,_,_,_ = this in t2),
+    wind,
+    (let _,_,_,t4,_,_ = this in t4),
+    (let _,_,_,_,t5,_ = this in t5),
+    (let _,_,_,_,_,t6 = this in t6)
+