Minor quality improvements.

Author: RyanLamansky

WebAssembly/Reader.cs

@@ -4,16 +4,9 @@
 
 namespace WebAssembly;
 
-internal sealed class Reader : IDisposable
+internal sealed class Reader(Stream input) : IDisposable
 {
-    private readonly UTF8Encoding utf8 = new(false, false);
-    private BinaryReader? reader;
-
-    public Reader(Stream input)
-    {
-        //The UTF8 encoding parameter is not actually used; it's just there so that the leaveOpen parameter can be reached.
-        this.reader = new BinaryReader(input, utf8, true);
-    }
+    private BinaryReader? reader = new(input, Encoding.UTF8, true);
 
     public long Offset { get; private set; }
 
@@ -127,7 +120,7 @@ public double ReadFloat64()
     public string ReadString(uint length)
     {
         var bytes = this.ReadBytes(length);
-        return utf8.GetString(bytes, 0, bytes.Length);
+        return Encoding.UTF8.GetString(bytes, 0, bytes.Length);
     }
 
     public byte[] ReadBytes(uint length)

WebAssembly/Runtime/Compile.cs

@@ -104,15 +104,17 @@ public static InstanceCreator<TExports> FromBinary<TExports>(Stream input, Compi
             {
                 CheckPreamble(reader);
 
-                constructor = FromBinary(
-                    AssemblyBuilder.DefineDynamicAssembly(
+                var assembly = AssemblyBuilder.DefineDynamicAssembly(
                     new AssemblyName("CompiledWebAssembly"),
-                    AssemblyBuilderAccess.RunAndCollect
-                    ),
-                reader,
+                    AssemblyBuilderAccess.RunAndCollect);
+
+                constructor = FromBinary(
+                    assembly,
+                    reader,
                     configuration,
                     typeof(Instance<TExports>),
-                    typeof(TExports)
+                    typeof(TExports),
+                    assembly.DefineDynamicModule("CompiledWebAssembly")
                     );
             }
             catch (OverflowException x)
@@ -203,11 +205,19 @@ private static void CheckPreamble(Reader reader)
 
 #if NET9_0_OR_GREATER
     /// <summary>
-    /// Creates an <see cref="AssemblyBuilder"/> from a binary WASM source.
+    /// Creates a <see cref="PersistedAssemblyBuilder"/> from a binary WASM source.
+    /// </summary>
+    /// <param name="input">The source of data. The stream is left open after reading is complete.</param>
+    /// <returns>An assembly builder that can be used to further modify or save the assembly.</returns>
+    public static PersistedAssemblyBuilder CreatePersistedAssembly(Stream input)
+        => CreatePersistedAssembly(input, new());
+
+    /// <summary>
+    /// Creates a <see cref="PersistedAssemblyBuilder"/> from a binary WASM source.
     /// </summary>
     /// <param name="input">The source of data. The stream is left open after reading is complete.</param>
     /// <param name="configuration">Configures the compiler.</param>
-    /// <returns>The created assembly.</returns>
+    /// <returns>An assembly builder that can be used to further modify or save the assembly.</returns>
     public static PersistedAssemblyBuilder CreatePersistedAssembly(
         Stream input,
         CompilerConfiguration configuration
@@ -272,7 +282,7 @@ private static ConstructorInfo FromBinary(
         CompilerConfiguration configuration,
         Type instanceContainer,
         Type exportContainer,
-        ModuleBuilder? module = null,
+        ModuleBuilder module,
         TypeBuilder? importBuilder = null
         )
     {
@@ -299,8 +309,6 @@ private static ConstructorInfo FromBinary(
         KeyValuePair<string, uint>[]? exportedFunctions = null;
         var previousSection = Section.None;
 
-        module ??= assembly.DefineDynamicModule("CompiledWebAssembly");
-
         var context = new CompilationContext(configuration);
         var exportsBuilder = context.CheckedExportsBuilder = module.DefineType("CompiledExports", ClassAttributes, exportContainer);
         MethodBuilder? importedMemoryProvider = null;

WebAssembly/WebAssembly.csproj

@@ -22,7 +22,7 @@
     <AssemblyOriginatorKeyFile>Properties\WebAssembly.snk</AssemblyOriginatorKeyFile>
     <TreatWarningsAsErrors>True</TreatWarningsAsErrors>
     <NoWarn>CA1716;CA1720</NoWarn>
-    <DocumentationFile>bin\WebAssembly.xml</DocumentationFile>
+    <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>