#167 - fix code cov

Author: Stepami

ExtendedJavaScriptSubset.sln

@@ -71,6 +71,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{04AB
 		samples\overload_object.js = samples\overload_object.js
 		samples\overload.js = samples\overload.js
 		samples\defaultparams.js = samples\defaultparams.js
+		samples\nullable.js = samples\nullable.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{FB8F6EE1-1942-46D6-954E-9A1647BBDF10}"

samples/nullable.js

@@ -0,0 +1,13 @@
+function indexOrNull(arr:number[], val:number): number?{
+    const n = ~arr
+    let i = 0
+    while(i < n){
+        if (arr[i] == val)
+            return i
+        i = i + 1
+    }
+    return null
+}
+
+>>> indexOrNull([1,2,3], 4)
+>>> indexOrNull([1,2,3], 2)

src/Domain/HydraScript.Domain.IR/Types/Any.cs

@@ -1,5 +1,8 @@
+using System.Diagnostics.CodeAnalysis;
+
 namespace HydraScript.Domain.IR.Types;
 
+[ExcludeFromCodeCoverage]
 public class Any() : Type("any")
 {
     public override bool Equals(object? obj) => true;

src/Domain/HydraScript.Domain.IR/Types/NullType.cs

@@ -3,7 +3,7 @@ namespace HydraScript.Domain.IR.Types;
 public class NullType() : Type("null")
 {
     public override bool Equals(object? obj) =>
-        obj is NullableType or NullType or Any;
+        obj is ObjectType or NullableType or NullType or Any;
 
     public override int GetHashCode() =>
         "null".GetHashCode();

src/Domain/HydraScript.Domain.IR/Types/NullableType.cs

@@ -1,16 +1,8 @@
 namespace HydraScript.Domain.IR.Types;
 
-public class NullableType : Type
+public class NullableType(Type type) : Type($"{type}?")
 {
-    public Type Type { get; private set; } = default!;
-
-    public NullableType(Type type) :
-        base($"{type}?") =>
-        Type = type;
-
-    protected NullableType()
-    {
-    }
+    public Type Type { get; private set; } = type;
 
     public override void ResolveReference(
         Type reference,
@@ -28,7 +20,7 @@ public override bool Equals(object? obj)
         if (obj is NullableType that)
             return Equals(Type, that.Type);
 
-        return obj is NullType or Any;
+        return obj is NullType or Any || (obj is Type type && type.Equals(Type));
     }
 
     public override int GetHashCode() =>

src/Domain/HydraScript.Domain.IR/Types/ObjectType.cs

@@ -3,7 +3,7 @@
 
 namespace HydraScript.Domain.IR.Types;
 
-public class ObjectType : NullableType
+public class ObjectType : Type
 {
     private readonly Dictionary<string, Type> _properties;
     private readonly List<FunctionSymbolId> _methods = [];

tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj

@@ -80,6 +80,10 @@
             <Link>Samples\linkedlist.js</Link>
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </Content>
+        <Content Include="..\..\samples\nullable.js">
+            <Link>Samples\nullable.js</Link>
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
         <Content Include="..\..\samples\objeditread.js">
             <Link>Samples\objeditread.js</Link>
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>

tests/HydraScript.UnitTests/Domain/IR/TypeTests.cs

@@ -10,8 +10,10 @@ public void TypeEqualityTest()
     {
         var number = new Type("number");
         var arrayOfNumbers = new ArrayType(number);
+        var nullableNumber = new NullableType(number);
         Assert.False(arrayOfNumbers.Equals(number));
         Assert.False(number.Equals(arrayOfNumbers));
+        Assert.True(nullableNumber.Equals(number));
     }
 
     [Fact]