Should not wrap Type instances as TypeReference by default (#845)

sebastienros · Mar 4, 2021 · f5a2abf · f5a2abf
1 parent 55b9ef6
commit f5a2abf
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 12 deletions.
diff --git a/Jint.Tests/Runtime/Domain/Person.cs b/Jint.Tests/Runtime/Domain/Person.cs
@@ -1,10 +1,14 @@
-namespace Jint.Tests.Runtime.Domain
+using System;
+
+namespace Jint.Tests.Runtime.Domain
 {
     public class Person : IPerson
     {
         public string Name { get; set; }
         public int Age { get; set; }
 
+        public Type TypeProperty { get; set; } = typeof(Person);
+
         public override string ToString()
         {
             return Name;

diff --git a/Jint.Tests/Runtime/InteropTests.cs b/Jint.Tests/Runtime/InteropTests.cs
@@ -57,6 +57,20 @@ public void PrimitiveTypesCanBeSet()
                 assert(z === 'foo');
             ");
         }
+
+        [Fact]
+        public void TypePropertyAccess()
+        {
+            var userClass = new Person();
+
+            var result = new Engine()
+                .SetValue("userclass", userClass)
+                .Execute("userclass.TypeProperty.Name;")
+                .GetCompletionValue()
+                .AsString();
+
+            Assert.Equal("Person", result);
+        }
 
         [Fact]
         public void CanAccessMemberNamedItem()

diff --git a/Jint/Engine.cs b/Jint/Engine.cs
@@ -309,7 +309,11 @@ public Engine SetValue(JsValue name, JsValue value)
 
         public Engine SetValue(JsValue name, object obj)
         {
-            return SetValue(name, JsValue.FromObject(this, obj));
+            var value = obj is Type t
+                ? TypeReference.CreateTypeReference(this, t)
+                : JsValue.FromObject(this, obj);
+
+            return SetValue(name, value);
         }
 
         public void LeaveExecutionContext()

diff --git a/Jint/Native/JsValue.cs b/Jint/Native/JsValue.cs
@@ -276,9 +276,6 @@ public Types Type
         /// <summary>
         /// Creates a valid <see cref="JsValue"/> instance from any <see cref="Object"/> instance
         /// </summary>
-        /// <param name="engine"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
         public static JsValue FromObject(Engine engine, object value)
         {
             if (value == null)
@@ -311,13 +308,6 @@ public static JsValue FromObject(Engine engine, object value)
                 return typeMapper(engine, value);
             }
 
-            var type = value as Type;
-            if (type != null)
-            {
-                var typeReference = TypeReference.CreateTypeReference(engine, type);
-                return typeReference;
-            }
-
             if (value is System.Array a)
             {
                 // racy, we don't care, worst case we'll catch up later