Skip to content
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.

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

Keep Original Enum Names for Reuse in Custom Templates #1763

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public IEnumerable<EnumerationItemModel> Enums
entries.Add(new EnumerationItemModel
{
Name = _settings.EnumNameGenerator.Generate(i, name, value, _schema),
OriginalName = name,
Value = value.ToString(),
InternalValue = valueInt64.ToString(CultureInfo.InvariantCulture),
InternalFlagValue = valueInt64.ToString(CultureInfo.InvariantCulture)
Expand All @@ -85,6 +86,7 @@ public IEnumerable<EnumerationItemModel> Enums
entries.Add(new EnumerationItemModel
{
Name = _settings.EnumNameGenerator.Generate(i, name, value, _schema),
OriginalName = name,
Value = value.ToString(),
InternalValue = value.ToString(),
InternalFlagValue = (1 << i).ToString(CultureInfo.InvariantCulture)
Expand All @@ -99,6 +101,7 @@ public IEnumerable<EnumerationItemModel> Enums
entries.Add(new EnumerationItemModel
{
Name = _settings.EnumNameGenerator.Generate(i, name, value, _schema),
OriginalName = name,
Value = value.ToString(),
InternalValue = i.ToString(CultureInfo.InvariantCulture),
InternalFlagValue = (1 << i).ToString(CultureInfo.InvariantCulture)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ public List<EnumerationItemModel> Enums
entries.Add(new EnumerationItemModel
{
Name = _settings.EnumNameGenerator.Generate(i, name, value, _schema),
OriginalName = name,
Value = _schema.Type.IsInteger() ? value.ToString() : "\"" + value + "\"",
});
}
Expand Down
3 changes: 3 additions & 0 deletions src/NJsonSchema.CodeGeneration/Models/EnumerationItemModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ public class EnumerationItemModel
/// <summary>Gets or sets the name.</summary>
public required string Name { get; set; }

/// <summary>Gets or sets the original name.</summary>
public required string OriginalName { get; set; }

/// <summary>Gets or sets the value.</summary>
public required string Value { get; set; }

Expand Down
Loading