Ensure support for custom null and undefined (#1407)

sebastienros · Jan 18, 2023 · 81cfbc0 · 81cfbc0
1 parent 4839fd1
commit 81cfbc0
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 38 deletions.
diff --git a/Jint.Tests.PublicInterface/RavenApiUsageTests.cs b/Jint.Tests.PublicInterface/RavenApiUsageTests.cs
@@ -2,6 +2,7 @@
 using Jint.Constraints;
 using Jint.Native;
 using Jint.Native.Function;
+using Jint.Runtime;
 using Jint.Runtime.Descriptors;
 using Jint.Runtime.Interop;
 
@@ -96,7 +97,7 @@ public void CanInjectConstructedObjects()
 
         TestArrayAccess(engine, array1, "array1");
 
-        var array3 = new JsArray(engine, new []
+        var array3 = new JsArray(engine, new[]
         {
             new PropertyDescriptor(JsNumber.Create(1), true, true, true),
             new PropertyDescriptor(JsNumber.Create(2), true, true, true),
@@ -206,47 +207,97 @@ public void CanInheritCustomString()
         Assert.True(engine.Evaluate("empty.trimEnd() === ''").AsBoolean());
     }
 
-    private sealed class CustomString : JsString
+    [Fact]
+    public void CanDefineCustomNull()
     {
-        private readonly string _value;
+        var engine = new Engine();
+        engine.SetValue("value", new CustomNull());
+        Assert.Equal("foo", engine.Evaluate("value ? value + 'bar' : 'foo'"));
+    }
 
-        public CustomString(string value) : base(null)
-        {
-            _value = value;
-        }
+    [Fact]
+    public void CanDefineCustomUndefined()
+    {
+        var engine = new Engine();
+        engine.SetValue("value", new CustomUndefined());
+        Assert.Equal("foo", engine.Evaluate("value ? value + 'bar' : 'foo'"));
+    }
+}
 
-        public override string ToString()
-        {
-            // when called we know that we couldn't use fast paths
-            throw new InvalidOperationException("I don't want to be materialized!");
-        }
+file sealed class CustomString : JsString
+{
+    private readonly string _value;
 
-        public override char this[int index] => _value[index];
+    public CustomString(string value) : base(null)
+    {
+        _value = value;
+    }
 
-        public override int Length => _value.Length;
+    public override string ToString()
+    {
+        // when called we know that we couldn't use fast paths
+        throw new InvalidOperationException("I don't want to be materialized!");
+    }
 
-        public override bool Equals(JsString obj)
-        {
-            return obj switch
-            {
-                CustomString customString => _value == customString._value,
-                _ => _value == obj.ToString()
-            };
-        }
+    public override char this[int index] => _value[index];
+
+    public override int Length => _value.Length;
 
-        public override bool IsLooselyEqual(JsValue value)
+    public override bool Equals(JsString obj)
+    {
+        return obj switch
         {
-            return value switch
-            {
-                CustomString customString => _value == customString._value,
-                JsString jsString => _value == jsString.ToString(),
-                _ => base.IsLooselyEqual(value)
-            };
-        }
+            CustomString customString => _value == customString._value,
+            _ => _value == obj.ToString()
+        };
+    }
 
-        public override int GetHashCode()
+    public override bool IsLooselyEqual(JsValue value)
+    {
+        return value switch
         {
-            return _value.GetHashCode();
-        }
+            CustomString customString => _value == customString._value,
+            JsString jsString => _value == jsString.ToString(),
+            _ => base.IsLooselyEqual(value)
+        };
+    }
+
+    public override int GetHashCode()
+    {
+        return _value.GetHashCode();
+    }
+}
+
+file sealed class CustomNull : JsValue
+{
+    public CustomNull() : base(Types.Null)
+    {
+    }
+
+    public override object ToObject()
+    {
+        return null;
+    }
+
+    public override string ToString()
+    {
+        return "null";
+    }
+}
+
+file sealed class CustomUndefined : JsValue
+{
+    public CustomUndefined() : base(Types.Null)
+    {
+    }
+
+    public override object ToObject()
+    {
+        return null;
+    }
+
+    public override string ToString()
+    {
+        return "null";
     }
 }
diff --git a/Jint/Native/JsNull.cs b/Jint/Native/JsNull.cs
@@ -10,8 +10,6 @@ internal JsNull() : base(Types.Null)
 
     public override object ToObject() => null!;
 
-    internal override bool ToBoolean() => false;
-
     public override string ToString() => "null";
 
     public override bool IsLooselyEqual(JsValue value)

diff --git a/Jint/Native/JsUndefined.cs b/Jint/Native/JsUndefined.cs
@@ -10,8 +10,6 @@ internal JsUndefined() : base(Types.Undefined)
 
     public override object ToObject() => null!;
 
-    internal override bool ToBoolean() => false;
-
     public override string ToString() => "undefined";
 
     public override bool IsLooselyEqual(JsValue value)

diff --git a/Jint/Native/JsValue.cs b/Jint/Native/JsValue.cs
@@ -149,7 +149,7 @@ public static JsValue FromObject(Engine engine, object? value)
         /// <summary>
         /// Coerces boolean value from <see cref="JsValue"/> instance.
         /// </summary>
-        internal virtual bool ToBoolean() => true;
+        internal virtual bool ToBoolean() => _type > InternalTypes.Null;
 
         /// <summary>
         /// Invoke the current value as function.