Merge pull request #100 from gburt/main

Fix some comparisons

Author: diegoholiveira

comp.go

@@ -4,6 +4,7 @@ import (
 	"math"
 	"reflect"
 	"strconv"
+	"strings"
 )
 
 // at simulate undefined in javascript
@@ -31,6 +32,10 @@ func toNumberForLess(v any) float64 {
 			return 0
 		}
 	case string:
+		if strings.TrimSpace(value) == "" {
+			return 0
+		}
+
 		n, err := strconv.ParseFloat(value, 64)
 		switch err {
 		case strconv.ErrRange, nil:
@@ -74,15 +79,12 @@ func equals(a, b any) bool {
 		return a == b
 	}
 
-	if isNumber(a) {
-		return isPrimitive(b) && toNumber(a) == toNumber(b)
+	if isPrimitive(a) && isPrimitive(b) && (isNumber(a) || isNumber(b)) {
+		return toNumberForLess(a) == toNumberForLess(b)
 	}
 
-	if isBool(a) {
-		if !isBool(b) {
-			return false
-		}
-		return isTrue(a) == isTrue(b)
+	if isBool(a) || isBool(b) {
+		return isTruthy(a) == isTruthy(b)
 	}
 
 	if !isString(a) || !isString(b) {
@@ -91,3 +93,11 @@ func equals(a, b any) bool {
 
 	return toString(a) == toString(b)
 }
+
+func isTruthy(v any) bool {
+	return toNumberForLess(v) == 1
+}
+
+func isFalsey(v any) bool {
+	return toNumberForLess(v) == 0
+}

comp_test.go

@@ -67,4 +67,8 @@ func TestEqualsWithBooleans(t *testing.T) {
 func TestEqualsWithNil(t *testing.T) {
 	assert.True(t, equals(nil, nil))
 	assert.False(t, equals(nil, ""))
-}
+}
+
+func TestEqualsWithNumberAndString(t *testing.T) {
+	assert.True(t, equals("1", 1))
+}