fix inspection

src/cs/Bootsharp.Common.Test/TypesTest.cs

@@ -43,8 +43,6 @@ public void ImportParametersEqualArguments ()
             (import.ConstructorArguments[0].Value as IReadOnlyCollection<CustomAttributeTypedArgument>).Select(a => a.Value));
     }
 
-    private static object GetNamedValue (IList<CustomAttributeNamedArgument> args, string key) =>
-        args.First(a => a.MemberName == key).TypedValue.Value;
     private static CustomAttributeData GetMockExportAttribute () =>
         typeof(TypesTest).Assembly.CustomAttributes
             .First(a => a.AttributeType == typeof(JSExportAttribute));

src/cs/Bootsharp.Publish.Test/Pack/AssemblyInspectionTest.cs

@@ -5,17 +5,22 @@ public class AssemblyInspectionTest : PackTest
     [Fact]
     public void AllAssembliesAreInspected ()
     {
-        AddAssembly("Foo.dll");
+        AddAssembly("foo.dll",
+            WithClass("[JSInvokable] public static void Inv () {}")
+        );
         Execute();
-        Assert.Contains(Engine.Messages, w => w.Contains("Foo"));
-        Assert.Contains(Engine.Messages, w => w.Contains("Bootsharp.Common"));
-        Assert.Contains(Engine.Messages, w => w.Contains("System.Runtime"));
-        Assert.Contains(Engine.Messages, w => w.Contains("System.Private.CoreLib"));
+        Assert.Contains(Engine.Messages, w => w.Contains("foo"));
     }
 
     [Fact]
     public void WhenAssemblyInspectionFailsWarningIsLogged ()
     {
+        AddAssembly("foo.dll",
+            WithClass("[JSInvokable] public static void InvFoo () {}")
+        );
+        AddAssembly("bar.dll",
+            WithClass("[JSInvokable] public static void InvBar () {}")
+        );
         File.WriteAllText(Path.Combine(Project.Root, "foo.dll"), "corrupted");
         Execute();
         Assert.Contains(Engine.Warnings, w => w.Contains("Failed to inspect 'foo.dll' assembly"));

src/cs/Bootsharp.Publish.Test/Pack/PackTest.cs

@@ -32,6 +32,12 @@ public override void Execute ()
         Task.Execute();
     }
 
+    protected override void AddAssembly (string assemblyName, params MockSource[] sources)
+    {
+        base.AddAssembly(assemblyName, sources);
+        Project.WriteFile(assemblyName[..^3] + "wasm", "");
+    }
+
     private BootsharpPack CreateTask () => new() {
         BuildDirectory = Project.Root,
         InspectedDirectory = Project.Root,

src/cs/Bootsharp.Publish.Test/Pack/ResourceTest.cs

@@ -20,9 +20,6 @@ public void BinariesEmbeddedWhenEnabled ()
         Execute();
         Contains($$"""wasm: { name: "dotnet.native.wasm", content: "{{Convert.ToBase64String(MockWasmBinary)}}" },""");
         Contains("{ name: \"Foo.wasm\", content: \"");
-        Contains("{ name: \"Bootsharp.Common.wasm\", content: \"");
-        Contains("{ name: \"System.Runtime.wasm\", content: \"");
-        Contains("{ name: \"System.Private.CoreLib.wasm\", content: \"");
     }
 
     [Fact]
@@ -33,8 +30,5 @@ public void BinariesNotEmbeddedWhenDisabled ()
         Execute();
         Contains("""wasm: { name: "dotnet.native.wasm", content: undefined },""");
         Contains("""{ name: "Foo.wasm", content: undefined""");
-        Contains("""{ name: "Bootsharp.Common.wasm", content: undefined""");
-        Contains("""{ name: "System.Runtime.wasm", content: undefined""");
-        Contains("""{ name: "System.Private.CoreLib.wasm", content: undefined""");
     }
 }

src/cs/Bootsharp.Publish.Test/TaskTest.cs

@@ -18,7 +18,7 @@ public void Dispose ()
         GC.SuppressFinalize(this);
     }
 
-    protected void AddAssembly (string assemblyName, params MockSource[] sources)
+    protected virtual void AddAssembly (string assemblyName, params MockSource[] sources)
     {
         LastAddedAssemblyName = assemblyName;
         Project.AddAssembly(new(assemblyName, sources));

src/cs/Bootsharp.Publish.Test/TypesTest.cs

@@ -6,7 +6,6 @@ public class TypesTest
     public void Temp ()
     {
         // TODO: Remove when coverlet bug is resolved: https://github.com/coverlet-coverage/coverlet/issues/1561
-        _ = new AssemblyMeta { Name = "", Bytes = [] } with { Name = "foo" };
         _ = new InterfaceMeta { Kind = default, TypeSyntax = "", Name = "", Namespace = "", Methods = [] } with { Name = "foo" };
         _ = new InterfaceMethodMeta { Name = "", Generated = default } with { Name = "foo" };
         _ = new MethodMeta { Name = "", JSName = "", Arguments = default, Assembly = "", Kind = default, Space = "", JSSpace = "", ReturnValue = default } with { Assembly = "foo" };

src/cs/Bootsharp.Publish/Common/AssemblyInspector/AssemblyInspection.cs

@@ -4,7 +4,6 @@ namespace Bootsharp.Publish;
 
 internal class AssemblyInspection (MetadataLoadContext ctx) : IDisposable
 {
-    public required IReadOnlyCollection<AssemblyMeta> Assemblies { get; init; }
     public required IReadOnlyCollection<InterfaceMeta> Interfaces { get; init; }
     public required IReadOnlyCollection<MethodMeta> Methods { get; init; }
     public required IReadOnlyCollection<Type> Crawled { get; init; }

src/cs/Bootsharp.Publish/Common/AssemblyInspector/AssemblyInspector.cs

@@ -4,24 +4,22 @@ namespace Bootsharp.Publish;
 
 internal sealed class AssemblyInspector (Preferences prefs, string entryAssemblyName)
 {
-    private readonly List<AssemblyMeta> assemblies = [];
     private readonly List<InterfaceMeta> interfaces = [];
     private readonly List<MethodMeta> methods = [];
     private readonly List<string> warnings = [];
     private readonly TypeConverter converter = new(prefs);
 
-    public AssemblyInspection InspectInDirectory (string directory)
+    public AssemblyInspection InspectInDirectory (string directory, IEnumerable<string> paths)
     {
         var ctx = CreateLoadContext(directory);
-        foreach (var assemblyPath in Directory.GetFiles(directory, "*.dll"))
+        foreach (var assemblyPath in paths)
             try { InspectAssemblyFile(assemblyPath, ctx); }
             catch (Exception e) { AddSkippedAssemblyWarning(assemblyPath, e); }
         return CreateInspection(ctx);
     }
 
     private void InspectAssemblyFile (string assemblyPath, MetadataLoadContext ctx)
     {
-        assemblies.Add(CreateAssembly(assemblyPath));
         if (!ShouldIgnoreAssembly(assemblyPath))
             InspectAssembly(ctx.LoadFromAssemblyPath(assemblyPath));
     }
@@ -35,18 +33,12 @@ private void AddSkippedAssemblyWarning (string assemblyPath, Exception exception
     }
 
     private AssemblyInspection CreateInspection (MetadataLoadContext ctx) => new(ctx) {
-        Assemblies = [..assemblies],
         Interfaces = [..interfaces],
         Methods = [..methods],
         Crawled = [..converter.CrawledTypes],
         Warnings = [..warnings]
     };
 
-    private AssemblyMeta CreateAssembly (string assemblyPath) => new() {
-        Name = Path.GetFileNameWithoutExtension(assemblyPath),
-        Bytes = File.ReadAllBytes(assemblyPath)
-    };
-
     private void InspectAssembly (Assembly assembly)
     {
         foreach (var exported in assembly.GetExportedTypes())

src/cs/Bootsharp.Publish/Common/AssemblyInspector/InspectionReporter.cs

@@ -8,9 +8,9 @@ internal sealed class InspectionReporter (TaskLoggingHelper logger)
     public void Report (AssemblyInspection inspection)
     {
         logger.LogMessage(MessageImportance.Normal, "Bootsharp assembly inspection result:");
-        logger.LogMessage(MessageImportance.Normal, JoinLines($"Discovered {inspection.Assemblies.Count} assemblies:",
-            JoinLines(inspection.Assemblies.Select(a => a.Name))));
-        logger.LogMessage(MessageImportance.Normal, JoinLines($"Discovered {inspection.Methods.Count} JS methods:",
+        logger.LogMessage(MessageImportance.Normal, JoinLines("Discovered assemblies:",
+            JoinLines(inspection.Methods.GroupBy(m => m.Assembly).Select(g => g.Key))));
+        logger.LogMessage(MessageImportance.Normal, JoinLines("Discovered interop methods:",
             JoinLines(inspection.Methods.Select(m => m.ToString()))));
 
         foreach (var warning in inspection.Warnings)

src/cs/Bootsharp.Publish/Emit/BootsharpEmit.cs

@@ -32,7 +32,8 @@ private Preferences ResolvePreferences ()
     private AssemblyInspection InspectAssemblies (Preferences prefs)
     {
         var inspector = new AssemblyInspector(prefs, EntryAssemblyName);
-        var inspection = inspector.InspectInDirectory(InspectedDirectory);
+        var inspected = Directory.GetFiles(InspectedDirectory, "*.dll");
+        var inspection = inspector.InspectInDirectory(InspectedDirectory, inspected);
         new InspectionReporter(Log).Report(inspection);
         return inspection;
     }

src/cs/Bootsharp.Publish/Pack/BootsharpPack.cs

@@ -32,7 +32,11 @@ private Preferences ResolvePreferences ()
     private AssemblyInspection InspectAssemblies (Preferences prefs)
     {
         var inspector = new AssemblyInspector(prefs, EntryAssemblyName);
-        var inspection = inspector.InspectInDirectory(InspectedDirectory);
+        // Assemblies in publish dir are trimmed and don't contain some data (eg, method arg names).
+        // While the inspected dir contains extra assemblies we don't need in build. Hence the filtering.
+        var included = Directory.GetFiles(BuildDirectory, "*.wasm").Select(Path.GetFileNameWithoutExtension).ToHashSet();
+        var inspected = Directory.GetFiles(InspectedDirectory, "*.dll").Where(p => included.Contains(Path.GetFileNameWithoutExtension(p)));
+        var inspection = inspector.InspectInDirectory(InspectedDirectory, inspected);
         new InspectionReporter(Log).Report(inspection);
         return inspection;
     }
@@ -53,8 +57,8 @@ private void GenerateDeclarations (Preferences prefs, AssemblyInspection inspect
 
     private void GenerateResources (AssemblyInspection inspection)
     {
-        var generator = new ResourceGenerator(EntryAssemblyName, BuildDirectory, EmbedBinaries);
-        var content = generator.Generate(inspection);
+        var generator = new ResourceGenerator(EntryAssemblyName, EmbedBinaries);
+        var content = generator.Generate(BuildDirectory);
         File.WriteAllText(Path.Combine(BuildDirectory, "resources.g.js"), content);
     }
 

src/cs/Bootsharp.Publish/Pack/ResourceGenerator.cs

@@ -1,11 +1,15 @@
 namespace Bootsharp.Publish;
 
-internal sealed class ResourceGenerator (string entryAssemblyName, string buildDir, bool embed)
+internal sealed class ResourceGenerator (string entryAssemblyName, bool embed)
 {
-    public string Generate (AssemblyInspection inspection)
+    private readonly List<string> assemblies = [];
+    private string wasm = null!;
+
+    public string Generate (string buildDir)
     {
-        var wasm = BuildBin("dotnet.native.wasm", GenerateWasm());
-        var assemblies = inspection.Assemblies.Select(BuildAssembly);
+        foreach (var path in Directory.GetFiles(buildDir, "*.wasm"))
+            if (path.EndsWith("dotnet.native.wasm")) wasm = BuildBin(path);
+            else assemblies.Add(BuildBin(path));
         return
             $$"""
               export default {
@@ -18,23 +22,10 @@ public string Generate (AssemblyInspection inspection)
               """;
     }
 
-    private string GenerateWasm ()
-    {
-        if (!embed) return "undefined";
-        var path = Path.Combine(buildDir, "dotnet.native.wasm");
-        var bytes = File.ReadAllBytes(path);
-        return ToBase64(bytes);
-    }
-
-    private string BuildAssembly (AssemblyMeta assembly)
-    {
-        var name = assembly.Name + ".wasm";
-        var content = embed ? ToBase64(assembly.Bytes) : "undefined";
-        return BuildBin(name, content);
-    }
-
-    private string BuildBin (string name, string content)
+    private string BuildBin (string path)
     {
+        var name = Path.GetFileName(path);
+        var content = embed ? ToBase64(File.ReadAllBytes(path)) : "undefined";
         return $$"""{ name: "{{name}}", content: {{content}} }""";
     }
 

src/cs/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <Version>0.2.0-alpha.58</Version>
+        <Version>0.2.0-alpha.63</Version>
         <Authors>Elringus</Authors>
         <PackageTags>javascript typescript ts js wasm node deno bun interop codegen</PackageTags>
         <PackageProjectUrl>https://bootsharp.com</PackageProjectUrl>