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.

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

Jump to bottom

Add support to restricted collection item size #510

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Add support to restricted collection item size #510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d16dd02
Add support to restricted collection item size
May 22, 2024
a24a312
Add databinding to simpleType
Jun 10, 2024
fae2568
Add code needed to use the annotated type
Jun 11, 2024
bf4b557
Resolve xmltype errors and name clashes
Jun 11, 2024
0212a6a
Orderby is no longer needed
Jun 11, 2024
bb7a249
Use the correct docs
Jun 11, 2024
d0d01a7
remove comment
Jun 11, 2024
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
9 changes: 8 additions & 1 deletion XmlSchemaClassGenerator/CodeUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,14 @@ public static string ToCamelCase(this string s) => string.IsNullOrEmpty(s) ? s
: char.ToLowerInvariant(s[0]) + s.Substring(1);

public static string ToBackingField(this string propertyName, string privateFieldPrefix)
=> string.Concat(privateFieldPrefix, propertyName.ToCamelCase());
{
var ret = string.Concat(privateFieldPrefix, propertyName.ToCamelCase());
if(ret is "value")
{
ret = "_" + ret;
}
return ret;
}

public static bool? IsDataTypeAttributeAllowed(this XmlSchemaDatatype type, GeneratorConfiguration configuration) => type.TypeCode switch
{
Expand Down
117 changes: 107 additions & 10 deletions XmlSchemaClassGenerator/TypeModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@

foreach (var (Namespace, Condition) in CodeUtilities.UsingNamespaces.Where(n => n.Condition(conf)).OrderBy(n => n.Namespace))
codeNamespace.Imports.Add(new CodeNamespaceImport(Namespace));

foreach (var typeModel in parts.SelectMany(x => x.Types.Values).ToList())
{
var type = typeModel.Generate();
Expand Down Expand Up @@ -514,6 +513,8 @@
public bool IsRequired { get; set; }
public bool IsNillable { get; set; }
public bool IsCollection { get; set; }
public decimal MaxOccurs { get; set; }
public decimal MinOccurs { get; set; }
public bool IsDeprecated { get; set; }
public bool IsAny { get; set; }
public int? Order { get; set; }
Expand All @@ -540,6 +541,8 @@

IsRequired = isRequired;
IsCollection = item.MaxOccurs > 1.0m || particle.MaxOccurs > 1.0m; // http://msdn.microsoft.com/en-us/library/vstudio/d3hx2s7e(v=vs.100).aspx
MinOccurs = item.MinOccurs;
MaxOccurs = item.MaxOccurs;
}

public void SetSchemaNameAndNamespace(TypeModel owningTypeModel, IXmlSchemaNode xs)
Expand Down Expand Up @@ -622,11 +625,27 @@

AddDescription(member.CustomAttributes, docs);

if (PropertyType is SimpleModel simpleType && !IsEnumerable)
if (PropertyType is SimpleModel simpleType)
{
docs.AddRange(simpleType.Documentation);
docs.AddRange(simpleType.Restrictions.Select(r => new DocumentationModel { Language = English, Text = r.Description }));
member.CustomAttributes.AddRange(simpleType.GetRestrictionAttributes().ToArray());
if (IsEnumerable)
{
if (MaxOccurs > 0 && MaxOccurs < decimal.MaxValue)
{
member.CustomAttributes.Add(AttributeDecl(Attributes.MaxLength, new(new CodePrimitiveExpression(Convert.ToInt32(MaxOccurs)))));
docs.Add(new DocumentationModel() { Language = English, Text = new MaxLengthRestrictionModel(Configuration) { Value = Convert.ToInt32(MaxOccurs) }.Description });
}
if (MinOccurs > 0)
{
member.CustomAttributes.Add(AttributeDecl(Attributes.MinLength, new(new CodePrimitiveExpression(Convert.ToInt32(MinOccurs)))));
docs.Add(new DocumentationModel() { Language = English, Text = new MinLengthRestrictionModel(Configuration) { Value = Convert.ToInt32(MinOccurs) }.Description });
}
}
else
{
docs.AddRange(simpleType.Documentation);
docs.AddRange(simpleType.Restrictions.Select(r => new DocumentationModel { Language = English, Text = r.Description }));
member.CustomAttributes.AddRange(simpleType.GetRestrictionAttributes().ToArray());
}
}

member.Comments.AddRange(GetComments(docs).ToArray());
Expand Down Expand Up @@ -1060,10 +1079,13 @@
}
}

var attribute = AttributeDecl<XmlElementAttribute>(new CodeAttributeArgument(new CodePrimitiveExpression(XmlSchemaName.Name)));
if (Order != null)
attribute.Arguments.Add(new(nameof(Order), new CodePrimitiveExpression(Order.Value)));
attributes.Add(attribute);
if (!string.IsNullOrEmpty(XmlSchemaName?.Name))
{
var attribute = AttributeDecl<XmlElementAttribute>(new CodeAttributeArgument(new CodePrimitiveExpression(XmlSchemaName.Name)));
if (Order != null)
attribute.Arguments.Add(new(nameof(Order), new CodePrimitiveExpression(Order.Value)));
attributes.Add(attribute);
}
}
}
else
Expand Down Expand Up @@ -1118,9 +1140,14 @@
}
}
}

if (OwningType is SimpleModel)
{
var attribute = AttributeDecl<XmlTextAttribute>();
attributes.Add(attribute);
}
return attributes;
}

}

public class EnumValueModel
Expand Down Expand Up @@ -1236,6 +1263,71 @@

public override CodeTypeDeclaration Generate()
{
if (Restrictions.Any())
{
var classDeclaration = base.Generate();
classDeclaration.Name = "Simple_" + classDeclaration.Name;

GenerateSerializableAttribute(classDeclaration);
GenerateTypeAttribute(classDeclaration);

classDeclaration.IsClass = true;
classDeclaration.IsPartial = true;
if (Configuration.AssemblyVisible)
classDeclaration.TypeAttributes = (classDeclaration.TypeAttributes & ~System.Reflection.TypeAttributes.VisibilityMask) | System.Reflection.TypeAttributes.NestedAssembly;

Check warning on line 1277 in XmlSchemaClassGenerator/TypeModel.cs

View check run for this annotation

Codecov / codecov/patch

XmlSchemaClassGenerator/TypeModel.cs#L1277 

Added line #L1277 was not covered by tests
if (RootElementName != null)
{
var rootAttribute = AttributeDecl<XmlRootAttribute>(
new(new CodePrimitiveExpression(XmlSchemaName.Name)),
new(nameof(XmlRootAttribute.Namespace), new CodePrimitiveExpression(XmlSchemaName.Namespace)));
classDeclaration.CustomAttributes.Add(rootAttribute);
}
var valueModel = new SimpleModel(Configuration) { ValueType = ValueType };
valueModel.Documentation.AddRange(Documentation);
valueModel.Restrictions.AddRange(Restrictions);
valueModel.UseDataTypeAttribute = UseDataTypeAttribute;

var property = new PropertyModel(Configuration, "Value", valueModel, this);

XmlSchemaElementEx schema = new XmlSchemaElement() { SchemaType = new XmlSchemaSimpleType { Name = Name } };
property.SetSchemaNameAndNamespace(this, schema);

if (Configuration.EnableDataBinding)
{
var propertyChangedEvent = new CodeMemberEvent()
{
Name = nameof(INotifyPropertyChanged.PropertyChanged),
Type = TypeRef<PropertyChangedEventHandler>(),
Attributes = MemberAttributes.Public,
};
classDeclaration.Members.Add(propertyChangedEvent);

SimpleModel type = new(Configuration) { ValueType = typeof(PropertyChangedEventHandler) };
var propertyChangedModel = new PropertyModel(Configuration, propertyChangedEvent.Name, type, this);

Configuration.MemberVisitor(propertyChangedEvent, propertyChangedModel);

var param = new CodeParameterDeclarationExpression(typeof(string), "propertyName = null");
param.CustomAttributes.Add(new(TypeRef<System.Runtime.CompilerServices.CallerMemberNameAttribute>()));
var threadSafeDelegateInvokeExpression = new CodeSnippetExpression($"{propertyChangedEvent.Name}?.Invoke(this, new System.ComponentModel.PropertyChangedEventArgs({param.Name}))");
var onPropChangedMethod = new CodeMemberMethod
{
Name = OnPropertyChanged,
Attributes = MemberAttributes.Family,
Parameters = { param },
Statements = { threadSafeDelegateInvokeExpression }
};

classDeclaration.Members.Add(onPropChangedMethod);

classDeclaration.BaseTypes.Add(TypeRef<INotifyPropertyChanged>());
}

property.AddMembersTo(classDeclaration, Configuration.EnableDataBinding);

return classDeclaration;
}

return null;
}

Expand All @@ -1256,6 +1348,11 @@

if (collection)
{
if (Restrictions.Any())
{
var reference = base.GetReferenceFor(referencingNamespace, collection, forInit, attribute);
reference.BaseType = "Simple_" + reference.BaseType;
}
var collectionType = forInit ? (Configuration.CollectionImplementationType ?? Configuration.CollectionType) : Configuration.CollectionType;

if (collectionType.IsGenericType)
Expand Down