Merge pull request #1881 from riganti/bug/route-groups

Refactoring & cleanup in routes & route groups + bug fixes

Author: tomasherceg

src/Framework/Framework/Compilation/DotHtmlFileInfo.cs

@@ -14,7 +14,7 @@ public sealed class DotHtmlFileInfo
         public ImmutableArray<CompilationDiagnosticViewModel> Warnings { get; internal set; } = ImmutableArray<CompilationDiagnosticViewModel>.Empty;
 
         /// <summary>Gets or sets the virtual path to the view.</summary>
-        public string VirtualPath { get; }
+        public string? VirtualPath { get; }
 
         public string? TagName { get; }
         public string? Namespace { get; }
@@ -25,7 +25,7 @@ public sealed class DotHtmlFileInfo
         public ImmutableArray<string>? DefaultValues { get; }
         public bool? HasParameters { get; }
 
-        public DotHtmlFileInfo(string virtualPath, string? tagName = null, string? nameSpace = null, string? assembly = null, string? tagPrefix = null, string? url = null, string? routeName = null, ImmutableArray<string>? defaultValues = null, bool? hasParameters = null)
+        public DotHtmlFileInfo(string? virtualPath, string? tagName = null, string? nameSpace = null, string? assembly = null, string? tagPrefix = null, string? url = null, string? routeName = null, ImmutableArray<string>? defaultValues = null, bool? hasParameters = null)
         {
             VirtualPath = virtualPath;
             Status = IsDothtmlFile(virtualPath) ? CompilationState.None : CompilationState.NonCompilable;
@@ -40,7 +40,7 @@ public DotHtmlFileInfo(string virtualPath, string? tagName = null, string? nameS
             HasParameters = hasParameters;
         }
 
-        private static bool IsDothtmlFile(string virtualPath)
+        private static bool IsDothtmlFile(string? virtualPath)
         {
             return !string.IsNullOrWhiteSpace(virtualPath) &&
                 (

src/Framework/Framework/Compilation/DotvvmViewCompilationService.cs

@@ -122,7 +122,7 @@ public async Task<bool> CompileAll(bool buildInParallel = true, bool forceRecomp
                 var compilationTaskFactory = (DotHtmlFileInfo t) => () => {
                     BuildView(t, forceRecompile, out var masterPage);
                     if (masterPage != null && masterPage.Status == CompilationState.None)
-                        discoveredMasterPages.TryAdd(masterPage.VirtualPath, masterPage);
+                        discoveredMasterPages.TryAdd(masterPage.VirtualPath!, masterPage);
                 };
 
                 var compileTasks = filesToCompile.Select(compilationTaskFactory).ToArray();
@@ -184,9 +184,9 @@ public bool BuildView(DotHtmlFileInfo file, bool forceRecompile, out DotHtmlFile
                 try
                 {
                     if (forceRecompile)
-                        controlBuilderFactory.InvalidateCache(file.VirtualPath);
+                        controlBuilderFactory.InvalidateCache(file.VirtualPath!);
 
-                    var pageBuilder = controlBuilderFactory.GetControlBuilder(file.VirtualPath);
+                    var pageBuilder = controlBuilderFactory.GetControlBuilder(file.VirtualPath!);
 
                     using var scopedServices = dotvvmConfiguration.ServiceProvider.CreateScope(); // dependencies that are configured as scoped cannot be resolved from root service provider
                     scopedServices.ServiceProvider.GetRequiredService<DotvvmRequestContextStorage>().Context = new ViewCompilationFakeRequestContext(scopedServices.ServiceProvider);

src/Framework/Framework/Compilation/Static/StaticViewCompiler.cs

@@ -10,6 +10,7 @@
 using DotVVM.Framework.Configuration;
 using DotVVM.Framework.Hosting;
 using DotVVM.Framework.Security;
+using DotVVM.Framework.Utils;
 using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
@@ -33,7 +34,7 @@ public static ImmutableArray<DotvvmCompilationDiagnostic> CompileAll(
                 diagnostics.AddRange(CompileNoThrow(configuration, markupControl!));
             }
 
-            var views = configuration.RouteTable.Select(r => r.VirtualPath).ToImmutableArray();
+            var views = configuration.RouteTable.Select(r => r.VirtualPath).WhereNotNull().ToImmutableArray();
             foreach(var view in views)
             {
                 diagnostics.AddRange(CompileNoThrow(configuration, view));

src/Framework/Framework/Configuration/FreezableDictionary.cs

@@ -23,7 +23,7 @@ public static void Freeze<K, V>([AllowNull] ref IDictionary<K, V> dict)
             }
         }
     }
-    sealed class FreezableDictionary<K, V> : IDictionary<K, V>, IReadOnlyCollection<KeyValuePair<K, V>>
+    sealed class FreezableDictionary<K, V> : IDictionary<K, V>, IReadOnlyCollection<KeyValuePair<K, V>>, IReadOnlyDictionary<K, V>
         where K : notnull
     {
         private readonly Dictionary<K, V> dict;
@@ -95,12 +95,18 @@ public V this[K index]
             set { ThrowIfFrozen(); dict[index] = value; }
         }
 
+        public Dictionary<K, V> CreateCopy() => new(dict, dict.Comparer);
+
         public int Count => dict.Count;
 
         public bool IsReadOnly => isFrozen;
 
         public ICollection<K> Keys => ((IDictionary<K, V>)dict).Keys.ToArray();
 
         public ICollection<V> Values => ((IDictionary<K, V>)dict).Values.ToArray();
+
+        IEnumerable<K> IReadOnlyDictionary<K, V>.Keys => Keys;
+
+        IEnumerable<V> IReadOnlyDictionary<K, V>.Values => Values;
     }
 }

src/Framework/Framework/Controls/RouteLinkHelpers.cs

@@ -194,7 +194,7 @@ private static void EnsureValidBindingType(IBinding binding)
 
         private static Dictionary<string, object?> ComposeNewRouteParameters(RouteLink control, IDotvvmRequestContext context, RouteBase route)
         {
-            var parameters = new Dictionary<string, object?>(route.DefaultValues, StringComparer.OrdinalIgnoreCase);
+            var parameters = route.CloneDefaultValues();
             foreach (var param in context.Parameters!)
             {
                 parameters[param.Key] = param.Value;

src/Framework/Framework/Hosting/AggregateMarkupFileLoader.cs

@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text;
 using DotVVM.Framework.Configuration;
+using DotVVM.Framework.Utils;
 
 namespace DotVVM.Framework.Hosting
 {
@@ -39,7 +40,8 @@ public AggregateMarkupFileLoader()
         /// </summary>
         public string GetMarkupFileVirtualPath(IDotvvmRequestContext context)
         {
-            return context.Route!.VirtualPath;
+            return context.Route!.VirtualPath
+                ?? throw new Exception($"The route {context.Route.RouteName} must have a non-null virtual path.");
         }
     }
 }

src/Framework/Framework/Hosting/DefaultMarkupFileLoader.cs

@@ -38,7 +38,8 @@ public class DefaultMarkupFileLoader : IMarkupFileLoader
         /// </summary>
         public string GetMarkupFileVirtualPath(IDotvvmRequestContext context)
         {
-            return context.Route!.VirtualPath;
+            return context.Route!.VirtualPath
+                ?? throw new Exception($"The route {context.Route.RouteName} must have a non-null virtual path.");
         }
     }
 }

src/Framework/Framework/Hosting/EmbeddedMarkupFileLoader.cs

@@ -63,7 +63,8 @@ public class EmbeddedMarkupFileLoader : IMarkupFileLoader
         /// </summary>
         public string GetMarkupFileVirtualPath(IDotvvmRequestContext context)
         {
-            return context.Route!.VirtualPath;
+            return context.Route!.VirtualPath
+                ?? throw new Exception($"The route {context.Route.RouteName} must have a non-null virtual path.");
         }
     }
 }

src/Framework/Framework/ResourceManagement/LocalResourceUrlManager.cs

@@ -28,6 +28,7 @@ public LocalResourceUrlManager(DotvvmConfiguration configuration, IResourceHashS
             this.resourceRoute = new DotvvmRoute(
                 url: $"{HostingConstants.ResourceRouteName}/{{{HashParameterName}}}/{{{NameParameterName}:regex(.*)}}",
                 virtualPath: "",
+                name: $"_dotvvm_{nameof(LocalResourceUrlManager)}",
                 defaultValues: null,
                 presenterFactory: _ => throw new NotSupportedException(),
                 configuration: configuration);

src/Framework/Framework/Routing/DefaultRouteStrategy.cs

@@ -107,10 +107,7 @@ protected virtual RouteBase BuildRoute(RouteStrategyMarkupFileInfo file)
             var defaultParameters = GetRouteDefaultParameters(file);
             var presenterFactory = GetRoutePresenterFactory(file);
 
-            return new DotvvmRoute(url, file.AppRelativePath, defaultParameters, presenterFactory, configuration)
-            {
-                RouteName = routeName
-            };
+            return new DotvvmRoute(url, file.AppRelativePath, routeName, defaultParameters, presenterFactory, configuration);
         }
 
         protected virtual string GetRouteName(RouteStrategyMarkupFileInfo file)
@@ -162,7 +159,7 @@ private static IEnumerable<string> GetRoutesForFile(string fileName)
         protected override IEnumerable<RouteBase> BuildRoutes(RouteStrategyMarkupFileInfo file)
         {
             return getRouteList(file.AppRelativePath)
-                   .Select(url => new DotvvmRoute(url, file.AppRelativePath, GetRouteDefaultParameters(file), GetRoutePresenterFactory(file), this.configuration) { RouteName = url });
+                   .Select(url => new DotvvmRoute(url, file.AppRelativePath, url, GetRouteDefaultParameters(file), GetRoutePresenterFactory(file), this.configuration));
         }
     }
 }