Skip to content

(For 2973) Remove Children/Namedchildren #45

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 1 commit into from
Nov 20, 2024
Merged

(For 2973) Remove Children/Namedchildren #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
266 changes: 133 additions & 133 deletions src/Microsoft.Health.Fhir.CodeGen/Language/Firely/CSharpFirely2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2013,10 +2013,10 @@ private void WriteComponent(

WriteMatches(exportName, exportedElements);
WriteIsExactly(exportName, exportedElements);
WriteChildren(exportName, exportedElements);
WriteNamedChildren(exportName, exportedElements);
// WriteChildren(exportName, exportedElements);
// WriteNamedChildren(exportName, exportedElements);

WriteIDictionarySupport(exportName, exportedElements);
WriteDictionarySupport(exportName, exportedElements);

// close class
CloseScope();
Expand Down Expand Up @@ -2073,7 +2073,7 @@ private string DetermineExportedBaseTypeName(string baseTypeName)
return baseTypeName;
}

private void WriteIDictionarySupport(string exportName, List<WrittenElementInfo> exportedElements)
private void WriteDictionarySupport(string exportName, List<WrittenElementInfo> exportedElements)
{
WriteDictionaryTryGetValue(exportName, exportedElements);
WriteDictionaryTrySetValue(exportName, exportedElements);
Expand All @@ -2096,7 +2096,7 @@ private void WriteDictionaryPairs(string exportName, List<WrittenElementInfo> ex
return;
}

_writer.WriteLineIndented("protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()");
_writer.WriteLineIndented("internal protected override IEnumerable<KeyValuePair<string, object>> GetElementPairs()");
OpenScope();
_writer.WriteLineIndented("foreach (var kvp in base.GetElementPairs()) yield return kvp;");

Expand All @@ -2112,7 +2112,7 @@ private void WriteDictionaryPairs(string exportName, List<WrittenElementInfo> ex

private void WriteDictionaryTryGetValue(string exportName, List<WrittenElementInfo> exportedElements)
{
// Base implementation differs from subclasses and is hand-written code in a separate partical class
// Base implementation differs from subclasses and is hand-written code in a separate partial class
if (exportName == "Base")
{
return;
Expand All @@ -2124,7 +2124,7 @@ private void WriteDictionaryTryGetValue(string exportName, List<WrittenElementIn
return;
}

_writer.WriteLineIndented("protected override bool TryGetValue(string key, out object value)");
_writer.WriteLineIndented("internal protected override bool TryGetValue(string key, out object value)");
OpenScope();

// switch
Expand Down Expand Up @@ -2176,7 +2176,7 @@ private void WriteDictionaryTrySetValue(string exportName, List<WrittenElementIn
return;
}

_writer.WriteLineIndented("protected override Base SetValue(string key, object value)");
_writer.WriteLineIndented("internal protected override Base SetValue(string key, object value)");
OpenScope();

// switch
Expand Down Expand Up @@ -2232,135 +2232,135 @@ void writeSetValueCase(string name, string? when, string statement)
/// <summary>Writes the children of this item.</summary>
/// <param name="exportName">Name of the exported class.</param>
/// <param name="exportedElements">The exported elements.</param>
private void WriteNamedChildren(string exportName,
List<WrittenElementInfo> exportedElements)
{
// Base implementation differs from subclasses.
if (exportName == "Base")
{
_writer.WriteIndentedComment("""
Enumerate all child nodes.
Return a sequence of child elements, components and/or properties.
Child nodes are returned as tuples with the name and the node itself, in the order defined
by the FHIR specification.
First returns child nodes inherited from any base class(es), recursively.
Finally returns child nodes defined by the current class.
""");
_writer.WriteLineIndented("[IgnoreDataMember]");
_writer.WriteLineIndented("public virtual IEnumerable<ElementValue> NamedChildren => Enumerable.Empty<ElementValue>();");
_writer.WriteLine(string.Empty);
return;
}

// Don't override anything if there are no additional elements.
if (!exportedElements.Any())
{
return;
}

_writer.WriteLineIndented("[IgnoreDataMember]");
_writer.WriteLineIndented("public override IEnumerable<ElementValue> NamedChildren");

OpenScope();
_writer.WriteLineIndented("get");
OpenScope();
_writer.WriteLineIndented($"foreach (var item in base.NamedChildren) yield return item;");

foreach (WrittenElementInfo info in exportedElements)
{
if (info.PropertyType is ListTypeReference)
{
_writer.WriteLineIndented(
$"foreach (var elem in {info.PropertyName})" +
$" {{ if (elem != null)" +
$" yield return new ElementValue(\"{info.FhirElementName}\", elem);" +
$" }}");
}
else
{
string yr = NamedChildrenFhirTypeWrapper(info);

_writer.WriteLineIndented(
$"if ({info.PropertyName} != null)" +
$" yield return new ElementValue(\"{info.FhirElementName}\", {yr});");
}
}

CloseScope(suppressNewline: true);
CloseScope();
}
// private void WriteNamedChildren(string exportName,
// List<WrittenElementInfo> exportedElements)
// {
// // Base implementation differs from subclasses.
// if (exportName == "Base")
// {
// _writer.WriteIndentedComment("""
// Enumerate all child nodes.
// Return a sequence of child elements, components and/or properties.
// Child nodes are returned as tuples with the name and the node itself, in the order defined
// by the FHIR specification.
// First returns child nodes inherited from any base class(es), recursively.
// Finally returns child nodes defined by the current class.
// """);
// _writer.WriteLineIndented("[IgnoreDataMember]");
// _writer.WriteLineIndented("public virtual IEnumerable<ElementValue> NamedChildren => Enumerable.Empty<ElementValue>();");
// _writer.WriteLine(string.Empty);
// return;
// }
//
// // Don't override anything if there are no additional elements.
// if (!exportedElements.Any())
// {
// return;
// }
//
// _writer.WriteLineIndented("[IgnoreDataMember]");
// _writer.WriteLineIndented("public override IEnumerable<ElementValue> NamedChildren");
//
// OpenScope();
// _writer.WriteLineIndented("get");
// OpenScope();
// _writer.WriteLineIndented($"foreach (var item in base.NamedChildren) yield return item;");
//
// foreach (WrittenElementInfo info in exportedElements)
// {
// if (info.PropertyType is ListTypeReference)
// {
// _writer.WriteLineIndented(
// $"foreach (var elem in {info.PropertyName})" +
// $" {{ if (elem != null)" +
// $" yield return new ElementValue(\"{info.FhirElementName}\", elem);" +
// $" }}");
// }
// else
// {
// string yr = NamedChildrenFhirTypeWrapper(info);
//
// _writer.WriteLineIndented(
// $"if ({info.PropertyName} != null)" +
// $" yield return new ElementValue(\"{info.FhirElementName}\", {yr});");
// }
// }
//
// CloseScope(suppressNewline: true);
// CloseScope();
// }

// For a limited set of exceptional elements, the Children functions return a
// complex FHIR type wrapper.
private static string NamedChildrenFhirTypeWrapper(WrittenElementInfo info)
{

return info.FhirElementPath switch
{
"Narrative.div" => $"new FhirString({info.PropertyName}.Value)",
"Element.id" => $"new FhirString({info.PropertyName})",
"Extension.url" => $"new FhirUri({info.PropertyName})",
_ => $"{info.PropertyName}"
};
}
// private static string NamedChildrenFhirTypeWrapper(WrittenElementInfo info)
// {
//
// return info.FhirElementPath switch
// {
// "Narrative.div" => $"new FhirString({info.PropertyName}.Value)",
// "Element.id" => $"new FhirString({info.PropertyName})",
// "Extension.url" => $"new FhirUri({info.PropertyName})",
// _ => $"{info.PropertyName}"
// };
// }

/// <summary>Writes the children of this item.</summary>
/// <param name="exportName">Name of the exported class.</param>
/// <param name="exportedElements">The exported elements.</param>
private void WriteChildren(string exportName,
List<WrittenElementInfo> exportedElements)
{
// Base implementation differs from subclasses.
if (exportName == "Base")
{
_writer.WriteIndentedComment(
"""
Enumerate all child nodes.
Return a sequence of child elements, components and/or properties.
Child nodes are returned in the order defined by the FHIR specification.
First returns child nodes inherited from any base class(es), recursively.
Finally returns child nodes defined by the current class.
""");
_writer.WriteLineIndented("[IgnoreDataMember]");
_writer.WriteLineIndented("public virtual IEnumerable<Base> Children => Enumerable.Empty<Base>();");
_writer.WriteLine(string.Empty);
return;
}

// Don't override anything if there are no additional elements.
if (!exportedElements.Any())
{
return;
}

_writer.WriteLineIndented("[IgnoreDataMember]");
_writer.WriteLineIndented("public override IEnumerable<Base> Children");

OpenScope();
_writer.WriteLineIndented("get");
OpenScope();
_writer.WriteLineIndented($"foreach (var item in base.Children) yield return item;");

foreach (WrittenElementInfo info in exportedElements)
{
if (info.PropertyType is ListTypeReference)
{
_writer.WriteLineIndented(
$"foreach (var elem in {info.PropertyName})" +
$" {{ if (elem != null) yield return elem; }}");
}
else
{
string yr = NamedChildrenFhirTypeWrapper(info);
_writer.WriteLineIndented(
$"if ({info.PropertyName} != null)" +
$" yield return {yr};");
}
}

CloseScope(suppressNewline: true);
CloseScope();
}
// private void WriteChildren(string exportName,
// List<WrittenElementInfo> exportedElements)
// {
// // Base implementation differs from subclasses.
// if (exportName == "Base")
// {
// _writer.WriteIndentedComment(
// """
// Enumerate all child nodes.
// Return a sequence of child elements, components and/or properties.
// Child nodes are returned in the order defined by the FHIR specification.
// First returns child nodes inherited from any base class(es), recursively.
// Finally returns child nodes defined by the current class.
// """);
// _writer.WriteLineIndented("[IgnoreDataMember]");
// _writer.WriteLineIndented("public virtual IEnumerable<Base> Children => Enumerable.Empty<Base>();");
// _writer.WriteLine(string.Empty);
// return;
// }
//
// // Don't override anything if there are no additional elements.
// if (!exportedElements.Any())
// {
// return;
// }
//
// _writer.WriteLineIndented("[IgnoreDataMember]");
// _writer.WriteLineIndented("public override IEnumerable<Base> Children");
//
// OpenScope();
// _writer.WriteLineIndented("get");
// OpenScope();
// _writer.WriteLineIndented($"foreach (var item in base.Children) yield return item;");
//
// foreach (WrittenElementInfo info in exportedElements)
// {
// if (info.PropertyType is ListTypeReference)
// {
// _writer.WriteLineIndented(
// $"foreach (var elem in {info.PropertyName})" +
// $" {{ if (elem != null) yield return elem; }}");
// }
// else
// {
// string yr = NamedChildrenFhirTypeWrapper(info);
// _writer.WriteLineIndented(
// $"if ({info.PropertyName} != null)" +
// $" yield return {yr};");
// }
// }
//
// CloseScope(suppressNewline: true);
// CloseScope();
// }

/// <summary>Writes the matches.</summary>
/// <param name="exportName">Name of the exported class.</param>
Expand Down Expand Up @@ -2664,9 +2664,9 @@ private void WriteBackboneComponent(
{
WriteMatches(exportName, exportedElements);
WriteIsExactly(exportName, exportedElements);
WriteChildren(exportName, exportedElements);
WriteNamedChildren(exportName, exportedElements);
WriteIDictionarySupport(exportName, exportedElements);
//WriteChildren(exportName, exportedElements);
//WriteNamedChildren(exportName, exportedElements);
WriteDictionarySupport(exportName, exportedElements);
}

// close class
Expand Down