Fixed bug with ArrayBufferAsync using IJSInProcessObjectReference and updated wrongly named internal variables.

KristofferStrube · KristofferStrube · commit 866d119faead · 2022-11-10T10:19:25.000+01:00
diff --git a/src/KristofferStrube.Blazor.FileAPI/BaseJSWrapper.cs b/src/KristofferStrube.Blazor.FileAPI/BaseJSWrapper.cs
@@ -15,7 +15,7 @@ public abstract class BaseJSWrapper : IAsyncDisposable
     /// <param name="jSReference">A JS reference to an existing JS instance that should be wrapped.</param>
     internal BaseJSWrapper(IJSRuntime jSRuntime, IJSObjectReference jSReference)
     {
-        helperTask = new(() => jSRuntime.GetHelperAsync());
+        helperTask = new(jSRuntime.GetHelperAsync);
         JSReference = jSReference;
         this.jSRuntime = jSRuntime;
     }
diff --git a/src/KristofferStrube.Blazor.FileAPI/Blob.InProcess.cs b/src/KristofferStrube.Blazor.FileAPI/Blob.InProcess.cs
@@ -19,8 +19,8 @@ public class BlobInProcess : Blob
     /// <returns>A wrapper instance for a <see cref="Blob"/>.</returns>
     public static async Task<BlobInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInProcessObjectReference jSReference)
     {
-        IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();
-        return new BlobInProcess(jSRuntime, inProcesshelper, jSReference);
+        IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();
+        return new BlobInProcess(jSRuntime, inProcessHelper, jSReference);
     }
 
     /// <summary>
@@ -32,16 +32,16 @@ public static async Task<BlobInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInP
     /// <returns></returns>
     public static new async Task<BlobInProcess> CreateAsync(IJSRuntime jSRuntime, IList<BlobPart>? blobParts = null, BlobPropertyBag? options = null)
     {
-        IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();
+        IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();
         object?[]? jsBlobParts = blobParts?.Select<BlobPart, object?>(blobPart => blobPart.type switch
             {
                 BlobPartType.BufferSource => blobPart.byteArrayPart,
                 BlobPartType.Blob => blobPart.blobPart?.JSReference,
                 _ => blobPart.stringPart
             })
             .ToArray();
-        IJSInProcessObjectReference jSInstance = await inProcesshelper.InvokeAsync<IJSInProcessObjectReference>("constructBlob", jsBlobParts, options);
-        return new BlobInProcess(jSRuntime, inProcesshelper, jSInstance);
+        IJSInProcessObjectReference jSInstance = await inProcessHelper.InvokeAsync<IJSInProcessObjectReference>("constructBlob", jsBlobParts, options);
+        return new BlobInProcess(jSRuntime, inProcessHelper, jSInstance);
     }
 
     /// <summary>
diff --git a/src/KristofferStrube.Blazor.FileAPI/Blob.cs b/src/KristofferStrube.Blazor.FileAPI/Blob.cs
@@ -107,7 +107,7 @@ public async Task<string> TextAsync()
     /// <returns>All bytes in the blob.</returns>
     public async Task<byte[]> ArrayBufferAsync()
     {
-        IJSInProcessObjectReference jSInstance = await JSReference.InvokeAsync<IJSInProcessObjectReference>("arrayBuffer");
+        IJSObjectReference jSInstance = await JSReference.InvokeAsync<IJSObjectReference>("arrayBuffer");
         IJSObjectReference helper = await helperTask.Value;
         return await helper.InvokeAsync<byte[]>("arrayBuffer", jSInstance);
     }
diff --git a/src/KristofferStrube.Blazor.FileAPI/File.InProcess.cs b/src/KristofferStrube.Blazor.FileAPI/File.InProcess.cs
@@ -19,8 +19,8 @@ public class FileInProcess : File
     /// <returns>A wrapper instance for a <see cref="File"/>.</returns>
     public static async Task<FileInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInProcessObjectReference jSReference)
     {
-        IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();
-        return new FileInProcess(jSRuntime, inProcesshelper, jSReference);
+        IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();
+        return new FileInProcess(jSRuntime, inProcessHelper, jSReference);
     }
 
     /// <summary>
@@ -33,16 +33,16 @@ public static async Task<FileInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInP
     /// <returns></returns>
     public static new async Task<FileInProcess> CreateAsync(IJSRuntime jSRuntime, IList<BlobPart> fileBits, string fileName, FilePropertyBag? options = null)
     {
-        IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();
+        IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();
         object?[]? jsFileBits = fileBits.Select<BlobPart, object?>(blobPart => blobPart.type switch
             {
                 BlobPartType.BufferSource => blobPart.byteArrayPart,
                 BlobPartType.Blob => blobPart.stringPart,
                 _ => blobPart.blobPart?.JSReference
             })
             .ToArray();
-        IJSInProcessObjectReference jSInstance = await inProcesshelper.InvokeAsync<IJSInProcessObjectReference>("constructFile", jsFileBits, fileName, options);
-        return new FileInProcess(jSRuntime, inProcesshelper, jSInstance);
+        IJSInProcessObjectReference jSInstance = await inProcessHelper.InvokeAsync<IJSInProcessObjectReference>("constructFile", jsFileBits, fileName, options);
+        return new FileInProcess(jSRuntime, inProcessHelper, jSInstance);
     }
 
     /// <summary>
diff --git a/src/KristofferStrube.Blazor.FileAPI/FileReader.InProcess.cs b/src/KristofferStrube.Blazor.FileAPI/FileReader.InProcess.cs
@@ -18,8 +18,8 @@ public class FileReaderInProcess : FileReader
     /// <returns>A wrapper instance for a <see cref="FileReader"/>.</returns>
     public static async Task<FileReaderInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInProcessObjectReference jSReference)
     {
-        IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();
-        return new FileReaderInProcess(jSRuntime, inProcesshelper, jSReference);
+        IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();
+        return new FileReaderInProcess(jSRuntime, inProcessHelper, jSReference);
     }
 
     /// <summary>
@@ -29,10 +29,10 @@ public static async Task<FileReaderInProcess> CreateAsync(IJSRuntime jSRuntime,
     /// <returns>A wrapper instance for a <see cref="FileReader"/>.</returns>
     public static new async Task<FileReaderInProcess> CreateAsync(IJSRuntime jSRuntime)
     {
-        IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();
-        IJSInProcessObjectReference jSInstance = await inProcesshelper.InvokeAsync<IJSInProcessObjectReference>("constructFileReader");
-        FileReaderInProcess fileReaderInProcess = new FileReaderInProcess(jSRuntime, inProcesshelper, jSInstance);
-        await inProcesshelper.InvokeVoidAsync("registerEventHandlers", DotNetObjectReference.Create(fileReaderInProcess), jSInstance);
+        IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();
+        IJSInProcessObjectReference jSInstance = await inProcessHelper.InvokeAsync<IJSInProcessObjectReference>("constructFileReader");
+        FileReaderInProcess fileReaderInProcess = new FileReaderInProcess(jSRuntime, inProcessHelper, jSInstance);
+        await inProcessHelper.InvokeVoidAsync("registerEventHandlers", DotNetObjectReference.Create(fileReaderInProcess), jSInstance);
         return fileReaderInProcess;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public abstract class BaseJSWrapper : IAsyncDisposable`
`15`	`15`	`/// <param name="jSReference">A JS reference to an existing JS instance that should be wrapped.</param>`
`16`	`16`	`internal BaseJSWrapper(IJSRuntime jSRuntime, IJSObjectReference jSReference)`
`17`	`17`	`{`
`18`		`- helperTask = new(() => jSRuntime.GetHelperAsync());`
	`18`	`+ helperTask = new(jSRuntime.GetHelperAsync);`
`19`	`19`	`JSReference = jSReference;`
`20`	`20`	`this.jSRuntime = jSRuntime;`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public class BlobInProcess : Blob`
`19`	`19`	`/// <returns>A wrapper instance for a <see cref="Blob"/>.</returns>`
`20`	`20`	`public static async Task<BlobInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInProcessObjectReference jSReference)`
`21`	`21`	`{`
`22`		`- IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();`
`23`		`- return new BlobInProcess(jSRuntime, inProcesshelper, jSReference);`
	`22`	`+ IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();`
	`23`	`+ return new BlobInProcess(jSRuntime, inProcessHelper, jSReference);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/// <summary>`
`@@ -32,16 +32,16 @@ public static async Task<BlobInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInP`
`32`	`32`	`/// <returns></returns>`
`33`	`33`	`public static new async Task<BlobInProcess> CreateAsync(IJSRuntime jSRuntime, IList<BlobPart>? blobParts = null, BlobPropertyBag? options = null)`
`34`	`34`	`{`
`35`		`- IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();`
	`35`	`+ IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();`
`36`	`36`	`object?[]? jsBlobParts = blobParts?.Select<BlobPart, object?>(blobPart => blobPart.type switch`
`37`	`37`	`{`
`38`	`38`	`BlobPartType.BufferSource => blobPart.byteArrayPart,`
`39`	`39`	`BlobPartType.Blob => blobPart.blobPart?.JSReference,`
`40`	`40`	`_ => blobPart.stringPart`
`41`	`41`	`})`
`42`	`42`	`.ToArray();`
`43`		`- IJSInProcessObjectReference jSInstance = await inProcesshelper.InvokeAsync<IJSInProcessObjectReference>("constructBlob", jsBlobParts, options);`
`44`		`- return new BlobInProcess(jSRuntime, inProcesshelper, jSInstance);`
	`43`	`+ IJSInProcessObjectReference jSInstance = await inProcessHelper.InvokeAsync<IJSInProcessObjectReference>("constructBlob", jsBlobParts, options);`
	`44`	`+ return new BlobInProcess(jSRuntime, inProcessHelper, jSInstance);`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ public async Task<string> TextAsync()`
`107`	`107`	`/// <returns>All bytes in the blob.</returns>`
`108`	`108`	`public async Task<byte[]> ArrayBufferAsync()`
`109`	`109`	`{`
`110`		`- IJSInProcessObjectReference jSInstance = await JSReference.InvokeAsync<IJSInProcessObjectReference>("arrayBuffer");`
	`110`	`+ IJSObjectReference jSInstance = await JSReference.InvokeAsync<IJSObjectReference>("arrayBuffer");`
`111`	`111`	`IJSObjectReference helper = await helperTask.Value;`
`112`	`112`	`return await helper.InvokeAsync<byte[]>("arrayBuffer", jSInstance);`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,8 @@ public class FileInProcess : File`
`19`	`19`	`/// <returns>A wrapper instance for a <see cref="File"/>.</returns>`
`20`	`20`	`public static async Task<FileInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInProcessObjectReference jSReference)`
`21`	`21`	`{`
`22`		`- IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();`
`23`		`- return new FileInProcess(jSRuntime, inProcesshelper, jSReference);`
	`22`	`+ IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();`
	`23`	`+ return new FileInProcess(jSRuntime, inProcessHelper, jSReference);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`/// <summary>`
`@@ -33,16 +33,16 @@ public static async Task<FileInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInP`
`33`	`33`	`/// <returns></returns>`
`34`	`34`	`public static new async Task<FileInProcess> CreateAsync(IJSRuntime jSRuntime, IList<BlobPart> fileBits, string fileName, FilePropertyBag? options = null)`
`35`	`35`	`{`
`36`		`- IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();`
	`36`	`+ IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();`
`37`	`37`	`object?[]? jsFileBits = fileBits.Select<BlobPart, object?>(blobPart => blobPart.type switch`
`38`	`38`	`{`
`39`	`39`	`BlobPartType.BufferSource => blobPart.byteArrayPart,`
`40`	`40`	`BlobPartType.Blob => blobPart.stringPart,`
`41`	`41`	`_ => blobPart.blobPart?.JSReference`
`42`	`42`	`})`
`43`	`43`	`.ToArray();`
`44`		`- IJSInProcessObjectReference jSInstance = await inProcesshelper.InvokeAsync<IJSInProcessObjectReference>("constructFile", jsFileBits, fileName, options);`
`45`		`- return new FileInProcess(jSRuntime, inProcesshelper, jSInstance);`
	`44`	`+ IJSInProcessObjectReference jSInstance = await inProcessHelper.InvokeAsync<IJSInProcessObjectReference>("constructFile", jsFileBits, fileName, options);`
	`45`	`+ return new FileInProcess(jSRuntime, inProcessHelper, jSInstance);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/// <summary>`
Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,8 @@ public class FileReaderInProcess : FileReader`
`18`	`18`	`/// <returns>A wrapper instance for a <see cref="FileReader"/>.</returns>`
`19`	`19`	`public static async Task<FileReaderInProcess> CreateAsync(IJSRuntime jSRuntime, IJSInProcessObjectReference jSReference)`
`20`	`20`	`{`
`21`		`- IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();`
`22`		`- return new FileReaderInProcess(jSRuntime, inProcesshelper, jSReference);`
	`21`	`+ IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();`
	`22`	`+ return new FileReaderInProcess(jSRuntime, inProcessHelper, jSReference);`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`/// <summary>`
`@@ -29,10 +29,10 @@ public static async Task<FileReaderInProcess> CreateAsync(IJSRuntime jSRuntime,`
`29`	`29`	`/// <returns>A wrapper instance for a <see cref="FileReader"/>.</returns>`
`30`	`30`	`public static new async Task<FileReaderInProcess> CreateAsync(IJSRuntime jSRuntime)`
`31`	`31`	`{`
`32`		`- IJSInProcessObjectReference inProcesshelper = await jSRuntime.GetInProcessHelperAsync();`
`33`		`- IJSInProcessObjectReference jSInstance = await inProcesshelper.InvokeAsync<IJSInProcessObjectReference>("constructFileReader");`
`34`		`- FileReaderInProcess fileReaderInProcess = new FileReaderInProcess(jSRuntime, inProcesshelper, jSInstance);`
`35`		`- await inProcesshelper.InvokeVoidAsync("registerEventHandlers", DotNetObjectReference.Create(fileReaderInProcess), jSInstance);`
	`32`	`+ IJSInProcessObjectReference inProcessHelper = await jSRuntime.GetInProcessHelperAsync();`
	`33`	`+ IJSInProcessObjectReference jSInstance = await inProcessHelper.InvokeAsync<IJSInProcessObjectReference>("constructFileReader");`
	`34`	`+ FileReaderInProcess fileReaderInProcess = new FileReaderInProcess(jSRuntime, inProcessHelper, jSInstance);`
	`35`	`+ await inProcessHelper.InvokeVoidAsync("registerEventHandlers", DotNetObjectReference.Create(fileReaderInProcess), jSInstance);`
`36`	`36`	`return fileReaderInProcess;`
`37`	`37`	`}`
`38`	`38`