Type name can now be set when converting WASM to DLL. Removed some excess types from the generated DLL.

Author: RyanLamansky

WebAssembly.Tests/ApiQualityTests.cs

@@ -97,4 +97,16 @@ static IEnumerable<string> GatherViolations()
 
         Assert.AreEqual("", string.Join(", ", GatherViolations()), "Instruction intermediate types can only have internal constructors.");
     }
+
+#if NET9_0_OR_GREATER
+    /// <summary>
+    /// Ensures that there's no collision between the default value of <see cref="Runtime.CompilerConfiguration.TypeName"/> and any compiled type.
+    /// </summary>
+    [TestMethod]
+    public void NoTypeMatchingCompilerConfigurationDefaultNameExists()
+    {
+        var defaultTypeName = new Runtime.CompilerConfiguration().TypeName;
+        Assert.IsNull(typeof(Module).Assembly.GetType(defaultTypeName));
+    }
+#endif
 }

WebAssembly/Runtime/Compile.cs

@@ -238,14 +238,7 @@ CompilerConfiguration configuration
 
             var module = assembly.DefineDynamicModule("CompiledWebAssembly");
 
-            var importBuilder = module.DefineType("Imports");
-            var instanceContainer = typeof(Instance<>).MakeGenericType(importBuilder);
-            var exportContainer = module.DefineType("Exports");
-
-            FromBinary(assembly, reader, configuration, instanceContainer, exportContainer, module, importBuilder);
-
-            importBuilder.CreateType();
-            exportContainer.CreateType();
+            FromBinary(assembly, reader, configuration, null, null, module, null);
 
             return assembly;
         }
@@ -280,8 +273,8 @@ private static ConstructorInfo FromBinary(
         AssemblyBuilder assembly,
         Reader reader,
         CompilerConfiguration configuration,
-        Type instanceContainer,
-        Type exportContainer,
+        Type? instanceContainer,
+        Type? exportContainer,
         ModuleBuilder module,
         TypeBuilder? importBuilder = null
         )
@@ -310,7 +303,14 @@ private static ConstructorInfo FromBinary(
         var previousSection = Section.None;
 
         var context = new CompilationContext(configuration);
-        var exportsBuilder = context.CheckedExportsBuilder = module.DefineType("CompiledExports", ClassAttributes, exportContainer);
+        var exportsBuilder = context.CheckedExportsBuilder = module.DefineType(
+#if NET9_0_OR_GREATER
+            configuration.TypeName,
+#else
+            "CompiledExports",
+#endif
+            ClassAttributes,
+            exportContainer);
         MethodBuilder? importedMemoryProvider = null;
         FieldBuilder? memory = null;
 
@@ -329,7 +329,7 @@ private static ConstructorInfo FromBinary(
                 }
                 else
                 {
-                    var usableConstructor = exportContainer.GetTypeInfo().DeclaredConstructors.FirstOrDefault(c => c.GetParameters().Length == 0);
+                    var usableConstructor = exportContainer?.GetTypeInfo().DeclaredConstructors.FirstOrDefault(c => c.GetParameters().Length == 0);
                     if (usableConstructor != null)
                     {
                         instanceConstructorIL.Emit(OpCodes.Ldarg_0);
@@ -633,6 +633,9 @@ private static ConstructorInfo FromBinary(
         instanceConstructorIL.Emit(OpCodes.Ret); //Finish the constructor.
         var exportInfo = exportsBuilder.CreateTypeInfo();
 
+        if (importBuilder is null && instanceContainer is null)
+            return exportInfo.DeclaredConstructors.First();
+
         TypeInfo instance;
         {
             var instanceBuilder = module.DefineType("CompiledInstance", ClassAttributes, instanceContainer);
@@ -660,7 +663,7 @@ private static ConstructorInfo FromBinary(
 
                 importConstructor = importConstructorBuilder;
             }
-            else
+            else if (instanceContainer is not null)
             {
                 importConstructor = instanceContainer
                     .GetTypeInfo()
@@ -670,6 +673,10 @@ private static ConstructorInfo FromBinary(
                     ?.ParameterType == exportContainer
                     );
             }
+            else
+            {
+                return exportInfo.DeclaredConstructors.First();
+            }
 
             il.Emit(OpCodes.Call, importConstructor);
             il.Emit(OpCodes.Ret);

WebAssembly/Runtime/CompilerConfiguration.cs

@@ -15,6 +15,24 @@ public CompilerConfiguration()
     {
     }
 
+#if NET9_0_OR_GREATER
+    private string typeName = "WebAssembly.CompiledFromWasm";
+
+    /// <summary>
+    /// Gets or sets the name of the type that hosts the compiled code.
+    /// Defaults to "WebAssembly.CompiledFromWasm".
+    /// </summary>
+    public string TypeName
+    {
+        get => typeName;
+        set
+        {
+            ArgumentNullException.ThrowIfNull(value);
+            typeName = value;
+        }
+    }
+#endif
+
     [DebuggerBrowsable(DebuggerBrowsableState.Never)] //Wrapped by a property
     private GetDelegateForTypeCallback getDelegateForType = GetStandardDelegateForType;