fix: allow nil to be considered false

updated getBoolean to return false with nil arguments

updated consensus tests

Author: evilmonkeyinc

script/standard/logic_operators_test.go

@@ -522,7 +522,7 @@ func Test_notOperator(t *testing.T) {
 				},
 			},
 			expected: operatorTestExpected{
-				err: "invalid argument. is nil",
+				value: true,
 			},
 		},
 		{

script/standard/operators.go

@@ -73,7 +73,7 @@ func getNumber(argument interface{}, parameters map[string]interface{}) (float64
 
 func getBoolean(argument interface{}, parameters map[string]interface{}) (bool, error) {
 	if argument == nil {
-		return false, errInvalidArgumentNil
+		return false, nil
 	}
 	if parameters == nil {
 		parameters = make(map[string]interface{})
@@ -93,6 +93,10 @@ func getBoolean(argument interface{}, parameters map[string]interface{}) (bool,
 		}
 	}
 
+	if argument == nil {
+		return false, nil
+	}
+
 	str := fmt.Sprintf("%v", argument)
 	boolValue, err := strconv.ParseBool(str)
 	if err != nil {

script/standard/operators_test.go

@@ -213,6 +213,8 @@ func Test_getNumber(t *testing.T) {
 
 func Test_getBoolean(t *testing.T) {
 
+	currentSelector, _ := newSelectorOperator("@", &ScriptEngine{}, nil)
+
 	type input struct {
 		argument   interface{}
 		parameters map[string]interface{}
@@ -230,7 +232,7 @@ func Test_getBoolean(t *testing.T) {
 		{
 			input: input{},
 			expected: expected{
-				err: "invalid argument. is nil",
+				value: false,
 			},
 		},
 		{
@@ -287,6 +289,25 @@ func Test_getBoolean(t *testing.T) {
 				value: true,
 			},
 		},
+		{
+			input: input{
+				argument: currentSelector,
+			},
+			expected: expected{
+				value: false,
+			},
+		},
+		{
+			input: input{
+				argument: "null",
+				parameters: map[string]interface{}{
+					"null": nil,
+				},
+			},
+			expected: expected{
+				value: false,
+			},
+		},
 	}
 
 	for idx, test := range tests {

test/README.md

@@ -217,17 +217,17 @@ This implementation would be closer to the 'Scalar consensus' as it does not alw
 |:question:|`$[?(@.key>42)]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":43},{"key":42.0001},{"key":100}]`|
 |:question:|`$[?(@.key>=42)]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":42},{"key":43},{"key":42.0001},{"key":100}]`|
 |:no_entry:|`$[?(@.d in [2, 3])]`|`[{"d": 1}, {"d": 2}, {"d": 1}, {"d": 3}, {"d": 4}]`|`nil`|`[]`|
-|:white_check_mark:|`$[?(2 in @.d)]`|`[{"d": [1, 2, 3]}, {"d": [2]}, {"d": [1]}, {"d": [3, 4]}, {"d": [4, 2]}]`|`nil`|`null`|
+|:no_entry:|`$[?(2 in @.d)]`|`[{"d": [1, 2, 3]}, {"d": [2]}, {"d": [1]}, {"d": [3, 4]}, {"d": [4, 2]}]`|`nil`|`[{"d":[1,2,3]},{"d":[2]},{"d":[1]},{"d":[3,4]},{"d":[4,2]}]`|
 |:question:|`$[?(@.key<42)]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":0},{"key":-1},{"key":41},{"key":41.9999}]`|
 |:question:|`$[?(@.key<=42)]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":0},{"key":42},{"key":-1},{"key":41},{"key":41.9999}]`|
 |:question:|`$[?(@.key*2==100)]`|`[{"key": 60}, {"key": 50}, {"key": 10}, {"key": -50}, {"key*2": 100}]`|none|`[{"key":50}]`|
-|:question:|`$[?(!(@.key==42))]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":0},{"key":42},{"key":-1},{"key":41},{"key":43},{"key":42.0001},{"key":41.9999},{"key":100},{"key":"43"},{"key":"42"},{"key":"41"},{"key":"value"},{"some":"value"}]`|
-|:question:|`$[?(!(@.key<42))]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":0},{"key":42},{"key":-1},{"key":41},{"key":43},{"key":42.0001},{"key":41.9999},{"key":100},{"key":"43"},{"key":"42"},{"key":"41"},{"key":"value"},{"some":"value"}]`|
-|:question:|`$[?([email protected])]`|`[ { "some": "some value" }, { "key": true }, { "key": false }, { "key": null }, { "key": "value" }, { "key": "" }, { "key": 0 }, { "key": 1 }, { "key": -1 }, { "key": 42 }, { "key": {} }, { "key": [] } ]`|none|`null`|
+|:question:|`$[?(!(@.key==42))]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":0},{"key":-1},{"key":41},{"key":43},{"key":42.0001},{"key":41.9999},{"key":100},{"key":"43"},{"key":"42"},{"key":"41"},{"key":"value"}]`|
+|:question:|`$[?(!(@.key<42))]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`|none|`[{"key":42},{"key":43},{"key":42.0001},{"key":100}]`|
+|:question:|`$[?([email protected])]`|`[ { "some": "some value" }, { "key": true }, { "key": false }, { "key": null }, { "key": "value" }, { "key": "" }, { "key": 0 }, { "key": 1 }, { "key": -1 }, { "key": 42 }, { "key": {} }, { "key": [] } ]`|none|`[{"key":false},{"key":null},{"key":0}]`|
 |:question:|`$[?(@.key!=42)]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "some"}, {"key": "42"}, {"key": null}, {"key": 420}, {"key": ""}, {"key": {}}, {"key": []}, {"key": [42]}, {"key": {"key": 42}}, {"key": {"some": 42}}, {"some": "value"} ]`|none|`[{"key":0},{"key":-1},{"key":1},{"key":41},{"key":43},{"key":42.0001},{"key":41.9999},{"key":100},{"key":"some"},{"key":"42"},{"key":null},{"key":420},{"key":""},{"key":{}},{"key":[]},{"key":[42]},{"key":{"key":42}},{"key":{"some":42}}]`|
 |:no_entry:|`$[*].bookmarks[?(@.page == 45)]^^^`|`[ { "title": "Sayings of the Century", "bookmarks": [{ "page": 40 }] }, { "title": "Sword of Honour", "bookmarks": [ { "page": 35 }, { "page": 45 } ] }, { "title": "Moby Dick", "bookmarks": [ { "page": 3035 }, { "page": 45 } ] } ]`|`nil`|`[[],[],[]]`|
 |:question:|`$[?(@.name=~/hello.*/)]`|`[ {"name": "hullo world"}, {"name": "hello world"}, {"name": "yes hello world"}, {"name": "HELLO WORLD"}, {"name": "good bye"} ]`|none|`[]`|
-|:question:|`$[?(@.name=~/@.pattern/)]`|`[ {"name": "hullo world"}, {"name": "hello world"}, {"name": "yes hello world"}, {"name": "HELLO WORLD"}, {"name": "good bye"}, {"pattern": "hello.*"} ]`|none|`null`|
+|:question:|`$[?(@.name=~/@.pattern/)]`|`[ {"name": "hullo world"}, {"name": "hello world"}, {"name": "yes hello world"}, {"name": "HELLO WORLD"}, {"name": "good bye"}, {"pattern": "hello.*"} ]`|none|`[]`|
 |:question:|`$[?(@[*]>=4)]`|`[[1,2],[3,4],[5,6]]`|none|`[]`|
 |:question:|`$.x[?(@[*]>=$.y[*])]`|`{"x":[[1,2],[3,4],[5,6]],"y":[3,4,5]}`|none|`[]`|
 |:no_entry:|`$[?(@.key=42)]`|`[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "some"}, {"key": "42"}, {"key": null}, {"key": 420}, {"key": ""}, {"key": {}}, {"key": []}, {"key": [42]}, {"key": {"key": 42}}, {"key": {"some": 42}}, {"some": "value"} ]`|`nil`|`[]`|
@@ -268,7 +268,7 @@ This implementation would be closer to the 'Scalar consensus' as it does not alw
 |:white_check_mark:|`$[0,1]`|`["first", "second", "third"]`|`["first","second"]`|`["first","second"]`|
 |:white_check_mark:|`$[0,0]`|`["a"]`|`["a","a"]`|`["a","a"]`|
 |:white_check_mark:|`$['a','a']`|`{"a":1}`|`[1,1]`|`[1,1]`|
-|:question:|`$[?(@.key<3),?(@.key>6)]`|`[{"key": 1}, {"key": 8}, {"key": 3}, {"key": 10}, {"key": 7}, {"key": 2}, {"key": 6}, {"key": 4}]`|none|`null`|
+|:question:|`$[?(@.key<3),?(@.key>6)]`|`[{"key": 1}, {"key": 8}, {"key": 3}, {"key": 10}, {"key": 7}, {"key": 2}, {"key": 6}, {"key": 4}]`|none|`[]`|
 |:white_check_mark:|`$['key','another']`|`{ "key": "value", "another": "entry" }`|`["value","entry"]`|`["value","entry"]`|
 |:white_check_mark:|`$['missing','key']`|`{ "key": "value", "another": "entry" }`|`["value"]`|`["value"]`|
 |:no_entry:|`$[:]['c','d']`|`[{"c":"cc1","d":"dd1","e":"ee1"},{"c":"cc2","d":"dd2","e":"ee2"}]`|`["cc1","dd1","cc2","dd2"]`|`[["cc1","dd1"],["cc2","dd2"]]`|

test/filter_test.go

@@ -443,11 +443,17 @@ var filterTests []testData = []testData{
 		expectedError: "",
 	},
 	{
-		selector:      `$[?(2 in @.d)]`, // TODO : in keywork will not work
-		data:          `[{"d": [1, 2, 3]}, {"d": [2]}, {"d": [1]}, {"d": [3, 4]}, {"d": [4, 2]}]`,
-		expected:      nil,
+		selector: `$[?(2 in @.d)]`, // TODO : in keywork will not work
+		data:     `[{"d": [1, 2, 3]}, {"d": [2]}, {"d": [1]}, {"d": [3, 4]}, {"d": [4, 2]}]`,
+		expected: []interface{}{
+			map[string]interface{}{"d": []interface{}{float64(1), float64(2), float64(3)}},
+			map[string]interface{}{"d": []interface{}{float64(2)}},
+			map[string]interface{}{"d": []interface{}{float64(1)}},
+			map[string]interface{}{"d": []interface{}{float64(3), float64(4)}},
+			map[string]interface{}{"d": []interface{}{float64(4), float64(2)}},
+		},
 		consensus:     nil,
-		expectedError: "invalid expression. unexpected token '2' at index 0",
+		expectedError: "",
 	},
 	{
 		selector: `$[?(@.key<42)]`,
@@ -486,7 +492,6 @@ var filterTests []testData = []testData{
 		data:     `[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`,
 		expected: []interface{}{
 			map[string]interface{}{"key": float64(0)},
-			map[string]interface{}{"key": float64(42)},
 			map[string]interface{}{"key": float64(-1)},
 			map[string]interface{}{"key": float64(41)},
 			map[string]interface{}{"key": float64(43)},
@@ -497,38 +502,35 @@ var filterTests []testData = []testData{
 			map[string]interface{}{"key": "42"},
 			map[string]interface{}{"key": "41"},
 			map[string]interface{}{"key": "value"},
-			map[string]interface{}{"some": "value"},
+			// map[string]interface{}{"some": "value"}, // TODO : it should include this
 		},
 		consensus:     consensusNone,
 		expectedError: "",
 	},
 	{
+		// TODO : should include those without key fields
 		selector: `$[?(!(@.key<42))]`,
 		data:     `[ {"key": 0}, {"key": 42}, {"key": -1}, {"key": 41}, {"key": 43}, {"key": 42.0001}, {"key": 41.9999}, {"key": 100}, {"key": "43"}, {"key": "42"}, {"key": "41"}, {"key": "value"}, {"some": "value"} ]`,
-		expected: []interface{}{ // TODO : wrong
-			map[string]interface{}{"key": float64(0)},
+		expected: []interface{}{
 			map[string]interface{}{"key": float64(42)},
-			map[string]interface{}{"key": float64(-1)},
-			map[string]interface{}{"key": float64(41)},
 			map[string]interface{}{"key": float64(43)},
 			map[string]interface{}{"key": float64(42.0001)},
-			map[string]interface{}{"key": float64(41.9999)},
 			map[string]interface{}{"key": float64(100)},
-			map[string]interface{}{"key": "43"},
-			map[string]interface{}{"key": "42"},
-			map[string]interface{}{"key": "41"},
-			map[string]interface{}{"key": "value"},
-			map[string]interface{}{"some": "value"},
 		},
 		consensus:     consensusNone,
 		expectedError: "",
 	},
 	{
-		selector:      `$[?([email protected])]`, // TODO : not ! support
-		data:          `[ { "some": "some value" }, { "key": true }, { "key": false }, { "key": null }, { "key": "value" }, { "key": "" }, { "key": 0 }, { "key": 1 }, { "key": -1 }, { "key": 42 }, { "key": {} }, { "key": [] } ]`,
-		expected:      nil,
+		// TODO : this should also include {some: some value} and the null and empty
+		selector: `$[?([email protected])]`,
+		data:     `[ { "some": "some value" }, { "key": true }, { "key": false }, { "key": null }, { "key": "value" }, { "key": "" }, { "key": 0 }, { "key": 1 }, { "key": -1 }, { "key": 42 }, { "key": {} }, { "key": [] } ]`,
+		expected: []interface{}{
+			map[string]interface{}{"key": false},
+			map[string]interface{}{"key": nil},
+			map[string]interface{}{"key": float64(0)},
+		},
 		consensus:     consensusNone,
-		expectedError: "invalid expression. unexpected token '!' at index 0",
+		expectedError: "",
 	},
 	{
 		selector: `$[?(@.key!=42)]`,
@@ -573,9 +575,9 @@ var filterTests []testData = []testData{
 	{
 		selector:      `$[?(@.name=~/@.pattern/)]`,
 		data:          `[ {"name": "hullo world"}, {"name": "hello world"}, {"name": "yes hello world"}, {"name": "HELLO WORLD"}, {"name": "good bye"}, {"pattern": "hello.*"} ]`,
-		expected:      nil,
+		expected:      []interface{}{},
 		consensus:     consensusNone,
-		expectedError: "invalid expression. unexpected token '/' at index 0",
+		expectedError: "",
 	},
 	{
 		selector:      `$[?(@[*]>=4)]`,

test/union_test.go

@@ -31,9 +31,9 @@ var unionTests []testData = []testData{
 	{
 		selector:      `$[?(@.key<3),?(@.key>6)]`,
 		data:          `[{"key": 1}, {"key": 8}, {"key": 3}, {"key": 10}, {"key": 7}, {"key": 2}, {"key": 6}, {"key": 4}]`,
-		expected:      nil,
+		expected:      []interface{}{},
 		consensus:     consensusNone,
-		expectedError: "invalid expression. unexpected token '3' at index 0",
+		expectedError: "",
 	},
 	{
 		selector:      `$['key','another']`,