Parse Context Update

source/dotnet/Library/AdaptiveCards/AdaptiveCard.cs

@@ -238,7 +238,7 @@ public static AdaptiveCardParseResult FromJson(string json)
             {
                 parseResult.Card = JsonConvert.DeserializeObject<AdaptiveCard>(json, new JsonSerializerSettings
                 {
-                    ContractResolver = new WarningLoggingContractResolver(parseResult),
+                    ContractResolver = new WarningLoggingContractResolver(parseResult, new ParseContext()),
                     Converters = { new StrictIntConverter() }
                 });
             }

source/dotnet/Library/AdaptiveCards/AdaptiveCardConverter.cs

@@ -9,7 +9,7 @@
 
 namespace AdaptiveCards
 {
-    public class AdaptiveCardConverter : JsonConverter, ILogWarnings
+    public class AdaptiveCardConverter : AdaptiveTypedBaseElementConverter, ILogWarnings
     {
         public List<AdaptiveWarning> Warnings { get; set; } = new List<AdaptiveWarning>();
 
@@ -62,16 +62,21 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
 
             if (reader.Depth == 0)
             {
-                // Needed for ID collision detection after fallback was introduced
-                ParseContext.Initialize();
-
                 ValidateJsonVersion(ref jObject);
 
                 if (new AdaptiveSchemaVersion(jObject.Value<string>("version")) > AdaptiveCard.KnownSchemaVersion)
                 {
                     return MakeFallbackTextCard(jObject);
                 }
             }
+
+            /// this is needed when client calls JsonConvert.Deserializer method, we need this contract resolver,
+            /// so we can pass ParseContext
+            if (!(serializer.ContractResolver is WarningLoggingContractResolver))
+            {
+                serializer.ContractResolver = new WarningLoggingContractResolver(new AdaptiveCardParseResult(), new ParseContext()); 
+            }
+
             var typedElementConverter = serializer.ContractResolver.ResolveContract(typeof(AdaptiveTypedElement)).Converter;
 
             var card = (AdaptiveCard)typedElementConverter.ReadJson(jObject.CreateReader(), objectType, existingValue, serializer);

source/dotnet/Library/AdaptiveCards/AdaptiveFallbackConverter.cs

@@ -5,7 +5,7 @@
 
 namespace AdaptiveCards
 {
-    public class AdaptiveFallbackConverter : JsonConverter, ILogWarnings
+    public class AdaptiveFallbackConverter : AdaptiveTypedBaseElementConverter, ILogWarnings
     {
         public List<AdaptiveWarning> Warnings { get; set; } = new List<AdaptiveWarning>();
 
@@ -103,7 +103,7 @@ public override bool CanConvert(Type objectType)
             return result;
         }
 
-        public static AdaptiveFallbackElement ParseFallback(JToken fallbackJSON, JsonSerializer serializer, string objectId, AdaptiveInternalID internalId)
+        public AdaptiveFallbackElement ParseFallback(JToken fallbackJSON, JsonSerializer serializer, string objectId, AdaptiveInternalID internalId)
         {
             // Handle fallback as a string ("drop")
             if (fallbackJSON.Type == JTokenType.String)

source/dotnet/Library/AdaptiveCards/AdaptiveInlinesConverter.cs

@@ -8,7 +8,7 @@
 
 namespace AdaptiveCards
 {
-    class AdaptiveInlinesConverter : JsonConverter
+    class AdaptiveInlinesConverter : AdaptiveTypedBaseElementConverter 
     {
         public override bool CanRead => true;
 
@@ -39,7 +39,17 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                     {
                         throw new AdaptiveSerializationException($"Property 'type' must be '{AdaptiveTextRun.TypeName}'");
                     }
-                    arrayList.Add((AdaptiveInline)jobj.ToObject(typeof(AdaptiveTextRun)));
+
+                    if(ParseContext == null) {
+                        ParseContext = new ParseContext();
+                    }
+
+                    var adaptiveInline = JsonConvert.DeserializeObject<AdaptiveTextRun>(jobj.ToString(), new JsonSerializerSettings
+                    {
+                        ContractResolver = new WarningLoggingContractResolver(new AdaptiveCardParseResult(), ParseContext),
+                        Converters = { new StrictIntConverter() }
+                    });
+                    arrayList.Add(adaptiveInline);
                 }
             }
             return arrayList;

source/dotnet/Library/AdaptiveCards/AdaptiveTypedBaseElementConverter.cs

@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace AdaptiveCards
+{
+    public abstract class AdaptiveTypedBaseElementConverter : JsonConverter
+    {
+        protected ParseContext parseContext;
+        public ParseContext ParseContext
+        {
+            get => parseContext;
+            set
+            {
+                parseContext = value;
+            }
+        }
+    }
+}

source/dotnet/Library/AdaptiveCards/AdaptiveTypedElement.cs

@@ -46,7 +46,7 @@ public abstract class AdaptiveTypedElement
         public AdaptiveFallbackElement Fallback { get; set; }
 
         [JsonIgnore]
-        public AdaptiveInternalID InternalID { get; } = ParseContext.PeekElement();
+        public AdaptiveInternalID InternalID { get; set; }
 
         /// <summary>
         /// A unique ID associated with the element. For Inputs the ID will be used as the key for Action.Submit response

source/dotnet/Library/AdaptiveCards/AdaptiveTypedElementConverter.cs

@@ -12,7 +12,7 @@ namespace AdaptiveCards
     /// <summary>
     ///     This handles using type field to instantiate strongly typed object on deserialization
     /// </summary>
-    public class AdaptiveTypedElementConverter : JsonConverter, ILogWarnings
+    public class AdaptiveTypedElementConverter : AdaptiveTypedBaseElementConverter, ILogWarnings
     {
         public List<AdaptiveWarning> Warnings { get; set; } = new List<AdaptiveWarning>();
 
@@ -98,6 +98,7 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
                 try
                 {
                     serializer.Populate(jObject.CreateReader(), result);
+                    result.InternalID = internalID;
                 }
                 catch (JsonSerializationException) { }
 

source/dotnet/Library/AdaptiveCards/IgnoreEmptyItemsConverter.cs

@@ -9,7 +9,7 @@
 
 namespace AdaptiveCards
 {
-    public class IgnoreEmptyItemsConverter<T> : JsonConverter
+    public class IgnoreEmptyItemsConverter<T> : AdaptiveTypedBaseElementConverter 
     {
         public override bool CanConvert(Type objectType)
         {

source/dotnet/Library/AdaptiveCards/ParseContext.cs

@@ -5,24 +5,18 @@
 
 namespace AdaptiveCards
 {
-    static class ParseContext
+    public class ParseContext
     {
-        public static void Initialize()
-        {
-            elementIds = new Dictionary<string, List<AdaptiveInternalID>>();
-            idStack = new Stack<Tuple<string, AdaptiveInternalID, bool>>();
-        }
-
         public enum ContextType { Element, Action };
 
-        public static ContextType Type { get; set; }
+        public ContextType Type { get; set; }
 
-        private static IDictionary<string, List<AdaptiveInternalID>> elementIds = new Dictionary<string, List<AdaptiveInternalID>>();
+        private IDictionary<string, List<AdaptiveInternalID>> elementIds = new Dictionary<string, List<AdaptiveInternalID>>();
 
-        private static Stack<Tuple<string, AdaptiveInternalID, bool>> idStack = new Stack<Tuple<string, AdaptiveInternalID, bool>>();
+        private Stack<Tuple<string, AdaptiveInternalID, bool>> idStack = new Stack<Tuple<string, AdaptiveInternalID, bool>>();
 
         // Push the provided state on to our ID stack
-        public static void PushElement(string idJsonProperty, AdaptiveInternalID internalId)
+        public void PushElement(string idJsonProperty, AdaptiveInternalID internalId)
         {
             if (internalId.Equals(AdaptiveInternalID.Invalid))
             {
@@ -31,7 +25,7 @@ public static void PushElement(string idJsonProperty, AdaptiveInternalID interna
             idStack.Push(new Tuple<string, AdaptiveInternalID, bool>(idJsonProperty, internalId, AdaptiveFallbackConverter.IsInFallback));
         }
 
-        public static AdaptiveInternalID PeekElement()
+        public AdaptiveInternalID PeekElement()
         {
             if (idStack.Count == 0)
             {
@@ -42,7 +36,7 @@ public static AdaptiveInternalID PeekElement()
         }
 
         // Pop the last id off our stack and perform validation 
-        public static void PopElement()
+        public void PopElement()
         {
             // about to pop an element off the stack. perform collision list maintenance and detection.
             var idsToPop = idStack.Peek();
@@ -121,7 +115,7 @@ public static void PopElement()
 
         // Walk stack looking for first element to be marked fallback (which isn't the ID we're supposed to skip), then
         // return its internal ID. If none, return an invalid ID. (see comment above)
-        public static AdaptiveInternalID GetNearestFallbackID(AdaptiveInternalID skipID)
+        public AdaptiveInternalID GetNearestFallbackID(AdaptiveInternalID skipID)
         {
             foreach (var curElement in idStack)
             {

source/dotnet/Library/AdaptiveCards/WarningLoggingContractResolver.cs

@@ -13,16 +13,23 @@ namespace AdaptiveCards
     internal class WarningLoggingContractResolver : DefaultContractResolver
     {
         private readonly AdaptiveCardParseResult _parseResult;
+        private ParseContext _parseContext;
 
-        public WarningLoggingContractResolver(AdaptiveCardParseResult parseResult)
+        public WarningLoggingContractResolver(AdaptiveCardParseResult parseResult, ParseContext parseContext)
         {
             _parseResult = parseResult;
+            _parseContext = parseContext;
         }
 
         protected override JsonConverter ResolveContractConverter(Type type)
         {
             var converter = base.ResolveContractConverter(type);
 
+            if (converter is AdaptiveTypedBaseElementConverter converterWithContext)
+            {
+                converterWithContext.ParseContext = _parseContext;
+            }
+
             if (converter is ILogWarnings logWarnings)
             {
                 logWarnings.Warnings = _parseResult.Warnings;
@@ -46,6 +53,11 @@ protected override JsonProperty CreateProperty(MemberInfo member, MemberSerializ
                 converter.Warnings = _parseResult.Warnings;
             }
 
+            if (property?.Converter is AdaptiveTypedBaseElementConverter converterWithContext)
+            {
+                converterWithContext.ParseContext = _parseContext;
+            }
+
             if (property?.MemberConverter is ILogWarnings memberConverter)
             {
                 memberConverter.Warnings = _parseResult.Warnings;