Add naming scheme command line option (fixes #520)

Refactor syntax

README.md

@@ -195,6 +195,9 @@ Options:
  default is false)
  --dtd, --allowDtdParse
  allow DTD parsing (default is false)
+ --ns, --namingScheme use the specified naming scheme for class and
+ property names (default is Pascal; can be:
+ Direct, Pascal, Legacy)
 </pre>
 
 For use from code use the [library NuGet package](https://www.nuget.org/packages/XmlSchemaClassGenerator-beta/):

XmlSchemaClassGenerator.Console/Program.cs

@@ -67,6 +67,7 @@ static int Main(string[] args)
  var separateNamespaceHierarchy = false;
  var serializeEmptyCollections = false;
  var allowDtdParse = false;
+ NamingScheme? namingScheme = null;
 
  var options = new OptionSet {
  { "h|help", "show this message and exit", v => showHelp = v != null },
@@ -123,20 +124,20 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
  { "csm|collectionSettersMode=", @"generate a private, public, or init-only setter
 with or without backing field initialization for collections
 (default is Private; can be: {Private, Public, PublicWithoutConstructorInitialization, Init, InitWithoutConstructorInitialization})",
-  v =>
-  {
-  collectionSettersMode = v switch
-  {
-  "pr" or "Private" => CollectionSettersMode.Private,
-  "pu" or "Public" => CollectionSettersMode.Public,
-  "puwci" or "PublicWithoutConstructorInitialization" =>
-  CollectionSettersMode.PublicWithoutConstructorInitialization,
-  "in" or "Init" => CollectionSettersMode.Init,
-  "inwci" or "InitWithoutConstructorInitialization" =>
-  CollectionSettersMode.InitWithoutConstructorInitialization,
-  _ => CollectionSettersMode.Private
-  };
-  }},
+ v =>
+ {
+ collectionSettersMode = v switch
+ {
+ "pr" or "Private" => CollectionSettersMode.Private,
+ "pu" or "Public" => CollectionSettersMode.Public,
+ "puwci" or "PublicWithoutConstructorInitialization" =>
+ CollectionSettersMode.PublicWithoutConstructorInitialization,
+ "in" or "Init" => CollectionSettersMode.Init,
+ "inwci" or "InitWithoutConstructorInitialization" =>
+ CollectionSettersMode.InitWithoutConstructorInitialization,
+ _ => CollectionSettersMode.Private
+ };
+ }},
  { "ctro|codeTypeReferenceOptions=", "the default CodeTypeReferenceOptions Flags to use (default is unset; can be: {GlobalReference, GenericTypeParameter})", v => codeTypeReferenceOptions = v == null ? default : (CodeTypeReferenceOptions)Enum.Parse(typeof(CodeTypeReferenceOptions), v, false) },
  { "tvpn|textValuePropertyName=", "the name of the property that holds the text value of an element (default is Value)", v => textValuePropertyName = v },
  { "dst|debuggerStepThrough", "generate DebuggerStepThroughAttribute (default is enabled)", v => generateDebuggerStepThroughAttribute = v != null },
@@ -162,6 +163,18 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
  { "uc|unionCommonType", "generate a common type for unions if possible (default is false)", v => unionCommonType = v != null },
  { "ec|serializeEmptyCollections", "serialize empty collections (default is false)", v => serializeEmptyCollections = v != null },
  { "dtd|allowDtdParse", "allows dtd parse (default is false)", v => allowDtdParse = v != null },
+ { "ns|namingScheme", @"use the specified naming scheme for class and property names (default is Pascal; can be: Direct, Pascal, Legacy)",
+ v =>
+ {
+ namingScheme = v?.ToLowerInvariant() switch
+ {
+ "direct" => NamingScheme.Direct,
+ "pascal" => NamingScheme.PascalCase,
+ "legacy" => NamingScheme.LegacyPascalCase,
+ _ => NamingScheme.PascalCase,
+ };
+ }
+ }
  };
 
  var globsAndUris = options.Parse(args);
@@ -222,7 +235,7 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
  DateTimeWithTimeZone = dateTimeWithTimeZone,
  EntityFramework = entityFramework,
  GenerateInterfaces = interfaces,
- NamingScheme = pascal ? NamingScheme.PascalCase : NamingScheme.Direct,
+ NamingScheme = namingScheme != null ? namingScheme.Value : (pascal ? NamingScheme.PascalCase : NamingScheme.Direct),
  AssemblyVisible = assembly,
  CollectionType = collectionType,
  CollectionImplementationType = collectionImplementationType,
@@ -250,7 +263,7 @@ A file name may be given by appending a pipe sign (|) followed by a file name (l
  MapUnionToWidestCommonType = unionCommonType,
  SeparateNamespaceHierarchy = separateNamespaceHierarchy,
  SerializeEmptyCollections = serializeEmptyCollections,
- AllowDtdParse = allowDtdParse
+ AllowDtdParse = allowDtdParse,
  };
 
  if (nameSubstituteMap.Any())

XmlSchemaClassGenerator/CodeUtilities.cs

@@ -14,6 +14,14 @@ namespace XmlSchemaClassGenerator
 {
  public static class CodeUtilities
  {
+ // Match non-letter followed by letter
+ private static readonly Regex PascalCaseRegex = new(@"[^\p{L}]\p{L}", RegexOptions.Compiled);
+
+ // Uppercases first letter and all letters following non-letters.
+ // Examples: testcase -> Testcase, html5element -> Html5Element, test_case -> Test_Case
+ public static string ToLegacyPascalCase(this string s) => string.IsNullOrEmpty(s) ? s
+ : char.ToUpperInvariant(s[0]) + PascalCaseRegex.Replace(s.Substring(1), m => m.Value[0] + char.ToUpperInvariant(m.Value[1]).ToString());
+
  private static readonly Regex invalidCharsRgx = new(@"[^_\p{L}\p{N}]");
  private static readonly Regex whiteSpace = new(@"(?<=\s)");
  private static readonly Regex startsWithLowerCaseChar = new(@"^\p{Ll}");

XmlSchemaClassGenerator/NamingExtensions.cs

@@ -106,6 +106,9 @@ public static string ToTitleCase(this string s, NamingScheme namingScheme)
  case NamingScheme.PascalCase:
  s = s.ToPascalCase();
  break;
+ case NamingScheme.LegacyPascalCase:
+ s = s.ToLegacyPascalCase();
+ break;
  }
  return s.MakeValidIdentifier();
  }

XmlSchemaClassGenerator/NamingProviders/SubstituteNamingProvider.cs

@@ -7,14 +7,26 @@ namespace XmlSchemaClassGenerator.NamingProviders
  /// <summary>
  /// Provides options to customize member names, and automatically substitute names for defined types/members.
  /// </summary>
- public class SubstituteNamingProvider
- : NamingProvider, INamingProvider
+ /// <remarks>
+ /// Initializes a new instance of the <see cref="SubstituteNamingProvider"/> class.
+ /// </remarks>
+ /// <param name="namingScheme">The naming scheme.</param>
+ /// <param name="nameSubstitutes">
+ /// A dictionary containing name substitute pairs.
+ /// <para>
+ /// Keys need to be prefixed with an appropriate kind ID as documented at:
+ /// <see href="https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/documentation-comments#d42-id-string-format">https://t.ly/HHEI</see>.
+ /// </para>
+ /// <para>Prefix with <c>A:</c> to substitute any type/member.</para>
+ /// </param>
+ public class SubstituteNamingProvider(NamingScheme namingScheme, Dictionary<string, string> nameSubstitutes)
+ : NamingProvider(namingScheme), INamingProvider
  {
- private readonly Dictionary<string, string> _nameSubstitutes;
+ private readonly Dictionary<string, string> _nameSubstitutes = nameSubstitutes;
 
  /// <inheritdoc cref="SubstituteNamingProvider(NamingScheme, Dictionary{string, string})"/>
  public SubstituteNamingProvider(NamingScheme namingScheme)
- : this(namingScheme, new())
+ : this(namingScheme, [])
  {
  }
 
@@ -24,24 +36,6 @@ public SubstituteNamingProvider(Dictionary<string, string> nameSubstitutes)
  {
  }
 
- /// <summary>
- /// Initializes a new instance of the <see cref="SubstituteNamingProvider"/> class.
- /// </summary>
- /// <param name="namingScheme">The naming scheme.</param>
- /// <param name="nameSubstitutes">
- /// A dictionary containing name substitute pairs.
- /// <para>
- /// Keys need to be prefixed with an appropriate kind ID as documented at:
- /// <see href="https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/language-specification/documentation-comments#d42-id-string-format">https://t.ly/HHEI</see>.
- /// </para>
- /// <para>Prefix with <c>A:</c> to substitute any type/member.</para>
- /// </param>
- public SubstituteNamingProvider(NamingScheme namingScheme, Dictionary<string, string> nameSubstitutes)
- : base(namingScheme)
- {
- _nameSubstitutes = nameSubstitutes;
- }
-
  /// <inheritdoc/>
  public override string PropertyNameFromAttribute(string typeModelName, string attributeName, XmlSchemaAttribute attribute)
  => SubstituteName("P", base.PropertyNameFromAttribute(typeModelName, attributeName, attribute));
@@ -101,8 +95,7 @@ private string SubstituteName(string typeIdPrefix, string name)
  return name;
  }
 
- string substituteName;
- if (_nameSubstitutes.TryGetValue($"{typeIdPrefix}:{name}", out substituteName) || _nameSubstitutes.TryGetValue($"A:{name}", out substituteName))
+ if (_nameSubstitutes.TryGetValue($"{typeIdPrefix}:{name}", out string substituteName) || _nameSubstitutes.TryGetValue($"A:{name}", out substituteName))
  {
  return substituteName;
  }

XmlSchemaClassGenerator/NamingScheme.cs

@@ -9,6 +9,7 @@ namespace XmlSchemaClassGenerator
  public enum NamingScheme
  {
  Direct,
- PascalCase
+ PascalCase,
+ LegacyPascalCase,
  }
 }