Skip to content

Remove generic builder pattern from element metadata create (Part 2): AddChild #1843

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

Merged
merged 14 commits into from
Apr 28, 2025
Merged

Remove generic builder pattern from element metadata create (Part 2): AddChild #1843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
288bad8
Remove element particles generic usage
twsouthwick Nov 25, 2024
66266e6
use an OpenXmlType
twsouthwick Nov 27, 2024
ae08a6a
rename type->schematype
twsouthwick Nov 27, 2024
d628d61
fix type
twsouthwick Nov 27, 2024
46a46f7
remove extra package reference
twsouthwick Nov 27, 2024
cef10f1
Remove generic from builder pattern (Part 2): AddChild
twsouthwick Nov 27, 2024
a481da2
make factory struct
twsouthwick Nov 27, 2024
d6e48cc
remove all generic addchild
twsouthwick Nov 27, 2024
be53c40
Revert "make factory struct"
twsouthwick Nov 27, 2024
b01a350
Merge remote-tracking branch 'origin/main' into add-child
twsouthwick Apr 25, 2025
8e8c05f
fix generated
twsouthwick Apr 25, 2025
31bf1fd
fix up test data
twsouthwick Apr 25, 2025
1998c1b
Merge branch 'main' into add-child
mikeebowen Apr 28, 2025
46148e3
Merge branch 'main' into add-child
mikeebowen Apr 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
10 changes: 7 additions & 3 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 @@ -360,9 +360,13 @@ private static void WriteMetadata(this IndentedTextWriter writer, OpenXmlGenerat
{
foreach (var child in containingType.KnownChildren)
{
writer.Write("builder.AddChild<");
writer.Write(services.FindClassName(child));
writer.WriteLine(">();");
var className = services.FindClassName(child);

writer.Write("builder.AddChild(");
writer.Write(className);
writer.Write(".ElementType, static () => new ");
writer.Write(className);
writer.WriteLine("());");
}
}

Expand Down
134 changes: 67 additions & 67 deletions ...DocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_excel.g.cs
View file
Open in desktop

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions ...ocumentFormat.OpenXml.Generator.OpenXmlGenerator/schemas-microsoft-com_office_office.g.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,17 +194,17 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Callout>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColorMenu>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Extrusion>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Lock>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Skew>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Fill>();
builder.AddChild<DocumentFormat.OpenXml.Vml.ImageData>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Shadow>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Stroke>();
builder.AddChild<DocumentFormat.OpenXml.Vml.TextBox>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Callout.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Callout());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColorMenu.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColorMenu());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ColorMostRecentlyUsed());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Extrusion.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Extrusion());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Lock.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Lock());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Skew.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Skew());
builder.AddChild(DocumentFormat.OpenXml.Vml.Fill.ElementType, static () => new DocumentFormat.OpenXml.Vml.Fill());
builder.AddChild(DocumentFormat.OpenXml.Vml.ImageData.ElementType, static () => new DocumentFormat.OpenXml.Vml.ImageData());
builder.AddChild(DocumentFormat.OpenXml.Vml.Shadow.ElementType, static () => new DocumentFormat.OpenXml.Vml.Shadow());
builder.AddChild(DocumentFormat.OpenXml.Vml.Stroke.ElementType, static () => new DocumentFormat.OpenXml.Vml.Stroke());
builder.AddChild(DocumentFormat.OpenXml.Vml.TextBox.ElementType, static () => new DocumentFormat.OpenXml.Vml.TextBox());
builder.AddElement<ShapeDefaults>()
.AddAttribute("v:ext", a => a.Extension)
.AddAttribute("spidmax", a => a.MaxShapeId)
Expand Down Expand Up @@ -448,9 +448,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.ShapeIdMap>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RegroupTable>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Rules>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.ShapeIdMap.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.ShapeIdMap());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RegroupTable.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RegroupTable());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Rules.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Rules());
builder.AddElement<ShapeLayout>()
.AddAttribute("v:ext", a => a.Extension);
builder.Particle = new CompositeParticle.Builder(ParticleType.All, 1, 1)
Expand Down Expand Up @@ -907,7 +907,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.RelationTable>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.RelationTable.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.RelationTable());
builder.AddElement<Diagram>()
.AddAttribute("v:ext", a => a.Extension)
.AddAttribute("dgmstyle", a => a.Style)
Expand Down Expand Up @@ -1905,9 +1905,9 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LinkType>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.LockedField>();
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.FieldCodes>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LinkType.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LinkType());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.LockedField.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.LockedField());
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.FieldCodes.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.FieldCodes());
builder.AddElement<OleObject>()
.AddAttribute("Type", a => a.Type)
.AddAttribute("ProgID", a => a.ProgId)
Expand Down Expand Up @@ -2733,7 +2733,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Entry>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Entry.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Entry());
builder.AddElement<RegroupTable>()
.AddAttribute("v:ext", a => a.Extension);
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
Expand Down Expand Up @@ -2813,7 +2813,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Rule>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Rule.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Rule());
builder.AddElement<Rules>()
.AddAttribute("v:ext", a => a.Extension);
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
Expand Down Expand Up @@ -2973,7 +2973,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Proxy>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Proxy.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Proxy());
builder.AddElement<Rule>()
.AddAttribute("id", a => a.Id, aBuilder =>
{
Expand Down Expand Up @@ -3062,7 +3062,7 @@ internal override void ConfigureMetadata(ElementMetadata.Builder builder)
{
base.ConfigureMetadata(builder);
builder.SetSchema(ElementType);
builder.AddChild<DocumentFormat.OpenXml.Vml.Office.Relation>();
builder.AddChild(DocumentFormat.OpenXml.Vml.Office.Relation.ElementType, static () => new DocumentFormat.OpenXml.Vml.Office.Relation());
builder.AddElement<RelationTable>()
.AddAttribute("v:ext", a => a.Extension);
builder.Particle = new CompositeParticle.Builder(ParticleType.Sequence, 1, 1)
Expand Down
Loading
Loading