Added support for DictionaryAttributePrefix and ModelExplorer property in liquid

src/OrchardCore/OrchardCore.DisplayManagement.Liquid/LiquidViewTemplate.cs

@@ -84,6 +84,7 @@ static LiquidViewTemplate()
             Factory.RegisterBlock<HelperBlock>("block");
             Factory.RegisterBlock<NamedHelperBlock>("a");
             Factory.RegisterBlock<NamedHelperBlock>("zone");
+            Factory.RegisterBlock<NamedHelperBlock>("form");
             Factory.RegisterBlock<NamedHelperBlock>("scriptblock");
 
             // Dynamic caching

src/OrchardCore/OrchardCore.DisplayManagement.Liquid/TagHelpers/LiquidTagHelperActivator.cs

@@ -18,8 +18,8 @@ public class LiquidTagHelperActivator
         public static readonly LiquidTagHelperActivator None = new LiquidTagHelperActivator();
 
         private readonly Func<ITagHelperFactory, ViewContext, ITagHelper> _activatorByFactory;
-        private readonly Dictionary<string, Action<ITagHelper, FluidValue>> _setters =
-            new Dictionary<string, Action<ITagHelper, FluidValue>>(StringComparer.OrdinalIgnoreCase);
+        private readonly Dictionary<string, Action<ITagHelper, ModelExpressionProvider, ViewDataDictionary<dynamic>, string, FluidValue>> _setters =
+            new Dictionary<string, Action<ITagHelper, ModelExpressionProvider, ViewDataDictionary<dynamic>, string, FluidValue>>(StringComparer.OrdinalIgnoreCase);
 
         private readonly Func<ViewContext, ITagHelper> _activatorByService;
         private readonly Action<object, object> _viewContextSetter;
@@ -46,9 +46,20 @@ public LiquidTagHelperActivator(Type type)
                     {
                         allNames.Add(htmlAttribute.Name.Substring(4).ToPascalCaseDash());
                     }
+                    var dictonaryPrefix =  htmlAttribute.DictionaryAttributePrefix;
+                    if(dictonaryPrefix != null)
+                    {
+                        allNames.Add(dictonaryPrefix.ToPascalCaseDash());
+
+                        if (dictonaryPrefix.StartsWith("asp-", StringComparison.Ordinal))
+                        {
+                            allNames.Add(dictonaryPrefix.Substring(4).ToPascalCaseDash());
+                        }
+                    }
                 }
 
                 var setter = MakeFastPropertySetter(type, property);
+                var getter = MakeFastPropertyGetter(type, property);
 
                 foreach (var propertyName in allNames)
                 {
@@ -58,7 +69,7 @@ public LiquidTagHelperActivator(Type type)
                         continue;
                     }
 
-                    _setters.Add(propertyName, (h, v) =>
+                    _setters.Add(propertyName, (h, mp, vd, k, v) =>
                     {
                         object value = null;
 
@@ -78,6 +89,24 @@ public LiquidTagHelperActivator(Type type)
                         {
                             value = v.IsNil() ? null : (bool?)Convert.ToBoolean(v.ToStringValue());
                         }
+                        else if(property.PropertyType == typeof(IDictionary<string, string>)) 
+                        {
+                            IDictionary<string, string> dictValue = (IDictionary<string, string>) getter(h); 
+                            if(!string.IsNullOrWhiteSpace(k))
+                                dictValue[k] = v.ToStringValue();
+                            value = dictValue;
+                        }
+                        else if(property.PropertyType == typeof(IDictionary<string, object>)) 
+                        {
+                            IDictionary<string, object> dictValue = (IDictionary<string, object>) getter(h);
+                            if(!string.IsNullOrWhiteSpace(k)) 
+                                dictValue[k] = v.ToObjectValue();
+                            value = dictValue;
+                        }
+                        else if(property.PropertyType == typeof(Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpression))
+                        {
+                            value = mp.CreateModelExpression<dynamic>(vd,v.ToStringValue() );                            
+                        }
                         else
                         {
                             value = v.ToObjectValue();
@@ -123,18 +152,26 @@ public LiquidTagHelperActivator(Type type)
             {
                 tagHelper = _activatorByFactory(factory, context);
             }
+
+            var dictKeySeperator =new char[] {'-','_'};
+
+            var expresionProvider = context.HttpContext.RequestServices.GetService(typeof(Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpressionProvider)) as 
+                            Microsoft.AspNetCore.Mvc.ViewFeatures.ModelExpressionProvider;
+
+            var viewData = new ViewDataDictionary<dynamic>(context.ViewData);
 
             foreach (var name in arguments.Names)
             {
                 var propertyName = name.ToPascalCaseUnderscore();
-
+                var dictPropertyName = propertyName.LastIndexOfAny(dictKeySeperator) > -1 ? propertyName.Substring(0,propertyName.LastIndexOfAny(dictKeySeperator)+1) : String.Empty;
+                var dictPropertyKey = propertyName.LastIndexOfAny(dictKeySeperator) > -1 ? propertyName.Substring(propertyName.LastIndexOfAny(dictKeySeperator)+1) : String.Empty;
                 var found = false;
 
-                if (_setters.TryGetValue(propertyName, out var setter))
+                if (_setters.TryGetValue(propertyName, out var setter) || ( !string.IsNullOrWhiteSpace(dictPropertyName) && _setters.TryGetValue(dictPropertyName, out setter) ) )
                 {
                     try
                     {
-                        setter(tagHelper, arguments[name]);
+                        setter(tagHelper, expresionProvider, viewData, dictPropertyKey, arguments[name] );
                         found = true;
                     }
                     catch (ArgumentException e)
@@ -172,12 +209,28 @@ public static ITagHelper CreateTagHelper(ITagHelperFactory tagHelperFactory, Vie
             var setterDelegate = setterClosedGenericMethod.CreateDelegate(typeof(Action<object, object>), setterAsAction);
 
             return (Action<object, object>)setterDelegate;
-        }
+        }               
 
         private static readonly MethodInfo CallPropertySetterOpenGenericMethod =
             typeof(LiquidTagHelperActivator).GetTypeInfo().GetDeclaredMethod(nameof(CallPropertySetter));
 
         private static void CallPropertySetter<TDeclaringType, TValue>(Action<TDeclaringType, TValue> setter, object target, object value)
             => setter((TDeclaringType)target, (TValue)value);
+
+        private static Func<object, object> MakeFastPropertyGetter(Type type, PropertyInfo prop)
+        {
+            // Create a delegate TDeclaringType -> { TDeclaringType.Property = TValue; }
+            var getterAsFunc = prop.GetMethod.CreateDelegate(typeof(Func<,>).MakeGenericType(type, prop.PropertyType));
+            var getterClosedGenericMethod = CallPropertyGetterOpenGenericMethod.MakeGenericMethod(type, prop.PropertyType);
+            var getterDelegate = getterClosedGenericMethod.CreateDelegate(typeof(Func<object, object>), getterAsFunc);
+
+            return (Func<object, object>)getterDelegate;
+        }
+
+        private static readonly MethodInfo CallPropertyGetterOpenGenericMethod =
+            typeof(LiquidTagHelperActivator).GetTypeInfo().GetDeclaredMethod(nameof(CallPropertyGetter));
+
+        private static object CallPropertyGetter<TDeclaringType, TValue>(Func<TDeclaringType, TValue> getter, object target)
+            =>  getter((TDeclaringType)target);
     }
 }

src/OrchardCore/OrchardCore.Mvc.Core/Utilities/StringExtensions.cs

@@ -445,6 +445,7 @@ public static string ToPascalCase(this string attribute, char upperAfterDelimite
             var nextIsUpper = true;
             attribute = attribute.Trim();
             var result = new StringBuilder(attribute.Length);
+            var endsWithDelimiter = attribute.EndsWith(upperAfterDelimiter);
             foreach (var c in attribute)
             {
                 if (c == upperAfterDelimiter)
@@ -465,6 +466,8 @@ public static string ToPascalCase(this string attribute, char upperAfterDelimite
                 nextIsUpper = false;
             }
 
+            if(endsWithDelimiter)
+                result.Append(upperAfterDelimiter);
             return result.ToString();
         }
     }