-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: Fixed Discriminator property name for some cases.
- Loading branch information
Showing
14 changed files
with
130 additions
and
335 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
105 changes: 105 additions & 0 deletions
105
src/libs/AutoSDK/Naming/Properties/PropertyNameGenerator.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,105 @@ | ||
| using AutoSDK.Extensions; | ||
| using AutoSDK.Models; | ||
|
|
||
| namespace AutoSDK.Naming.Properties; | ||
|
|
||
| public static class CSharpPropertyNameGenerator | ||
| { | ||
| public static string ComputePropertyName( | ||
| SchemaContext context) | ||
| { | ||
| context = context ?? throw new ArgumentNullException(nameof(context)); | ||
| var propertyName = context.PropertyName ?? throw new InvalidOperationException("Property name or parameter name is required."); | ||
|
|
||
| var name = propertyName.ToPropertyName(); | ||
|
|
||
| name = HandleWordSeparators(name); | ||
|
|
||
| if (context.Parent != null) | ||
| { | ||
| name = name.FixPropertyName(context.Parent.Id); | ||
| } | ||
|
|
||
| name = SanitizeName(name, context.Settings.ClsCompliantEnumPrefix, true); | ||
|
|
||
| return name; | ||
| } | ||
|
|
||
| internal static string SanitizeName(string? name, string clsCompliantEnumPrefix, bool skipHandlingWordSeparators = false) | ||
| { | ||
| static bool InvalidFirstChar(char ch) | ||
| => ch is not ('_' or >= 'A' and <= 'Z' or >= 'a' and <= 'z'); | ||
|
|
||
| static bool InvalidSubsequentChar(char ch) | ||
| => ch is not ( | ||
| '_' | ||
| or >= 'A' and <= 'Z' | ||
| or >= 'a' and <= 'z' | ||
| or >= '0' and <= '9' | ||
| ); | ||
|
|
||
| if (name is null || name.Length == 0) | ||
| { | ||
| return ""; | ||
| } | ||
|
|
||
| if (!skipHandlingWordSeparators) | ||
| { | ||
| name = HandleWordSeparators(name); | ||
| } | ||
|
|
||
| if (name.Length == 0) | ||
| { | ||
| return string.IsNullOrWhiteSpace(clsCompliantEnumPrefix) | ||
| ? "_" | ||
| : clsCompliantEnumPrefix; | ||
| } | ||
|
|
||
| if (InvalidFirstChar(name[0])) | ||
| { | ||
| name = (string.IsNullOrWhiteSpace(clsCompliantEnumPrefix) | ||
| ? "_" | ||
| : clsCompliantEnumPrefix) + name; | ||
| } | ||
|
|
||
| if (!name.Skip(1).Any(InvalidSubsequentChar)) | ||
| { | ||
| return name; | ||
| } | ||
|
|
||
| Span<char> buf = stackalloc char[name.Length]; | ||
| name.AsSpan().CopyTo(buf); | ||
|
|
||
| for (var i = 1; i < buf.Length; i++) | ||
| { | ||
| if (InvalidSubsequentChar(buf[i])) | ||
| { | ||
| buf[i] = '_'; | ||
| } | ||
| } | ||
|
|
||
| // Span<char>.ToString implementation checks for char type, new string(&buf[0], buf.length) | ||
| return buf.ToString(); | ||
| } | ||
|
|
||
| internal static string HandleWordSeparators(string name) | ||
| { | ||
| return name | ||
| .ReplacePlusAndMinusOnStart() | ||
| .UseWordSeparator('_', '+', '-', '.', '/', '(', '[', ']', ')'); | ||
| } | ||
|
|
||
| internal static string ToCSharpName(this string text, Settings settings, SchemaContext? parent) | ||
| { | ||
| var name = text.ToPropertyName(); | ||
|
|
||
| name = HandleWordSeparators(name); | ||
|
|
||
| if (parent != null) | ||
| { | ||
| name = name.FixPropertyName(parent.Id); | ||
| } | ||
|
|
||
| return SanitizeName(name, settings.ClsCompliantEnumPrefix, true); | ||
| } | ||
| } |
52 changes: 0 additions & 52 deletions
52
...K.SnapshotTests/Snapshots/luma/NewtonsoftJson/Tests.SdkGenerator_Diagnostics.received.txt
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.