update data, replace validation

Author: kalunkuo

src/Libraries/CoreNodes/Data.cs

@@ -652,6 +652,17 @@ public static object SafeExtractDictionaryValue(Dictionary<string, object> dict,
             return null;
         }
 
+        private const string DefineDataValidationKey = "Validation";
+
+        private static Dictionary<string, object> UnusedDefineDataResult(object inputValue)
+        {
+            return new Dictionary<string, object>
+            {
+                { ">", inputValue },
+                { DefineDataValidationKey, null }
+            };
+        }
+
         /// <summary>
         /// This is the function used by AST to evaluate the Define Data node.
         /// Handles some of the the node logic while performing the validation
@@ -669,23 +680,15 @@ public static Dictionary<string, object> EvaluateDefineDataNode([ArbitraryDimens
             if (inputValue == null && string.IsNullOrEmpty(playerValue))
             {
                 // Don't raise a warning if the node is unused
-                return new Dictionary<string, object>
-                {
-                    { ">", inputValue },
-                    { "Validation", null }
-                };
+                return UnusedDefineDataResult(inputValue);
             }
 
             // Unconnected var[]..[] ports can receive an empty sequence default.
             if (string.IsNullOrEmpty(playerValue)
                 && inputValue is IEnumerable enumerable and not string
                 && !enumerable.Cast<object>().Any())
             {
-                return new Dictionary<string, object>
-                {
-                    { ">", inputValue },
-                    { "Validation", null }
-                };
+                return UnusedDefineDataResult(inputValue);
             }
 
             // If the playerValue is not empty, then we assume it was set by the player.
@@ -709,11 +712,7 @@ public static Dictionary<string, object> EvaluateDefineDataNode([ArbitraryDimens
             // follow the same behavior as an unused Define Data input.
             if (inputValue == null)
             {
-                return new Dictionary<string, object>
-                {
-                    { ">", inputValue },
-                    { "Validation", null }
-                };
+                return UnusedDefineDataResult(inputValue);
             }
 
             if (!IsSingleValueOrSingleLevelArrayList(inputValue))
@@ -736,16 +735,7 @@ public static Dictionary<string, object> EvaluateDefineDataNode([ArbitraryDimens
                 // Type logic - we try to 'guess' the type of the object
                 if (type == null || !IsSupportedDataNodeDynamoType(inputValue, type.Type, assertList))
                 {
-                    var valueType = assertList ? FindCommonAncestor(arrayList) : inputValue?.GetType();
-                    if (!assertList && valueType == null)
-                    {
-                        // Defensive null-safe fallback for analyzers: no input means no validation result.
-                        return new Dictionary<string, object>
-                        {
-                            { ">", inputValue },
-                            { "Validation", null }
-                        };
-                    }
+                    var valueType = assertList ? FindCommonAncestor(arrayList) : inputValue.GetType();
                     if (valueType == null)
                     {
                         // We couldn't find a common ancestor - list containing unsupported or incompatible data types
@@ -820,7 +810,7 @@ private static Dictionary<string, object> DefineDataResult(object inputValue, bo
             return new Dictionary<string, object>
             {
                 { ">", inputValue },
-                { "Validation", result }
+                { DefineDataValidationKey, result }
             };
         }