Update RazorSDK for latest Razor Compiler API breaking changes

Author: DustinCampbell

src/RazorSdk/Tool/CompositeRazorProjectFileSystem.cs

@@ -27,7 +27,7 @@ public override IEnumerable<RazorProjectItem> EnumerateItems(string basePath)
             }
         }
 
-        public override RazorProjectItem GetItem(string path, string fileKind)
+        public override RazorProjectItem GetItem(string path, RazorFileKind? fileKind)
         {
             RazorProjectItem razorProjectItem = null;
             foreach (var fileSystem in FileSystems)

src/RazorSdk/Tool/GenerateCommand.cs

@@ -329,10 +329,13 @@ private static SourceItem[] GetSourceItems(List<string> sources, List<string> ou
             var items = new SourceItem[sources.Count];
             for (var i = 0; i < items.Length; i++)
             {
-                var fileKind = fileKinds.Count > 0 ? fileKinds[i] : "mvc";
+                var fileKind = fileKinds.Count > 0
+                    ? ConvertFileKind(fileKinds[i])
+                    : RazorFileKind.Legacy;
+
                 if (AspNetCore.Razor.Language.FileKinds.IsComponent(fileKind))
                 {
-                    fileKind = AspNetCore.Razor.Language.FileKinds.GetComponentFileKindFromFilePath(sources[i]);
+                    fileKind = GetComponentFileKindFromFilePath(sources[i]);
                 }
 
                 var cssScopeValue = cssScopeAssociations.TryGetValue(sources[i], out var cssScopeIndex)
@@ -345,6 +348,33 @@ private static SourceItem[] GetSourceItems(List<string> sources, List<string> ou
             return items;
         }
 
+        private static RazorFileKind ConvertFileKind(string fileKind)
+        {
+            if (string.Equals(fileKind, "component", StringComparison.OrdinalIgnoreCase))
+            {
+                return RazorFileKind.Component;
+            }
+
+            if (string.Equals(fileKind, "componentImport", StringComparison.OrdinalIgnoreCase))
+            {
+                return RazorFileKind.ComponentImport;
+            }
+
+            if (string.Equals(fileKind, "mvc", StringComparison.OrdinalIgnoreCase))
+            {
+                return RazorFileKind.Legacy;
+            }
+
+            return RazorFileKind.Legacy;
+        }
+
+        private static RazorFileKind GetComponentFileKindFromFilePath(string filePath)
+        {
+            return AspNetCore.Razor.Language.FileKinds.TryGetFileKindFromPath(filePath, out var kind) && kind != RazorFileKind.Legacy
+                ? kind
+                : RazorFileKind.Component;
+        }
+
         private OutputItem[] GenerateCode(RazorProjectEngine engine, SourceItem[] inputs)
         {
             var outputs = new OutputItem[inputs.Length];
@@ -377,7 +407,7 @@ public OutputItem(
 
         private readonly struct SourceItem
         {
-            public SourceItem(string sourcePath, string outputPath, string physicalRelativePath, string fileKind, string cssScope)
+            public SourceItem(string sourcePath, string outputPath, string physicalRelativePath, RazorFileKind fileKind, string cssScope)
             {
                 SourcePath = sourcePath;
                 OutputPath = outputPath;
@@ -397,7 +427,7 @@ public SourceItem(string sourcePath, string outputPath, string physicalRelativeP
 
             public string FilePath { get; }
 
-            public string FileKind { get; }
+            public RazorFileKind FileKind { get; }
 
             public string CssScope { get; }
         }

test/Microsoft.NET.Sdk.Razor.Tool.Tests/NotFoundProjectItem.cs

@@ -16,11 +16,11 @@ internal class NotFoundProjectItem : RazorProjectItem
         /// <param name="basePath">The base path.</param>
         /// <param name="path">The path.</param>
         /// <param name="fileKind">The file kind</param>
-        public NotFoundProjectItem(string basePath, string path, string fileKind)
+        public NotFoundProjectItem(string basePath, string path, RazorFileKind? fileKind)
         {
             BasePath = basePath;
             FilePath = path;
-            FileKind = fileKind ?? FileKinds.GetFileKindFromFilePath(path);
+            FileKind = fileKind ?? FileKinds.GetFileKindFromPath(path);
         }
 
         /// <inheritdoc />
@@ -30,7 +30,7 @@ public NotFoundProjectItem(string basePath, string path, string fileKind)
         public override string FilePath { get; }
 
         /// <inheritdoc />
-        public override string FileKind { get; }
+        public override RazorFileKind FileKind { get; }
 
         /// <inheritdoc />
         public override bool Exists => false;

test/Microsoft.NET.Sdk.Razor.Tool.Tests/TestRazorProjectItem.cs

@@ -7,14 +7,14 @@ namespace Microsoft.AspNetCore.Razor.Language
 {
     public class TestRazorProjectItem : RazorProjectItem
     {
-        private readonly string _fileKind;
+        private readonly RazorFileKind? _fileKind;
 
         public TestRazorProjectItem(
             string filePath,
             string physicalPath = null,
             string relativePhysicalPath = null,
             string basePath = "/",
-            string fileKind = null,
+            RazorFileKind? fileKind = null,
             string cssScope = null)
         {
             FilePath = filePath;
@@ -27,7 +27,7 @@ public TestRazorProjectItem(
 
         public override string BasePath { get; }
 
-        public override string FileKind => _fileKind ?? base.FileKind;
+        public override RazorFileKind FileKind => _fileKind ?? base.FileKind;
 
         public override string FilePath { get; }