Skip to content

New extension brainstorm #1959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

New extension brainstorm #1959

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2e48868
initial generic extension/list test
mikeebowen Jul 2, 2025
9e1d20e
try and use generator to add generic ExtensionList (build fails)
mikeebowen Jul 2, 2025
a437164
Revert "try and use generator to add generic ExtensionList (build fai…
mikeebowen Jul 3, 2025
8e46127
ExtensionList<T> is being written for all but get and set
mikeebowen Jul 3, 2025
7cd45bb
correct property types is written
mikeebowen Jul 3, 2025
a432c33
edit JSON
mikeebowen Jul 22, 2025
6ee0731
only add ExtensionChildren to types with extension list
mikeebowen Jul 25, 2025
1aa6ad5
remove unnecessary ExtensionChildren attributes
mikeebowen Jul 25, 2025
f29ca58
Can view the ExtensionChildren in the PresentationExtension, but rece…
mikeebowen Aug 11, 2025
631e60f
using static interface to access ExtensionChildren
mikeebowen Aug 20, 2025
ab293dc
Merge branch 'dotnet:main' into new-extension-brainstorm
mikeebowen Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions data/schemas/schemas_openxmlformats_org_presentationml_2006_main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6225,6 +6225,26 @@
]
}
]
},
"ExtensionChildren": [

{
"Name": "p:CT_Picture/p:pic",
"PropertyName": "Picture"
}
],
"ExtensionParticle": {
"Kind": "Sequence",
"Items": [
{
"Name": "p:CT_Picture/p:pic",
"Occurs": [
{
"Max": 1
}
]
}
]
}
},
{
Expand Down
76 changes: 69 additions & 7 deletions gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/DataModelWriterExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,19 @@ static DocumentCommentOptions BuildTypeComments(OpenXmlGeneratorServices service

private static void WriteMetadata(this IndentedTextWriter writer, OpenXmlGeneratorServices services, SchemaType containingType)
{
if (containingType.KnownChildren is not null && containingType.KnownChildren.Any(c => c.QName.Name == "extLst") && containingType.ExtensionChildren is not null)
{
writer.WriteLine("internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {");

foreach (var child in containingType.ExtensionChildren)
{
writer.WriteLine($" {services.FindClassName(child.Name)}.ElementType,");
}

writer.WriteLine("};");
writer.WriteLine();
}

var attributes = containingType.Attributes;

writer.WriteLine("internal override void ConfigureMetadata(ElementMetadata.Builder builder)");
Expand Down Expand Up @@ -356,16 +369,32 @@ private static void WriteMetadata(this IndentedTextWriter writer, OpenXmlGenerat
writer.WriteLine(";");
}

if (!containingType.IsDerived)
if (!containingType.IsDerived && containingType.KnownChildren is not null)
{
foreach (var child in containingType.KnownChildren)
{
var className = services.FindClassName(child);

writer.Write("builder.AddChild(");
writer.Write(className);
if (containingType.Name.QName.Name == "sldId" && containingType.Name.QName.Prefix == "p" && className == "DocumentFormat.OpenXml.Presentation.ExtensionList")
{
writer.Write($"{className}<DocumentFormat.OpenXml.Presentation.SlideId>");
}
else
{
writer.Write(className);
}

writer.Write(".ElementType, static () => new ");
writer.Write(className);
if (containingType.Name.QName.Name == "sldId" && containingType.Name.QName.Prefix == "p" && className == "DocumentFormat.OpenXml.Presentation.ExtensionList")
{
writer.Write($"{className}<DocumentFormat.OpenXml.Presentation.SlideId>");
}
else
{
writer.Write(className);
}

writer.WriteLine("());");
}
}
Expand Down Expand Up @@ -490,20 +519,53 @@ private static void WriteElement(this IndentedTextWriter writer, OpenXmlGenerato
}

writer.Write("public ");
writer.Write(className);

if (parent.Name.QName.Name == "sldId" && parent.Name.QName.Prefix == "p" && className == "DocumentFormat.OpenXml.Presentation.ExtensionList")
{
writer.Write(string.Concat(className, "<DocumentFormat.OpenXml.Presentation.SlideId>"));
}
else
{
writer.Write(className);
}

writer.Write("? ");
writer.WriteLine(element.PropertyName);

using (writer.AddBlock(new() { IncludeTrailingNewline = false }))
{
writer.Write("get => GetElement(");
writer.Write(className);
if (parent.Name.QName.Name == "sldId" && parent.Name.QName.Prefix == "p" && className == "DocumentFormat.OpenXml.Presentation.ExtensionList")
{
writer.Write("DocumentFormat.OpenXml.Presentation.ExtensionList<DocumentFormat.OpenXml.Presentation.SlideId>");
}
else
{
writer.Write(className);
}

writer.Write(".ElementType) as ");
writer.Write(className);
if (parent.Name.QName.Name == "sldId" && parent.Name.QName.Prefix == "p" && className == "DocumentFormat.OpenXml.Presentation.ExtensionList")
{
writer.Write("DocumentFormat.OpenXml.Presentation.ExtensionList<DocumentFormat.OpenXml.Presentation.SlideId>");
}
else
{
writer.Write(className);
}

writer.WriteLine(";");

writer.Write("set => SetElement(value, ");
writer.Write(className);
if (parent.Name.QName.Name == "sldId" && parent.Name.QName.Prefix == "p" && className == "DocumentFormat.OpenXml.Presentation.ExtensionList")
{
writer.Write("DocumentFormat.OpenXml.Presentation.ExtensionList<DocumentFormat.OpenXml.Presentation.SlideId>");
}
else
{
writer.Write(className);
}

writer.WriteLine(".ElementType);");
}
}
Expand Down
10 changes: 9 additions & 1 deletion gen/DocumentFormat.OpenXml.Generator.Models/Generators/Elements/ParticleWriterExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,15 @@ private static void WriteCompositeObject(this IndentedTextWriter writer, OpenXml
foreach (var item in p.Items)
{
list.AddDelimiter();
writer.WriteItemNode(services, containingType, item);

if (containingType.Name.QName.Name == "sldId" && containingType.Name.QName.Prefix == "p" && item.Name.QName.Name == "extLst" && item.Name.QName.Prefix == "p")
{
writer.Write("new ElementParticle(DocumentFormat.OpenXml.Presentation.ExtensionList<DocumentFormat.OpenXml.Presentation.SlideId>.ElementType, 0, 1),");
}
else
{
writer.WriteItemNode(services, containingType, item);
}
}

writer.WriteLine();
Expand Down
4 changes: 4 additions & 0 deletions gen/DocumentFormat.OpenXml.Generator.Models/Models/SchemaType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,8 @@ static void Fill(Particle? p, List<Particle> list)
public IEnumerable<Validator> Validators { get; set; } = Enumerable.Empty<Validator>();

public Particle? Particle { get; set; }

public IEnumerable<SchemaElement> ExtensionChildren { get; set; } = Enumerable.Empty<SchemaElement>();

public Particle? ExtensionParticle { get; set; }
}
3 changes: 3 additions & 0 deletions ...penXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_2020_mipLabelMetadata.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ public ClassificationLabelList(string outerXml) : base(outerXml)
{
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down
3 changes: 3 additions & 0 deletions ...enXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2007_8_2_chart.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -455,6 +455,9 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down
27 changes: 27 additions & 0 deletions ...OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2008_diagram.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,9 @@ public StringValue? Title
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -418,6 +421,9 @@ public BooleanValue? TextBox
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -633,6 +639,9 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1190,6 +1199,9 @@ public NonVisualGroupDrawingShapeProperties(string outerXml) : base(outerXml)
{
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1399,6 +1411,9 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1530,6 +1545,9 @@ public StringValue? ModelId
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1698,6 +1716,9 @@ public GroupShape(string outerXml) : base(outerXml)
{
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1774,6 +1795,9 @@ public ShapeTree(string outerXml) : base(outerXml)
{
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1850,6 +1874,9 @@ protected GroupShapeType(string outerXml) : base(outerXml)
{
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down
9 changes: 9 additions & 0 deletions ...ml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_chartDrawing.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,9 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.BlackWhiteModeValues>? BlackWhit
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -279,6 +282,9 @@ public StringValue? Title
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -411,6 +417,9 @@ public BooleanValue? IsComment
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down
3 changes: 3 additions & 0 deletions ...OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_diagram.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,9 @@ public StringValue? Title
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down
21 changes: 21 additions & 0 deletions ...at.OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_main.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,9 @@ public StringValue? RelationshipId
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -615,6 +618,9 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.PenAlignmentValues>? Alignment
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -842,6 +848,9 @@ public HiddenScene3D(string outerXml) : base(outerXml)
{
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1010,6 +1019,9 @@ public EnumValue<DocumentFormat.OpenXml.Drawing.PresetMaterialTypeValues>? Prese
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -1491,6 +1503,9 @@ public BooleanValue? NoChangeShapeType
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -4039,6 +4054,9 @@ public StringValue? Title
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down Expand Up @@ -4171,6 +4189,9 @@ public BooleanValue? IsComment
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down
3 changes: 3 additions & 0 deletions ....OpenXml.Generator.OpenXmlGenerator/schemas_microsoft_com_office_drawing_2010_slicer.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,9 @@ public StringValue? Name
set => SetAttribute(value);
}

internal static new List<OpenXmlSchemaType> ExtensionChildren { get; set; } = new() {
};

internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
Expand Down
Loading
Loading