Merge branch 'main' into repo-assist/fix-issue-1431-with-methods-ce7b64094b94985d

Author: dsyme

.github/workflows/repo-assist.lock.yml

@@ -35,6 +35,8 @@ network:
   - api.worldbank.org
   - schemas.microsoft.com
   - tomasp.net
+  - http://www.w3.org
+  - http://schemas.microsoft.com 
 
 safe-outputs:
   add-comment:

.github/workflows/repo-assist.md

@@ -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.DesignTime/Xml/XmlProvider.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.WorldBank.Core/WorldBankRuntime.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