Fix module generator bug with interface type arg (#251)

microsoft · Mar 27, 2024 · 5a0f3d0 · 5a0f3d0
1 parent 5cce1cc
commit 5a0f3d0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/src/NodeApi.Generator/SymbolExtensions.cs b/src/NodeApi.Generator/SymbolExtensions.cs
@@ -337,28 +337,32 @@ static PropertyInfo GetAttributeProperty(Type type, string name)
 
     private static void BuildBaseTypeAndInterfaces(INamedTypeSymbol typeSymbol)
     {
-        if (typeSymbol.BaseType != null)
+        static void BuildType(INamedTypeSymbol typeSymbol)
         {
-            BuildBaseTypeAndInterfaces(typeSymbol.BaseType);
+            BuildBaseTypeAndInterfaces(typeSymbol);
 
-            string baseTypeFullName = GetTypeSymbolFullName(typeSymbol.BaseType!);
-            if (SymbolicTypes.TryGetValue(baseTypeFullName, out Type? baseType) &&
-                baseType is TypeBuilder baseTypeBuilder)
+            string typeFullName = GetTypeSymbolFullName(typeSymbol);
+            if (SymbolicTypes.TryGetValue(typeFullName, out Type? type) &&
+                type is TypeBuilder baseTypeBuilder)
             {
                 baseTypeBuilder.CreateType();
             }
         }
 
+        if (typeSymbol.BaseType != null)
+        {
+            BuildType(typeSymbol.BaseType);
+        }
+
         foreach (INamedTypeSymbol interfaceTypeSymbol in typeSymbol.Interfaces)
         {
-            BuildBaseTypeAndInterfaces(interfaceTypeSymbol);
+            BuildType(interfaceTypeSymbol);
+        }
 
-            string interfaceTypeFullName = GetTypeSymbolFullName(interfaceTypeSymbol);
-            if (SymbolicTypes.TryGetValue(interfaceTypeFullName, out Type? interfaceType) &&
-                interfaceType is TypeBuilder interfaceTypeBuilder)
-            {
-                interfaceTypeBuilder.CreateType();
-            }
+        foreach (INamedTypeSymbol typeArgSymbol in
+            typeSymbol.TypeArguments.OfType<INamedTypeSymbol>())
+        {
+            BuildType(typeArgSymbol);
         }
     }
 

diff --git a/test/TestCases/napi-dotnet/ComplexTypes.cs b/test/TestCases/napi-dotnet/ComplexTypes.cs
@@ -239,3 +239,13 @@ public static ClassWithPrivateConstructor CreateInstance(string value)
 
     public string Value { get; }
 }
+
+// Ensure module generation handles implementing an interface with a custom type argument.
+[JSExport]
+public class CollectionOfClassObjects : IEnumerable<ClassObject>
+{
+    public IEnumerator<ClassObject> GetEnumerator() => throw new NotImplementedException();
+
+    System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
+        => throw new NotImplementedException();
+}