Minor changes

Author: kapi2289

InertiaCore/Extensions/Configure.cs

@@ -21,7 +21,7 @@ public static IApplicationBuilder UseInertia(this IApplicationBuilder app)
         if (viteBuilder != null)
         {
             Vite.UseBuilder(viteBuilder);
-            Inertia.Version(() => Vite.GetManifestHash());
+            Inertia.Version(Vite.GetManifestHash);
         }
 
         app.Use(async (context, next) =>

InertiaCore/Inertia.cs

@@ -19,7 +19,9 @@ public static class Inertia
 
     public static Task<IHtmlContent> Html(dynamic model) => _factory.Html(model);
 
-    public static void Version(object? version) => _factory.Version(version);
+    public static void Version(string? version) => _factory.Version(version);
+
+    public static void Version(Func<string?> version) => _factory.Version(version);
 
     public static string? GetVersion() => _factory.GetVersion();
 
@@ -29,9 +31,9 @@ public static class Inertia
 
     public static void Share(IDictionary<string, object?> data) => _factory.Share(data);
 
-    public static AlwaysProp Always(object? value) => _factory.Always(value);
+    public static AlwaysProp Always(string value) => _factory.Always(value);
 
-    public static AlwaysProp Always(Func<object?> callback) => _factory.Always(callback);
+    public static AlwaysProp Always(Func<string> callback) => _factory.Always(callback);
 
     public static AlwaysProp Always(Func<Task<object?>> callback) => _factory.Always(callback);
 

InertiaCore/ResponseFactory.cs

@@ -16,7 +16,8 @@ internal interface IResponseFactory
     public Response Render(string component, object? props = null);
     public Task<IHtmlContent> Head(dynamic model);
     public Task<IHtmlContent> Html(dynamic model);
-    public void Version(object? version);
+    public void Version(string? version);
+    public void Version(Func<string?> version);
     public string? GetVersion();
     public LocationResult Location(string url);
     public void Share(string key, object? value);
@@ -95,7 +96,9 @@ public async Task<IHtmlContent> Html(dynamic model)
         return new HtmlString($"<div id=\"app\" data-page=\"{encoded}\"></div>");
     }
 
-    public void Version(object? version) => _version = version;
+    public void Version(string? version) => _version = version;
+
+    public void Version(Func<string?> version) => _version = version;
 
     public string? GetVersion() => _version switch
     {

InertiaCore/Utils/Vite.cs

@@ -67,12 +67,11 @@ public HtmlString Input(string path)
             throw new Exception("Vite Manifest is invalid. Run `npm run build` and try again.");
         }
 
-        if (!manifestJson.ContainsKey(path))
+        if (!manifestJson.TryGetValue(path, out var obj))
         {
             throw new Exception("Asset not found in manifest: " + path);
         }
 
-        var obj = manifestJson[path];
         var filePath = obj.GetProperty("file");
 
         if (IsCssPath(filePath.ToString()))
@@ -210,12 +209,9 @@ private static string GetString(IHtmlContent content)
 
     public string? GetManifest()
     {
-        if (_fileSystem.File.Exists(GetPublicPathForFile(_options.Value.ManifestFilename)))
-        {
-            return _fileSystem.File.ReadAllText(GetPublicPathForFile(_options.Value.ManifestFilename));
-        }
-
-        return null;
+        return _fileSystem.File.Exists(GetPublicPathForFile(_options.Value.ManifestFilename))
+            ? _fileSystem.File.ReadAllText(GetPublicPathForFile(_options.Value.ManifestFilename))
+            : null;
     }
 }
 

InertiaCoreTests/UnitTestVite.cs

@@ -3,11 +3,10 @@
 using InertiaCore.Models;
 using InertiaCore.Utils;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Options;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Options;
 using Moq;
-using Microsoft.Extensions.DependencyInjection;
 
 namespace InertiaCoreTests;
 
@@ -73,7 +72,8 @@ public void TestNotHot()
     }
 
     [Test]
-    [Description("Test if the Vite Helper handles generating HTML tags for both JS and CSS from HMR and the manifest properly.")]
+    [Description(
+        "Test if the Vite Helper handles generating HTML tags for both JS and CSS from HMR and the manifest properly.")]
     public void TestViteInput()
     {
         var fileSystem = new MockFileSystem(new Dictionary<string, MockFileData>());
@@ -226,7 +226,7 @@ public async Task TestViteVersion()
         fileSystem.AddFile(@"/wwwroot/build/manifest.json",
             new MockFileData("{\"app.tsx\": {\"file\": \"assets/main-19038c6a.js\"}}"));
 
-        _factory.Version(() => Vite.GetManifestHash());
+        _factory.Version(Vite.GetManifestHash);
 
         var response = _factory.Render("Test/Page", new
         {
@@ -247,7 +247,7 @@ public async Task TestViteVersion()
 
         Assert.Multiple(() =>
         {
-            Assert.That(result, Is.InstanceOf(typeof(JsonResult)));
+            Assert.That(result, Is.InstanceOf<JsonResult>());
 
             var json = (result as JsonResult)?.Value;
             Assert.That((json as Page)?.Version, Is.EqualTo("bba1afd1066309f4a69430e0c446ba8d"));