Razor generic parameter cascading

src/Components/Components/src/CascadingTypeParameterAttribute.cs

@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System;
+
+namespace Microsoft.AspNetCore.Components
+{
+    /// <summary>
+    /// Denotes the generic type parameter as cascading. This allows generic type inference
+    /// to use this type parameter value automatically on descendants that also have a type
+    /// parameter with the same name.
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, AllowMultiple = true, Inherited = false)]
+    public sealed class CascadingTypeParameterAttribute : Attribute
+    {
+        /// <summary>
+        /// Constructs an instance of <see cref="CascadingTypeParameterAttribute"/>.
+        /// </summary>
+        /// <param name="name">The name of the type parameter.</param>
+        public CascadingTypeParameterAttribute(string name)
+        {
+            if (name == null)
+            {
+                throw new ArgumentNullException(nameof(name));
+            }
+
+            Name = name;
+        }
+
+        /// <summary>
+        /// Gets the name of the type parameter.
+        /// </summary>
+        public string Name { get; }
+    }
+}

src/Components/Components/src/PublicAPI.Unshipped.txt

@@ -7,5 +7,8 @@ Microsoft.AspNetCore.Components.DynamicComponent.Parameters.set -> void
 Microsoft.AspNetCore.Components.DynamicComponent.SetParametersAsync(Microsoft.AspNetCore.Components.ParameterView parameters) -> System.Threading.Tasks.Task!
 Microsoft.AspNetCore.Components.DynamicComponent.Type.get -> System.Type!
 Microsoft.AspNetCore.Components.DynamicComponent.Type.set -> void
+Microsoft.AspNetCore.Components.CascadingTypeParameterAttribute
+Microsoft.AspNetCore.Components.CascadingTypeParameterAttribute.CascadingTypeParameterAttribute(string! name) -> void
+Microsoft.AspNetCore.Components.CascadingTypeParameterAttribute.Name.get -> string!
 static Microsoft.AspNetCore.Components.ParameterView.FromDictionary(System.Collections.Generic.IDictionary<string!, object?>! parameters) -> Microsoft.AspNetCore.Components.ParameterView
 virtual Microsoft.AspNetCore.Components.RenderTree.Renderer.DispatchEventAsync(ulong eventHandlerId, Microsoft.AspNetCore.Components.RenderTree.EventFieldInfo? fieldInfo, System.EventArgs! eventArgs) -> System.Threading.Tasks.Task!

src/Razor/Microsoft.AspNetCore.Razor.Language/src/Components/ComponentDesignTimeNodeWriter.cs

@@ -418,22 +418,49 @@ public override void WriteComponent(CodeRenderingContext context, ComponentInter
             }
             else
             {
+                var parameters = GetTypeInferenceMethodParameters(node.TypeInferenceNode);
+
+                // If this component is going to cascade any of its generic types, we have to split its type inference
+                // into two parts. First we call an inference method that captures all the parameters in local variables,
+                // then we use those to call the real type inference method that emits the component. The reason for this
+                // is so the captured variables can be used by descendants without re-evaluating the expressions.
+                CodeWriterExtensions.CSharpCodeWritingScope? typeInferenceCaptureScope = null;
+                if (node.Component.SuppliesCascadingGenericParameters())
+                {
+                    typeInferenceCaptureScope = context.CodeWriter.BuildScope();
+                    context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName);
+                    context.CodeWriter.Write(".");
+                    context.CodeWriter.Write(node.TypeInferenceNode.MethodName);
+                    context.CodeWriter.Write("_CaptureParameters(");
+                    var isFirst = true;
+                    foreach (var parameter in parameters.Where(p => p.UsedForTypeInference))
+                    {
+                        if (isFirst)
+                        {
+                            isFirst = false;
+                        }
+                        else
+                        {
+                            context.CodeWriter.Write(", ");
+                        }
+
+                        WriteTypeInferenceMethodParameterInnards(context, parameter);
+                        context.CodeWriter.Write(", out var ");
+
+                        var variableName = $"__typeInferenceArg_{_scopeStack.Depth}_{parameter.ParameterName}";
+                        context.CodeWriter.Write(variableName);
+
+                        UseCapturedCascadingGenericParameterVariable(node, parameter, variableName);
+                    }
+                    context.CodeWriter.WriteLine(");");
+                }
+
                 // When we're doing type inference, we can't write all of the code inline to initialize
                 // the component on the builder. We generate a method elsewhere, and then pass all of the information
                 // to that method. We pass in all of the attribute values + the sequence numbers.
                 //
                 // __Blazor.MyComponent.TypeInference.CreateMyComponent_0(__builder, 0, 1, ..., 2, ..., 3, ....);
 
-                // Preserve order of attributes + splats
-                var attributes = node.Children.Where(s =>
-                {
-                    return s is ComponentAttributeIntermediateNode || s is SplatIntermediateNode;
-                }).ToList();
-                var childContents = node.ChildContents.ToList();
-                var captures = node.Captures.ToList();
-                var setKeys = node.SetKeys.ToList();
-                var remaining = attributes.Count + childContents.Count + captures.Count + setKeys.Count;
-
                 context.CodeWriter.Write(node.TypeInferenceNode.FullTypeName);
                 context.CodeWriter.Write(".");
                 context.CodeWriter.Write(node.TypeInferenceNode.MethodName);
@@ -443,76 +470,27 @@ public override void WriteComponent(CodeRenderingContext context, ComponentInter
                 context.CodeWriter.Write(", ");
 
                 context.CodeWriter.Write("-1");
-                context.CodeWriter.Write(", ");
 
-                for (var i = 0; i < attributes.Count; i++)
+                foreach (var parameter in parameters)
                 {
-                    context.CodeWriter.Write("-1");
                     context.CodeWriter.Write(", ");
 
-                    // Don't type check generics, since we can't actually write the type name.
-                    // The type checking with happen anyway since we defined a method and we're generating
-                    // a call to it.
-                    if (attributes[i] is ComponentAttributeIntermediateNode attribute)
-                    {
-                        WriteComponentAttributeInnards(context, attribute, canTypeCheck: false);
-                    }
-                    else if (attributes[i] is SplatIntermediateNode splat)
-                    {
-                        WriteSplatInnards(context, splat, canTypeCheck: false);
-                    }
-
-                    remaining--;
-                    if (remaining > 0)
+                    if (!string.IsNullOrEmpty(parameter.SeqName))
                     {
+                        context.CodeWriter.Write("-1");
                         context.CodeWriter.Write(", ");
                     }
-                }
 
-                for (var i = 0; i < childContents.Count; i++)
-                {
-                    context.CodeWriter.Write("-1");
-                    context.CodeWriter.Write(", ");
-
-                    WriteComponentChildContentInnards(context, childContents[i]);
-
-                    remaining--;
-                    if (remaining > 0)
-                    {
-                        context.CodeWriter.Write(", ");
-                    }
+                    WriteTypeInferenceMethodParameterInnards(context, parameter);
                 }
 
-                for (var i = 0; i < setKeys.Count; i++)
-                {
-                    context.CodeWriter.Write("-1");
-                    context.CodeWriter.Write(", ");
-
-                    WriteSetKeyInnards(context, setKeys[i]);
-
-                    remaining--;
-                    if (remaining > 0)
-                    {
-                        context.CodeWriter.Write(", ");
-                    }
-                }
+                context.CodeWriter.Write(");");
+                context.CodeWriter.WriteLine();
 
-                for (var i = 0; i < captures.Count; i++)
+                if (typeInferenceCaptureScope.HasValue)
                 {
-                    context.CodeWriter.Write("-1");
-                    context.CodeWriter.Write(", ");
-
-                    WriteReferenceCaptureInnards(context, captures[i], shouldTypeCheck: false);
-
-                    remaining--;
-                    if (remaining > 0)
-                    {
-                        context.CodeWriter.Write(", ");
-                    }
+                    typeInferenceCaptureScope.Value.Dispose();
                 }
-
-                context.CodeWriter.Write(");");
-                context.CodeWriter.WriteLine();
             }
 
             // We want to generate something that references the Component type to avoid
@@ -540,6 +518,42 @@ public override void WriteComponent(CodeRenderingContext context, ComponentInter
             }
         }
 
+        private void WriteTypeInferenceMethodParameterInnards(CodeRenderingContext context, TypeInferenceMethodParameter parameter)
+        {
+            switch (parameter.Source)
+            {
+                case ComponentAttributeIntermediateNode attribute:
+                    // Don't type check generics, since we can't actually write the type name.
+                    // The type checking with happen anyway since we defined a method and we're generating
+                    // a call to it.
+                    WriteComponentAttributeInnards(context, attribute, canTypeCheck: false);
+                    break;
+                case SplatIntermediateNode splat:
+                    WriteSplatInnards(context, splat, canTypeCheck: false);
+                    break;
+                case ComponentChildContentIntermediateNode childNode:
+                    WriteComponentChildContentInnards(context, childNode);
+                    break;
+                case SetKeyIntermediateNode setKey:
+                    WriteSetKeyInnards(context, setKey);
+                    break;
+                case ReferenceCaptureIntermediateNode capture:
+                    WriteReferenceCaptureInnards(context, capture, shouldTypeCheck: false);
+                    break;
+                case CascadingGenericTypeParameter syntheticArg:
+                    // The value should be populated before we use it, because we emit code for creating ancestors
+                    // first, and that's where it's populated. However if this goes wrong somehow, we don't want to
+                    // throw, so use a fallback
+                    context.CodeWriter.Write(syntheticArg.ValueExpression ?? "default");
+                    break;
+                case TypeInferenceCapturedVariable capturedVariable:
+                    context.CodeWriter.Write(capturedVariable.VariableName);
+                    break;
+                default:
+                    throw new InvalidOperationException($"Not implemented: type inference method parameter from source {parameter.Source}");
+            }
+        }
+
         public override void WriteComponentAttribute(CodeRenderingContext context, ComponentAttributeIntermediateNode node)
         {
             if (context == null)