Switched encoding mask type back to fields enum

This allows for a simpler and more failsafe usage.

Author: larws

Opc.Ua.ModelCompiler/ModelGenerator2.cs

@@ -4709,7 +4709,7 @@ private string LoadTemplate_ListOfEncodedFields(Template template, Context conte
 
             if (field.IsOptional)
             {
-                template.Write($"if ((EncodingMask & (uint){dataType.ClassName}Fields.{field.Name}) != 0) ");
+                template.Write($"if ((EncodingMask & {dataType.ClassName}Fields.{field.Name}) != 0) ");
             }
 
             string functionName = field.DataTypeNode.BasicDataType.ToString();
@@ -4880,7 +4880,7 @@ private string LoadTemplate_ListOfDecodedFields(Template template, Context conte
 
             if (field.IsOptional)
             {
-                template.Write($"if ((EncodingMask & (uint){dataType.ClassName}Fields.{field.Name}) != 0) ");
+                template.Write($"if ((EncodingMask & {dataType.ClassName}Fields.{field.Name}) != 0) ");
             }
 
             string functionName = field.DataTypeNode.BasicDataType.ToString();
@@ -5038,7 +5038,7 @@ private string LoadTemplate_ListOfComparedFields(Template template, Context cont
 
             if (field.IsOptional)
             {
-                template.Write($"if ((EncodingMask & (uint){dataType.ClassName}Fields.{field.Name}) != 0) ");
+                template.Write($"if ((EncodingMask & {dataType.ClassName}Fields.{field.Name}) != 0) ");
             }
 
             template.Write("if (!Utils.IsEqual({0}, value.{0})) return false;", GetChildFieldName(field));
@@ -5073,7 +5073,7 @@ private string LoadTemplate_ListOfClonedFields(Template template, Context contex
 
             if (field.IsOptional)
             {
-                template.Write($"if ((EncodingMask & (uint){dataType.ClassName}Fields.{field.Name}) != 0) ");
+                template.Write($"if ((EncodingMask & {dataType.ClassName}Fields.{field.Name}) != 0) ");
             }
 
             template.Write("clone.{0} = ({1})Utils.Clone(this.{0});", GetChildFieldName(field), GetSystemTypeName(field.DataTypeNode, field.ValueRank));
@@ -5495,14 +5495,28 @@ private bool WriteTemplate_InitializeOptionalChildren(Template template, Context
 
         private string LoadTemplate_EncodingMaskProperty(Template template, Context context)
         {
-            if (context.Target is not DataTypeDesign dataType)
+            if (context.Target is not DataTypeDesign _)
             {
                 return null;
             }
 
-            return IsFirstDataTypeWithOptionalFields(dataType)
-                ? TemplatePath + "Version2.DataTypes.EncodingMaskProperty.cs"
-                : context.TemplatePath;
+            return TemplatePath + "Version2.DataTypes.EncodingMaskProperty.cs";
+        }
+
+        private bool WriteTemplate_EncodingMaskProperty(Template template, Context context)
+        {
+            if (context.Target is not DataTypeDesign dataType)
+            {
+                return false;
+            }
+
+            template.AddReplacement("_hide_by_new_", IsFirstDataTypeWithOptionalFields(dataType) ? string.Empty : "new ");
+            template.AddReplacement("_ClassName_", dataType.ClassName);
+
+            var result = template.WriteTemplate(context);
+            template.WriteLine(string.Empty);
+
+            return result;
         }
 
         private static bool HasOptionalFields(DataTypeDesign dataType)
@@ -5523,21 +5537,6 @@ private static bool IsFirstDataTypeWithOptionalFields(DataTypeDesign dataType)
                 && !HasOptionalFieldsInherited(dataType);
         }
 
-        private bool WriteTemplate_EncodingMaskProperty(Template template, Context context)
-        {
-            DataTypeDesign dataType = context.Target as DataTypeDesign;
-
-            if (dataType == null)
-            {
-                return false;
-            }
-            
-            var result = template.WriteTemplate(context);
-            template.WriteLine(string.Empty);
-
-            return result;
-        }
-
         #endregion
 
         #region "// ListOfPropertiesForType and // ListOfProperties"

Opc.Ua.ModelCompiler/Templates/Version2/DataTypes/ClassWithOptionalFields.cs

@@ -59,15 +59,15 @@ private void Initialize(StreamingContext context)
 
     private void Initialize()
     {
-        EncodingMask = (uint)_ClassName_Fields.None;
+        EncodingMask = _ClassName_Fields.None;
         // ListOfFieldInitializers
     }
     #endregion
 
     #region Public Properties
     /// <remarks />
     [DataMember(Name = "EncodingMask", IsRequired = true, Order = 0)]
-    public uint EncodingMask { get; set; }
+    public _ClassName_Fields EncodingMask { get; set; }
 
     // ListOfProperties
     #endregion
@@ -120,7 +120,7 @@ void IEncodeable.Decode(IDecoder decoder)
 
     protected virtual void OnReadEncodingMask(IDecoder decoder) 
     {
-        EncodingMask = decoder.ReadEncodingMask(m_FieldNames);
+        EncodingMask = (_ClassName_Fields)decoder.ReadEncodingMask(m_FieldNames);
     }
 
     protected virtual void OnDecodeFields(IDecoder decoder)

Opc.Ua.ModelCompiler/Templates/Version2/DataTypes/DerivedClassWithOptionalFields.cs

@@ -60,7 +60,7 @@ private void Initialize()
     /// <summary cref="_BaseType_.OnWriteEncodingMask(IEncoder)" />
     protected override void OnWriteEncodingMask(IEncoder encoder)
     {
-        encoder.WriteUInt32(nameof(EncodingMask), (uint)EncodingMask);
+        encoder.WriteEncodingMask((uint)EncodingMask);
     }
 
     /// <summary cref="_BaseType_.OnEncodeFields(IEncoder)" />
@@ -72,7 +72,7 @@ protected override void OnEncodeFields(IEncoder encoder)
 
     protected override void OnReadEncodingMask(IDecoder decoder) 
     {
-        EncodingMask = decoder.ReadUInt32(nameof(EncodingMask));
+        EncodingMask = (_ClassName_Fields)decoder.ReadEncodingMask(m_FieldNames);
     }
 
     protected override void OnDecodeFields(IDecoder decoder)

Opc.Ua.ModelCompiler/Templates/Version2/DataTypes/EncodingMaskProperty.cs

@@ -2,6 +2,6 @@ class _Name_{
 // ***START***
 /// <remarks />
 [DataMember(Name = "EncodingMask", IsRequired = true, Order = 0)]
-public uint EncodingMask { get; set; }
+public _hide_by_new__ClassName_Fields EncodingMask { get; set; }
 // ***END***
 }