rooibos-roku 4.5.3 → 4.5.4

package/dist/lib/framework/CommonUtils.bs

@@ -602,7 +602,6 @@ namespace rooibos.Common
       return t
     end if
   end function
-  
   ' /**
   '  * @memberof module:CommonUtils
   '  * @name EqValues
@@ -615,33 +614,26 @@ namespace rooibos.Common
   '  */
   function eqValues(Value1, Value2) as dynamic
     ' Workaraund for bug with string boxing, and box everything else
-    val1Type = type(Value1)
-    val2Type = type(Value2)
-    if val1Type = "<uninitialized>" or val2Type = "<uninitialized>" or val1Type = "" or val2Type = ""
+    val1Type = Rooibos.Common.getSafeType(Value1)
+    val2Type = Rooibos.Common.getSafeType(Value2)
+    if val1Type = invalid or val2Type = invalid
       ? "ERROR!!!! - undefined value passed"
       return false
     end if
 
-    v1IsString = val1Type = "roString" or val1Type = "String"
-    v2IsString = val2Type = "roString" or val2Type = "String"
-    'update types after boxing
-    val1Type = type(Value1)
-    val2Type = type(Value2)
-
-
     'Upcast int to float, if other is float
-    if val1Type = "roFloat" and val2Type = "roInt"
+    if val1Type = "Float" and val2Type = "Integer"
       Value2 = cdbl(Value2)
-    else if val2Type = "roFloat" and val1Type = "roInt"
+    else if val2Type = "Float" and val1Type = "Integer"
       Value1 = cdbl(Value1)
     end if
 
-    if val1Type <> val2Type and v1IsString <> v2IsString
+    if val1Type <> val2Type
       return false
     else
       valtype = val1Type
 
-      if valtype = "roList"
+      if valtype = "List"
         return Rooibos.Common.eqArray(Value1, Value2)
       else if valtype = "roAssociativeArray"
         return Rooibos.Common.eqAssocArray(Value1, Value2)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rooibos-roku",
-    "version": "4.5.3",
+    "version": "4.5.4",
     "description": "simple, flexible, fun brightscript test framework for roku scenegraph apps - roku brighterscript plugin",
     "repository": {
         "type": "git",