@nativescript/windows 0.1.0-alpha.41 → 0.1.0-alpha.42

package/framework/dotnet-bridge/Bridge.BinaryDispatch.cs

@@ -53,7 +53,7 @@ public static partial class Bridge
             var typeName = r.ReadString16();
             var assembly = r.ReadString16();
             var type = ResolveType(NullIfEmpty(assembly), typeName)
-                ?? throw new TypeLoadException($"Type not found: {typeName}");
+                ?? throw new TypeLoadException($"Type not found: {typeName} (assembly: {assembly})");
             return BuildMembersResult(type);
         }
 
@@ -79,7 +79,7 @@ public static partial class Bridge
         var typeNameS = r.ReadString16();
         var assemblyS = r.ReadString16();
         var typeS = ResolveType(NullIfEmpty(assemblyS), typeNameS)
-            ?? throw new TypeLoadException($"Type not found: {typeNameS}");
+            ?? throw new TypeLoadException($"Type not found: {typeNameS} (assembly: {assemblyS})");
 
         if (op == 0x03) // constructor
         {

package/framework/dotnet-bridge/Bridge.Dispatch.cs

@@ -36,7 +36,7 @@ public static partial class Bridge
         else
         {
             type = ResolveType(req.Assembly, req.TypeName)
-                ?? throw new TypeLoadException($"Type not found: {req.TypeName}");
+                ?? throw new TypeLoadException($"Type not found: {req.TypeName} (assembly: {req.Assembly})");
         }
 
         if (method == "__members__")
@@ -261,19 +261,75 @@ public static partial class Bridge
 
     private static Type? ResolveTypeCore(string? assemblyName, string? typeName)
     {
+        if (string.IsNullOrEmpty(typeName)) return null;
+
+        // Fast/normal lookup first (assembly-qualified or plain type name).
         var fqn = string.IsNullOrEmpty(assemblyName) ? typeName! : $"{typeName}, {assemblyName}";
-        var t   = Type.GetType(fqn);
+        var t = Type.GetType(fqn);
         if (t is not null) return t;
+
+        t = Type.GetType(typeName);
+        if (t is not null) return t;
+
+        // Last segment (type name without namespace) used for loose matching below.
+        var lastDot = typeName.LastIndexOf('.');
+        var shortName = lastDot >= 0 ? typeName[(lastDot + 1)..] : typeName;
+
+        // Search loaded assemblies quickly; prefer asm.GetType which is inexpensive.
         foreach (var asm in AppDomain.CurrentDomain.GetAssemblies())
         {
-            t = asm.GetType(typeName!);
-            if (t is not null) return t;
+            try
+            {
+                t = asm.GetType(typeName);
+                if (t is not null) return t;
+
+                // Fall back to scanning exported types only when necessary. Some
+                // assemblies throw on GetTypes() (ReflectionTypeLoadException) so
+                // we catch and continue.
+                foreach (var ty in asm.GetTypes())
+                {
+                    if (string.Equals(ty.FullName, typeName, StringComparison.Ordinal)
+                        || string.Equals(ty.Name, shortName, StringComparison.Ordinal)
+                        || (lastDot < 0 && ty.Namespace != null && ty.Namespace == typeName))
+                    {
+                        return ty;
+                    }
+                }
+            }
+            catch (ReflectionTypeLoadException) { }
+            catch { }
         }
+
+        // If an assembly name was provided try loading it explicitly and repeat
+        // the above search inside that assembly only (less work than scanning all).
         if (!string.IsNullOrEmpty(assemblyName))
         {
-            try { t = Assembly.Load(assemblyName).GetType(typeName!); } catch { }
+            try
+            {
+                var asm = Assembly.Load(assemblyName);
+                if (asm is not null)
+                {
+                    t = asm.GetType(typeName!);
+                    if (t is not null) return t;
+                    try
+                    {
+                        foreach (var ty in asm.GetTypes())
+                        {
+                            if (string.Equals(ty.FullName, typeName, StringComparison.Ordinal)
+                                || string.Equals(ty.Name, shortName, StringComparison.Ordinal)
+                                || (lastDot < 0 && ty.Namespace != null && ty.Namespace == typeName))
+                            {
+                                return ty;
+                            }
+                        }
+                    }
+                    catch (ReflectionTypeLoadException) { }
+                }
+            }
+            catch { }
         }
-        return t;
+
+        return null;
     }
 
     private static MethodInfo? FindMethodCore(Type type, string name, int argCount, BindingFlags flags)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/windows",
-  "version": "0.1.0-alpha.41",
+  "version": "0.1.0-alpha.42",
   "description": "NativeScript for using Windows v8",
   "repository": {
         "type": "git",