Replace typed layer

Author: twsouthwick

gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs

@@ -11,6 +11,15 @@ namespace DocumentFormat.OpenXml.Generator.Generators.Elements;
 
 public static class DataModelWriterExtensions
 {
+    private static HashSet<string> _typedBasedClasses = new()
+    {
+        "OpenXmlElement",
+        "OpenXmlCompositeElement",
+        "OpenXmlLeafElement",
+        "OpenXmlLeafTextElement",
+        "OpenXmlPartRootElement",
+    };
+
     public static bool GetDataModelSyntax(this IndentedTextWriter writer, OpenXmlGeneratorServices services, SchemaNamespace model)
     {
         foreach (var ns in GetNamespaces(model, services).Distinct().OrderBy(n => n))
@@ -53,6 +62,21 @@ public static bool GetDataModelSyntax(this IndentedTextWriter writer, OpenXmlGen
         return delimiter.Count > 0;
     }
 
+    private static string GetBaseName(SchemaType type)
+    {
+        if (type.IsPart)
+        {
+            return "TypedOpenXmlPartRootElement";
+        }
+
+        if (_typedBasedClasses.Contains(type.BaseClass))
+        {
+            return $"Typed{type.BaseClass}";
+        }
+
+        return type.BaseClass;
+    }
+
     private static void WriteType(this IndentedTextWriter writer, OpenXmlGeneratorServices services, SchemaType element)
     {
         writer.WriteDocumentationComment(BuildTypeComments(services, element));
@@ -69,7 +93,7 @@ private static void WriteType(this IndentedTextWriter writer, OpenXmlGeneratorSe
         writer.Write("partial class ");
         writer.Write(className);
         writer.Write(" : ");
-        writer.WriteLine(element.IsPart ? "OpenXmlPartRootElement" : element.BaseClass);
+        writer.WriteLine(GetBaseName(element));
 
         using (writer.AddBlock(new() { AddNewLineBeforeClosing = true, IncludeTrailingNewline = false }))
         {

gen/DocumentFormat.OpenXml.Generator.Models/Generators/Parts/PartWriter.cs

@@ -49,6 +49,7 @@ public static void WritePart(this IndentedTextWriter writer, OpenXmlGeneratorSer
             writer.Write("public partial class ");
             writer.Write(type.Name);
             writer.Write(" : ");
+
             writer.Write(type.Base);
 
             if (type.HasFixedContent)

gen/DocumentFormat.OpenXml.Generator.Models/Models/Part.cs

@@ -5,9 +5,15 @@ namespace DocumentFormat.OpenXml.Generator.Models;
 
 public class Part
 {
+    private string _base = null!;
+
     public string Name { get; set; } = null!;
 
-    public string Base { get; set; } = null!;
+    public string Base
+    {
+        get => _base;
+        set => _base = value.Equals("OpenXmlPart") ? "TypedOpenXmlPart" : value;
+    }
 
     public bool HasFixedContent => ContentType is not null;
 

src/DocumentFormat.OpenXml/AlternateContent.cs

@@ -117,14 +117,44 @@ public override OpenXmlElement CloneNode(bool deep)
             return CloneImp<AlternateContent>(deep);
         }
 
-        internal override void ConfigureMetadata(ElementMetadata.Builder builder)
+        private protected override IFeatureCollection CreateFeatures() => new AlternateContentFeatures(this);
+
+        private class AlternateContentFeatures : ElementFeatureCollection, IElementMetadata
         {
-            base.ConfigureMetadata(builder);
+            public AlternateContentFeatures(OpenXmlElement owner)
+                : base(owner)
+            {
+            }
+
+            public override TFeature Get<TFeature>()
+            {
+                if (typeof(TFeature) == typeof(IElementMetadata))
+                {
+                    return (TFeature)(object)this;
+                }
+
+                return base.Get<TFeature>()!;
+            }
+
+            Type IElementMetadata.Type => typeof(AlternateContent);
+
+            ReadOnlyArray<AttributeMetadata> IElementMetadata.Attributes => default;
+
+            FileFormatVersions IElementMetadata.Availability => FileFormatVersions.Office2007;
+
+            ElementFactoryCollection IElementMetadata.Children { get; } = new(new[]
+            {
+                new ElementFactory(typeof(AlternateContentChoice), AlternateContentChoice.InternalQName, static () => new AlternateContentChoice()),
+                new ElementFactory(typeof(AlternateContentFallback), AlternateContentFallback.InternalQName, static () => new AlternateContentFallback()),
+            });
+
+            ReadOnlyArray<IValidator> IElementMetadata.Constraints => default;
+
+            CompiledParticle? IElementMetadata.Particle => new(null);
 
-            builder.SetSchema(InternalQName);
+            OpenXmlQualifiedName IElementMetadata.QName => InternalQName;
 
-            builder.AddChild<AlternateContentChoice>();
-            builder.AddChild<AlternateContentFallback>();
+            ReadOnlyArray<IValidator> IElementMetadata.Validators => default;
         }
     }
 }

src/DocumentFormat.OpenXml/AlternateContentChoice.cs

@@ -10,8 +10,10 @@ namespace DocumentFormat.OpenXml
     /// <summary>
     /// Defines an mc:Choice element in mc:AlternateContent.
     /// </summary>
-    public class AlternateContentChoice : OpenXmlCompositeElement
+    public class AlternateContentChoice : TypedOpenXmlCompositeElement
     {
+        internal static OpenXmlQualifiedName InternalQName => new(AlternateContent.InternalQName.Namespace.Uri, Name);
+
         private const string Name = "Choice";
 
         /// <summary>

src/DocumentFormat.OpenXml/AlternateContentFallback.cs

@@ -10,8 +10,10 @@ namespace DocumentFormat.OpenXml
     /// <summary>
     /// Defines a mc:Fallback element in mc:AlternateContent.
     /// </summary>
-    public class AlternateContentFallback : OpenXmlCompositeElement
+    public class AlternateContentFallback : TypedOpenXmlCompositeElement
     {
+        internal static OpenXmlQualifiedName InternalQName => new(AlternateContent.InternalQName.Namespace.Uri, Name);
+
         private const string Name = "Fallback";
 
         /// <summary>

src/DocumentFormat.OpenXml/OpenXmlCompositeElement.cs

@@ -19,6 +19,8 @@ namespace DocumentFormat.OpenXml
     /// </summary>
     public abstract class OpenXmlCompositeElement : OpenXmlElement
     {
+        private protected const string UseGenericVersion = "Should use the generic version of this. This overload will be removed in a future version.";
+
         private OpenXmlElement? _lastChild;
 
         /// <summary>
@@ -42,7 +44,7 @@ protected OpenXmlCompositeElement(string outerXml)
         /// Initializes a new instance of the OpenXmlCompositeElement class using the supplied collection of elements.
         /// </summary>
         /// <param name="childrenElements">A collection of elements.</param>
-        [Obsolete("Should use the generic version of this. This overload will be removed in a future version.")]
+        [Obsolete(UseGenericVersion)]
         protected OpenXmlCompositeElement(IEnumerable childrenElements)
             : this()
         {

src/DocumentFormat.OpenXml/OpenXmlElement.cs

@@ -6,6 +6,7 @@
 using DocumentFormat.OpenXml.Framework.Metadata;
 using DocumentFormat.OpenXml.Packaging;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -67,13 +68,15 @@ public IFeatureCollection Features
             {
                 if (_features is null)
                 {
-                    _features = new ElementFeatureCollection(this);
+                    _features = CreateFeatures();
                 }
 
                 return _features;
             }
         }
 
+        private protected virtual IFeatureCollection CreateFeatures() => new ElementFeatureCollection(this);
+
         private MarkupCompatibilityAttributes? McAttributesFiled
         {
             get
@@ -2606,7 +2609,7 @@ internal void RemoveAttributesBasedonMC()
             return root as OpenXmlPartRootElement;
         }
 
-        private sealed partial class ElementFeatureCollection : IFeatureCollection
+        private protected partial class ElementFeatureCollection : IFeatureCollection
         {
             private readonly OpenXmlElement _owner;
 
@@ -2617,15 +2620,27 @@ public ElementFeatureCollection(OpenXmlElement owner)
 
             public bool IsReadOnly => true;
 
-            public int Revision => GetPartFeatures()?.Revision ?? 0;
+            public int Revision => GetParentFeatures()?.Revision ?? 0;
+
+            public virtual IFeatureCollection Default => FeatureCollection.Default;
 
             [KnownFeature(typeof(AnnotationsFeature))]
             [KnownFeature(typeof(IElementMetadata), Factory = nameof(CreateMetadata))]
-            [DelegatedFeature(nameof(GetPartFeatures))]
-            [DelegatedFeature(nameof(FeatureCollection.TypedOrDefault), typeof(FeatureCollection))]
-            public partial TFeature? Get<TFeature>();
+            [DelegatedFeature(nameof(GetParentFeatures))]
+            [DelegatedFeature(nameof(Default))]
+            private partial TFeature? GetBuiltIn<TFeature>();
+
+            public virtual TFeature? Get<TFeature>() => GetBuiltIn<TFeature>();
+
+            private IFeatureCollection? GetParentFeatures()
+            {
+                if (_owner is OpenXmlPartRootElement root)
+                {
+                    return root.OpenXmlPart?.Features;
+                }
 
-            public IFeatureCollection? GetPartFeatures() => _owner.GetPart()?.Features;
+                return _owner.Parent?.Features;
+            }
 
             private IElementMetadata CreateMetadata() => this.GetRequired<IElementMetadataFactoryFeature>().GetMetadata(_owner);
 

src/DocumentFormat.OpenXml/OpenXmlMiscNode.cs

@@ -13,7 +13,7 @@ namespace DocumentFormat.OpenXml
     /// <summary>
     /// Represents an Open XML non element node (i.e. PT, Comments, Entity, Notation, XmlDeclaration).
     /// </summary>
-    public class OpenXmlMiscNode : OpenXmlElement
+    public class OpenXmlMiscNode : TypedOpenXmlElement
     {
         private const string StrCDataSectionName = "#cdata-section";
         private const string StrCommentName = "#comment";

src/DocumentFormat.OpenXml/OpenXmlUnknownElement.cs

@@ -14,7 +14,7 @@ namespace DocumentFormat.OpenXml
     /// Represents elements that are not defined in the Office Open XML ECMA standard.
     /// </summary>
     [OfficeAvailability(FileFormatVersions.None)]
-    public class OpenXmlUnknownElement : OpenXmlCompositeElement
+    public class OpenXmlUnknownElement : TypedOpenXmlCompositeElement
     {
         private string _namespaceUri;
         private string _tagName;