More work on extension methods to traverse an entire XSD graph for simple types and unions.

Author: mamift

XObjectsCode/Extensions/XmlSchemaExtensions.cs

@@ -1,4 +1,5 @@
-using System;
+#nullable enable
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -61,6 +62,11 @@ private static void TraverseAllSimpleTypes(XmlSchemaObject schemaObject, ref Dic
 
             bool didAdd = true;
             switch (schemaObject) {
+                case XmlSchemaAttribute attribute: {
+                    didAdd = simpleTypes.AddIfNotAlreadyExists(attribute, attribute.AttributeSchemaType);
+                    break;
+                }
+
                 case XmlSchemaElement element: {
                         if (element.ElementSchemaType is XmlSchemaSimpleType simpleType) {
                             didAdd = simpleTypes.AddIfNotAlreadyExists(element, simpleType);
@@ -92,12 +98,7 @@ private static void TraverseAllSimpleTypes(XmlSchemaObject schemaObject, ref Dic
                         break;
                     }
 
-                case XmlSchemaAttribute attribute: {
-                    didAdd = simpleTypes.AddIfNotAlreadyExists(attribute, attribute.AttributeSchemaType);
-                    break;
-                }
-
-                case XmlSchemaComplexType complexType:
+                case XmlSchemaComplexType complexType: {
                     foreach (var attribute in complexType.AttributeUses.Values.OfType<XmlSchemaAttribute>()) {
                         if (attribute.AttributeSchemaType is { } simpleType) {
                             didAdd = simpleTypes.AddIfNotAlreadyExists(attribute, simpleType);
@@ -110,20 +111,42 @@ private static void TraverseAllSimpleTypes(XmlSchemaObject schemaObject, ref Dic
                     }
 
                     break;
+                }
+
+                case XmlSchemaGroupBase groupBase: {
+                    OneOf<XmlSchemaAll, XmlSchemaSequence, XmlSchemaChoice> matchModel = default;
+                    if (groupBase is XmlSchemaAll all) { matchModel = all; }
+                    else if (groupBase is XmlSchemaSequence seq) { matchModel = seq; }
+                    else if (groupBase is XmlSchemaChoice choice) { matchModel = choice; }
 
-                case XmlSchemaGroupBase groupBase when groupBase is XmlSchemaAll all:
-                    foreach (var item in all.Items) {
+                    foreach (var item in matchModel.Match(a => a.Items, s => s.Items, c => c.Items)) {
                         TraverseAllSimpleTypes(item, ref simpleTypes, out breakOutOfLoop);
                         if (breakOutOfLoop) return;
                     }
 
                     break;
-                
+                }
             }
 
             breakOutOfLoop = !didAdd;
         }
 
+        public static bool IsOfAnonymousType(this XmlSchemaAttribute attr)
+        {
+            return attr.SchemaType != null && !(
+                (attr.AttributeSchemaType?.IsGlobal()).GetValueOrDefault() && 
+                (attr.AttributeSchemaType?.IsBuiltInSimpleType()).GetValueOrDefault()
+            );
+        }
+        
+        public static bool IsOfAnonymousType(this XmlSchemaElement el)
+        {
+            return el.SchemaType != null && !(
+                (el.ElementSchemaType?.IsGlobal()).GetValueOrDefault() && 
+                (el.ElementSchemaType?.IsBuiltInSimpleType()).GetValueOrDefault()
+            );
+        }
+
         /// <summary>
         /// Returns true or false if the current <paramref name="attribute"/> defines an inline enumeration of values.
         /// </summary>

XObjectsCode/Src/SOMQueryExtensions.cs

@@ -99,6 +99,13 @@ public static bool IsBuiltInSimpleType(this XmlSchemaSimpleType derivedType)
             }
         }
 
+        public static bool IsBuiltInSimpleType(this XmlSchemaType type)
+        {
+            if (type is XmlSchemaSimpleType a) return a.IsBuiltInSimpleType();
+
+            return false;
+        }
+
         public static XmlSchemaSimpleType GetListItemType(this XmlSchemaSimpleType type)
         {
             Debug.Assert(type != null);

XObjectsTests/Extensions/FileExtensions.cs

@@ -20,7 +20,7 @@ public static XDocument ToXDocument(this IFileInfo fileInfo)
         return XDocument.Load(fileInfo.ToStreamReader());
     }
 
-    public static XmlSchemaSet ReadAsXmlSchemaInstance(this IFileInfo fileInfo, XmlResolver resolver)
+    public static XmlSchemaSet ReadAsXmlSchemaSet(this IFileInfo fileInfo, XmlResolver resolver)
     {
         if (resolver == null) throw new ArgumentNullException(nameof(resolver));
 
@@ -32,4 +32,13 @@ public static XmlSchemaSet ReadAsXmlSchemaInstance(this IFileInfo fileInfo, XmlR
 
         return xsd;
     }
+
+    public static XmlSchemaSet ReadAsXmlSchemaDefinition(this IFileInfo fileInfo)
+    {
+        using var sr = new StreamReader(fileInfo.OpenRead());
+        var reader = XmlReader.Create(sr, Defaults.DefaultXmlReaderSettings);
+        var xsd = reader.ToXmlSchemaSet();
+
+        return xsd;
+    }
 }

XObjectsTests/Extensions/XmlSchemaExtensionsTests.cs

@@ -88,33 +88,33 @@ public void TestRetrieveAllAnonymousSimpleTypes_OPML()
         {
             var opmlFile = AllTestFiles.AllFiles.SingleOrDefault(f => f.EndsWith("Opml\\opml2.xsd"));
             Assert.NotNull(opmlFile);
-            var opmlXsd = AllTestFiles.FileInfo.New(opmlFile).ReadAsXmlSchemaInstance(MockXmlFileResolver);
+            var opmlXsd = AllTestFiles.FileInfo.New(opmlFile).ReadAsXmlSchemaSet(MockXmlFileResolver);
 
             var anonTypes = opmlXsd.RetrieveAllAnonymousSimpleTypes();
 
             Assert.NotNull(anonTypes);
-            Assert.IsEmpty(anonTypes);
+            Assert.IsNotEmpty(anonTypes);
         }
 
         [Test]
         public void TestRetrieveAllAnonymousSimpleTypes_StuDateAndTime()
         {
             var file = AllTestFiles.AllFiles.SingleOrDefault(f => f.EndsWith("StuDateAndTime.xsd"));
             Assert.NotNull(file);
-            var xsd = AllTestFiles.FileInfo.New(file).ReadAsXmlSchemaInstance(MockXmlFileResolver);
+            var xsd = AllTestFiles.FileInfo.New(file).ReadAsXmlSchemaSet(MockXmlFileResolver);
 
             var anonTypes = xsd.RetrieveAllAnonymousSimpleTypes();
 
             Assert.NotNull(anonTypes);
-            Assert.IsEmpty(anonTypes);
+            Assert.IsNotEmpty(anonTypes);
         }
 
         [Test]
         public void TestRetrieveAllAnonymousSimpleUnionTypes_AkomaNtoso()
         {
             var opmlFile = AllTestFiles.AllFiles.SingleOrDefault(f => f.EndsWith("\\AkomaNtoso\\akomantoso30.xsd"));
             Assert.NotNull(opmlFile);
-            var opmlXsd = AllTestFiles.FileInfo.New(opmlFile).ReadAsXmlSchemaInstance(MockXmlFileResolver);
+            var opmlXsd = AllTestFiles.FileInfo.New(opmlFile).ReadAsXmlSchemaSet(MockXmlFileResolver);
 
             var anonUnionTypes = opmlXsd.RetrieveAllAnonymousSimpleUnionTypes();
 
@@ -127,7 +127,7 @@ public void TestRetrieveAllSimpleTypes_AkomaNtoso()
         {
             var opmlFile = AllTestFiles.AllFiles.SingleOrDefault(f => f.EndsWith("\\AkomaNtoso\\akomantoso30.xsd"));
             Assert.NotNull(opmlFile);
-            var opmlXsd = AllTestFiles.FileInfo.New(opmlFile).ReadAsXmlSchemaInstance(MockXmlFileResolver);
+            var opmlXsd = AllTestFiles.FileInfo.New(opmlFile).ReadAsXmlSchemaSet(MockXmlFileResolver);
 
             var anonUnionTypes = opmlXsd.RetrieveAllSimpleTypes();