@nativescript/windows 0.1.0-alpha.51 → 0.1.0-alpha.53

package/framework/dotnet-bridge/BinaryProtocol.cs

@@ -10,6 +10,13 @@ internal readonly struct HandleRef(int id)
     public readonly int Id = id;
 }
 
+// Carries a raw IUnknown/IInspectable pointer from a WinRT proxy (tag 0x0A).
+// CoerceBin calls Marshal.GetObjectForIUnknown to create a managed RCW.
+internal readonly struct WinRtRef(long ptr)
+{
+    public readonly long Ptr = ptr;
+}
+
 internal ref struct BinReader(ReadOnlySpan<byte> buf)
 {
     private readonly ReadOnlySpan<byte> _buf = buf;
@@ -24,6 +31,13 @@ internal ref struct BinReader(ReadOnlySpan<byte> buf)
         return v;
     }
 
+    public long ReadI64()
+    {
+        var v = BinaryPrimitives.ReadInt64LittleEndian(_buf[_pos..]);
+        _pos += 8;
+        return v;
+    }
+
     public ushort ReadU16()
     {
         var v = BinaryPrimitives.ReadUInt16LittleEndian(_buf[_pos..]);
@@ -65,6 +79,7 @@ internal ref struct BinReader(ReadOnlySpan<byte> buf)
                 0x04 => (object)ReadF64(),
                 0x05 => (object)ReadString16(),
                 0x06 => (object)new HandleRef(ReadI32()),
+                0x0A => (object)new WinRtRef(ReadI64()),
                 _    => null,
             };
         }

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

@@ -158,6 +158,13 @@ public static partial class Bridge
             s_handles.TryGetValue(hr.Id, out var obj);
             return obj;
         }
+        if (value is WinRtRef wr && wr.Ptr != 0)
+        {
+            // Marshal.GetObjectForIUnknown calls AddRef internally; the RCW will
+            // Release when GC'd.
+            try { return Marshal.GetObjectForIUnknown(new IntPtr(wr.Ptr)); }
+            catch { return null; }
+        }
         if (value.GetType() == targetType) return value;
         try { return Convert.ChangeType(value, targetType); }
         catch { return value; }

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

@@ -86,8 +86,6 @@ public static partial class Bridge
         finally { if (builtArgs.Length > 0) ReturnArgs(builtArgs); }
     }
 
-    // ── compiled dispatch cache ───────────────────────────────────────────────
-
     private static DispatchEntry GetCachedMethod(Type type, string name, int argCount, BindingFlags flags)
         => s_methodCache.GetOrAdd(
             new MethodKey(type, name, argCount, flags),
@@ -148,8 +146,6 @@ public static partial class Bridge
             new PropKey(type, method[prefixLen..], flags),
             static k => k.Type.GetProperty(k.Name, k.Flags));
 
-    // ── argument coercion ─────────────────────────────────────────────────────
-
     // Pooled: rented array passed to the compiled delegate (which accesses by index,
     // not by Length). Caller must return via ReturnArgs immediately after invoke.
     private static object?[] BuildArgs(JsonElement[] elements, ParameterInfo[] parameters)
@@ -186,8 +182,6 @@ public static partial class Bridge
         return el.Deserialize(targetType, s_coerceOpts);
     }
 
-    // ── async unwrapping ──────────────────────────────────────────────────────
-
     private static object? AwaitIfTask(object? value)
     {
         if (value is null) return null;
@@ -216,8 +210,6 @@ public static partial class Bridge
         return value;
     }
 
-    // ── result boxing ─────────────────────────────────────────────────────────
-
     private static DispatchResult Box(object? value)
     {
         if (value is null) return DispatchResult.Void;
@@ -239,17 +231,24 @@ public static partial class Bridge
         return DispatchResult.Handle(id, t.FullName ?? t.Name);
     }
 
-    // ── type/member resolution ────────────────────────────────────────────────
-
     internal static DispatchResult BuildMembersResult(Type t)
     {
         const BindingFlags inst = BindingFlags.Public | BindingFlags.Instance;
         const BindingFlags stat = BindingFlags.Public | BindingFlags.Static;
+
+        var instProps = t.GetProperties(inst);
+        var statProps = t.GetProperties(stat);
+
         return DispatchResult.Members(
-            t.GetMethods(inst).Where(m => !m.IsSpecialName).Select(m => m.Name).Distinct().ToArray(),
-            t.GetProperties(inst).Select(p => p.Name).Distinct().ToArray(),
-            t.GetMethods(stat).Where(m => !m.IsSpecialName).Select(m => m.Name).Distinct().ToArray(),
-            t.GetProperties(stat).Select(p => p.Name).Distinct().ToArray());
+            methods:               t.GetMethods(inst).Where(m => !m.IsSpecialName).Select(m => m.Name).Distinct().ToArray(),
+            props:                 instProps.Where(p => p.GetGetMethod() != null).Select(p => p.Name).Distinct().ToArray(),
+            staticMethods:         t.GetMethods(stat).Where(m => !m.IsSpecialName).Select(m => m.Name).Distinct().ToArray(),
+            staticProps:           statProps.Where(p => p.GetGetMethod() != null).Select(p => p.Name).Distinct().ToArray(),
+            readonlyProps:         instProps.Where(p => p.GetGetMethod() != null && p.GetSetMethod() == null).Select(p => p.Name).Distinct().ToArray(),
+            readonlyStaticProps:   statProps.Where(p => p.GetGetMethod() != null && p.GetSetMethod() == null).Select(p => p.Name).Distinct().ToArray(),
+            writeonlyProps:        instProps.Where(p => p.GetGetMethod() == null && p.GetSetMethod() != null).Select(p => p.Name).Distinct().ToArray(),
+            writeonlyStaticProps:  statProps.Where(p => p.GetGetMethod() == null && p.GetSetMethod() != null).Select(p => p.Name).Distinct().ToArray()
+        );
     }
 
     internal static Type? ResolveType(string? assemblyName, string? typeName)
@@ -288,12 +287,14 @@ public static partial class Bridge
                 // 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))
-                    {
+                    if (string.Equals(ty.FullName, typeName, StringComparison.Ordinal))
+                        return ty;
+                    // Short-name match only when input has no namespace prefix (e.g. "Stopwatch").
+                    // Guarding on lastDot < 0 prevents matching unrelated types in other namespaces
+                    // (e.g. "NativeScript.Widgets.FlexboxLayout" must not match a different
+                    //  FlexboxLayout that happens to live in another namespace).
+                    if (lastDot < 0 && string.Equals(ty.Name, shortName, StringComparison.Ordinal))
                         return ty;
-                    }
                 }
             }
             catch (ReflectionTypeLoadException) { }
@@ -315,12 +316,10 @@ public static partial class Bridge
                     {
                         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))
-                            {
+                            if (string.Equals(ty.FullName, typeName, StringComparison.Ordinal))
+                                return ty;
+                            if (lastDot < 0 && string.Equals(ty.Name, shortName, StringComparison.Ordinal))
                                 return ty;
-                            }
                         }
                     }
                     catch (ReflectionTypeLoadException) { }
@@ -342,7 +341,6 @@ public static partial class Bridge
     internal static Exception Unwrap(Exception ex) =>
         ex is TargetInvocationException { InnerException: { } inner } ? Unwrap(inner) : ex;
 
-    // ── full-pipeline helpers (parse + dispatch + serialise) ──────────────────
     // Used by benchmarks to give a fair end-to-end comparison of protocols.
 
     internal static byte[] PipelineJson(ReadOnlySpan<byte> jsonRequest)
@@ -368,8 +366,6 @@ public static partial class Bridge
         return buf.WrittenSpan.ToArray();
     }
 
-    // ── JSON response writers ─────────────────────────────────────────────────
-
     private static unsafe void WriteResult(DispatchResult res, byte** outPtr, int* outLen)
     {
         var buf = new ArrayBufferWriter<byte>(256);

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

@@ -10,8 +10,6 @@ namespace NativeScriptBridge;
 
 public static partial class Bridge
 {
-    // ── JS delegate creation ──────────────────────────────────────────────────
-    //
     // opcode 0x09: given a delegate type name (or "" for System.Action) and a
     // JS callback id, compile a .NET delegate that serialises its parameters as
     // binary and calls back into V8 via the s_jsInvoker function pointer.
@@ -51,8 +49,6 @@ public static partial class Bridge
         return Box(del);
     }
 
-    // ── Callback invocation helper ────────────────────────────────────────────
-
     internal static unsafe void CallJsCallback(int id, object?[] args)
     {
         if (s_jsInvoker == null) return;

package/framework/dotnet-bridge/Bridge.cs

@@ -51,24 +51,13 @@ public static partial class Bridge
 
     // Returns a JSON object mapping top-level namespace roots (e.g. "NativeScript")
     // to the assembly simple-name that most likely contains that namespace's types.
-    // This probes the application base directory and libs/ for assemblies and
-    // inspects exported types. The result is safe-to-call and tolerant of
-    // non-.NET DLLs.
+    // Reuses s_assemblySearchDirs so plugin and NuGet assemblies are included.
     public static string GetNamespaceAssemblyMapJson()
     {
         var map = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         try
         {
-            var baseDir = AppContext.BaseDirectory ?? AppDomain.CurrentDomain.BaseDirectory;
-            var dirs = new List<string> { baseDir };
-            var libs = Path.Combine(baseDir, "libs");
-            if (Directory.Exists(libs))
-            {
-                dirs.Add(libs);
-                try { dirs.AddRange(Directory.GetDirectories(libs, "*", SearchOption.AllDirectories)); } catch { }
-            }
-
-            foreach (var dir in dirs.Where(d => !string.IsNullOrEmpty(d) && Directory.Exists(d)))
+            foreach (var dir in s_assemblySearchDirs.Where(Directory.Exists))
             {
                 try
                 {
@@ -108,19 +97,46 @@ public static partial class Bridge
         try { return JsonSerializer.Serialize(map); } catch { return "{}"; }
     }
 
-    // Static ctor: initialize assembly search directories and register resolver.
     static Bridge()
     {
         try
         {
             var baseDir = AppContext.BaseDirectory ?? AppDomain.CurrentDomain.BaseDirectory;
             var dirs = new List<string> { baseDir };
+
+            // libs/ subtree relative to the bridge's own directory.
             var libs = Path.Combine(baseDir, "libs");
             if (Directory.Exists(libs))
             {
                 dirs.Add(libs);
                 try { dirs.AddRange(Directory.GetDirectories(libs, "*", SearchOption.AllDirectories)); } catch { }
             }
+
+            // The bridge DLL lives at dotnet-bridge/publish/ inside the app output root.
+            // Plugin assemblies (added via plugin.props) land at plugins/**/*.dll and NuGet
+            // assemblies land at the app output root itself — both outside the bridge subtree.
+            // Use the host process directory to reach them.
+            try
+            {
+                var processDir = Path.GetDirectoryName(
+                    System.Diagnostics.Process.GetCurrentProcess().MainModule?.FileName);
+                if (!string.IsNullOrEmpty(processDir))
+                {
+                    dirs.Add(processDir);
+
+                    // plugins/ subtree: CLI-managed plugin DLLs live here.
+                    var pluginsDir = Path.Combine(processDir, "plugins");
+                    if (Directory.Exists(pluginsDir))
+                        try { dirs.AddRange(Directory.GetDirectories(pluginsDir, "*", SearchOption.AllDirectories)); } catch { }
+
+                    // libs/ relative to the app root (alternative convention).
+                    var processLibs = Path.Combine(processDir, "libs");
+                    if (Directory.Exists(processLibs))
+                        try { dirs.AddRange(Directory.GetDirectories(processLibs, "*", SearchOption.AllDirectories)); } catch { }
+                }
+            }
+            catch { }
+
             s_assemblySearchDirs = dirs.Where(d => !string.IsNullOrEmpty(d)).Distinct(StringComparer.OrdinalIgnoreCase).ToArray();
             AppDomain.CurrentDomain.AssemblyResolve += OnAssemblyResolve;
         }

package/framework/dotnet-bridge/DispatchTypes.cs

@@ -12,14 +12,10 @@ using System.Threading.Tasks;
 
 namespace NativeScriptBridge;
 
-// ── JSON source-gen context ───────────────────────────────────────────────────
-
 [JsonSerializable(typeof(InvokeRequest))]
 [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
 internal partial class BridgeJsonContext : JsonSerializerContext { }
 
-// ── JSON wire type ────────────────────────────────────────────────────────────
-
 internal sealed record InvokeRequest(
     string?        Assembly,
     string?        TypeName,
@@ -28,7 +24,6 @@ internal sealed record InvokeRequest(
     JsonElement[]? Args
 );
 
-// ── cache key structs ─────────────────────────────────────────────────────────
 //
 // Using Type as the key field (rather than Type.FullName) is correct and faster:
 // Type instances are singletons within an AssemblyLoadContext, so reference
@@ -38,8 +33,6 @@ internal readonly record struct MethodKey(Type Type, string Name, int ArgCount,
 internal readonly record struct PropKey(Type Type, string Name, BindingFlags Flags);
 internal readonly record struct CtorKey(Type Type, int ArgCount);
 
-// ── cache value types ─────────────────────────────────────────────────────────
-
 internal readonly struct DispatchEntry(Func<object?, object?[], object?>? invoke, ParameterInfo[] parameters)
 {
     public readonly Func<object?, object?[], object?>? Invoke     = invoke;
@@ -53,8 +46,6 @@ internal readonly struct CtorEntry(ConstructorInfo? ctor, ParameterInfo[] parame
     public readonly ParameterInfo[]  Parameters = parameters;
 }
 
-// ── dispatch result ───────────────────────────────────────────────────────────
-
 internal enum DispatchKind : byte { Void, Primitive, Handle, Collection, Members }
 
 internal readonly struct DispatchResult
@@ -71,14 +62,22 @@ internal readonly struct DispatchResult
     private readonly string[]?    _properties;
     private readonly string[]?    _staticMethods;
     private readonly string[]?    _staticProperties;
+    private readonly string[]?    _readonlyProperties;
+    private readonly string[]?    _readonlyStaticProperties;
+    private readonly string[]?    _writeonlyProperties;
+    private readonly string[]?    _writeonlyStaticProperties;
 
     private DispatchResult(DispatchKind kind, object? value, Type? type, int handle,
         string? typeName, string[]? methods, string[]? props,
-        string[]? staticMethods, string[]? staticProps)
+        string[]? staticMethods, string[]? staticProps,
+        string[]? readonlyProps = null, string[]? readonlyStaticProps = null,
+        string[]? writeonlyProps = null, string[]? writeonlyStaticProps = null)
     {
         _kind = kind; _value = value; _type = type; _handle = handle;
         _typeName = typeName; _methods = methods; _properties = props;
         _staticMethods = staticMethods; _staticProperties = staticProps;
+        _readonlyProperties = readonlyProps; _readonlyStaticProperties = readonlyStaticProps;
+        _writeonlyProperties = writeonlyProps; _writeonlyStaticProperties = writeonlyStaticProps;
     }
 
     public static DispatchResult Primitive(object value, Type type)
@@ -91,13 +90,15 @@ internal readonly struct DispatchResult
         => new(DispatchKind.Collection, items, null, 0, null, null, null, null, null);
 
     public static DispatchResult Members(
-        string[] methods, string[] props, string[] staticMethods, string[] staticProps)
-        => new(DispatchKind.Members, null, null, 0, null, methods, props, staticMethods, staticProps);
+        string[] methods, string[] props, string[] staticMethods, string[] staticProps,
+        string[] readonlyProps, string[] readonlyStaticProps,
+        string[] writeonlyProps, string[] writeonlyStaticProps)
+        => new(DispatchKind.Members, null, null, 0, null,
+               methods, props, staticMethods, staticProps,
+               readonlyProps, readonlyStaticProps, writeonlyProps, writeonlyStaticProps);
 
     internal int HandleId() => _handle;
 
-    // ── JSON serialisation ────────────────────────────────────────────────────
-
     public void WriteTo(Utf8JsonWriter w, JsonSerializerOptions opts)
     {
         switch (_kind)
@@ -126,10 +127,14 @@ internal readonly struct DispatchResult
 
             case DispatchKind.Members:
                 w.WriteStartObject();
-                WriteStringArray(w, "methods"u8,          _methods!);
-                WriteStringArray(w, "properties"u8,       _properties!);
-                WriteStringArray(w, "staticMethods"u8,    _staticMethods!);
-                WriteStringArray(w, "staticProperties"u8, _staticProperties!);
+                WriteStringArray(w, "methods"u8,                  _methods!);
+                WriteStringArray(w, "properties"u8,               _properties!);
+                WriteStringArray(w, "staticMethods"u8,            _staticMethods!);
+                WriteStringArray(w, "staticProperties"u8,         _staticProperties!);
+                WriteStringArray(w, "readonlyProperties"u8,       _readonlyProperties!);
+                WriteStringArray(w, "readonlyStaticProperties"u8, _readonlyStaticProperties!);
+                WriteStringArray(w, "writeonlyProperties"u8,      _writeonlyProperties!);
+                WriteStringArray(w, "writeonlyStaticProperties"u8,_writeonlyStaticProperties!);
                 w.WriteEndObject();
                 break;
         }
@@ -142,7 +147,6 @@ internal readonly struct DispatchResult
         w.WriteEndArray();
     }
 
-    // ── binary serialisation ──────────────────────────────────────────────────
     //
     // Response tags:
     //   0x00 = null   0x01 = false   0x02 = true
@@ -185,6 +189,10 @@ internal readonly struct DispatchResult
                 WriteStringArrayBin(ref w, _properties!);
                 WriteStringArrayBin(ref w, _staticMethods!);
                 WriteStringArrayBin(ref w, _staticProperties!);
+                WriteStringArrayBin(ref w, _readonlyProperties!);
+                WriteStringArrayBin(ref w, _readonlyStaticProperties!);
+                WriteStringArrayBin(ref w, _writeonlyProperties!);
+                WriteStringArrayBin(ref w, _writeonlyStaticProperties!);
                 break;
         }
     }
@@ -242,8 +250,6 @@ internal readonly struct DispatchResult
     }
 }
 
-// ── async result helpers ──────────────────────────────────────────────────────
-
 internal static class TaskResultCache
 {
     private static readonly ConcurrentDictionary<Type, Func<Task, object?>> s_cache = new();

package/package.json

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