chore: use toJSON instead of marshalJSON

Author: yashmehrotra

celext/cel_test.go

@@ -119,10 +119,10 @@ func TestCelJSON(t *testing.T) {
 		Input  string
 		Output any
 	}{
-		{Input: `dyn([{'name': 'John', 'age': 30}]).marshalJSON()`, Output: `[{"age":30,"name":"John"}]`},
-		{Input: `[{'name': 'John'}].marshalJSON()`, Output: `[{"name":"John"}]`},
-		{Input: `dyn({'name': 'John'}).marshalJSON()`, Output: `{"name":"John"}`},
-		{Input: `{'name': 'John'}.marshalJSON()`, Output: `{"name":"John"}`},
+		{Input: `dyn([{'name': 'John', 'age': 30}]).toJSON()`, Output: `[{"age":30,"name":"John"}]`},
+		{Input: `[{'name': 'John'}].toJSON()`, Output: `[{"name":"John"}]`},
+		{Input: `dyn({'name': 'John'}).toJSON()`, Output: `{"name":"John"}`},
+		{Input: `{'name': 'John'}.toJSON()`, Output: `{"name":"John"}`},
 	}
 
 	for i, td := range testData {

celext/celfuncs.go

@@ -12,18 +12,17 @@ import (
 )
 
 var (
-	listType   = reflect.TypeOf(&structpb.ListValue{})
-	mapType    = reflect.TypeOf(&structpb.Struct{})
-	mapStrDyn  = cel.MapType(cel.StringType, cel.DynType)
-	listStrDyn = cel.ListType(cel.DynType)
+	listType  = reflect.TypeOf(&structpb.ListValue{})
+	mapType   = reflect.TypeOf(&structpb.Struct{})
+	mapStrDyn = cel.MapType(cel.StringType, cel.DynType)
 )
 
 var customCelFuncs = []cel.EnvOption{
 	k8sHealth(),
 	k8sIsHealthy(),
 	k8sCPUAsMillicores(),
 	k8sMemoryAsBytes(),
-	marshalJSON(),
+	toJSON(),
 	parseJSON(),
 }
 

celext/json.go

@@ -11,7 +11,7 @@ import (
 
 // Reference: https://github.com/tektoncd/triggers/blob/main/pkg/interceptors/cel/triggers.go
 
-func marshalJSON() cel.EnvOption {
+func toJSON() cel.EnvOption {
 	valToJSONString := func(val ref.Val) ref.Val {
 		var typeDesc reflect.Type
 
@@ -21,7 +21,7 @@ func marshalJSON() cel.EnvOption {
 		case types.ListType:
 			typeDesc = listType
 		default:
-			return types.ValOrErr(val, "unexpected type:%v passed to marshalJSON", val.Type())
+			return types.ValOrErr(val, "unexpected type:%v passed to toJSON", val.Type())
 		}
 
 		nativeVal, err := val.ConvertToNative(typeDesc)
@@ -37,10 +37,8 @@ func marshalJSON() cel.EnvOption {
 		return types.String(marshaledVal)
 	}
 
-	return cel.Function("marshalJSON",
-		cel.MemberOverload("marshalJSON_map", []*cel.Type{mapStrDyn}, cel.StringType,
-			cel.UnaryBinding(valToJSONString)),
-		cel.MemberOverload("marshalJSON_list", []*cel.Type{listStrDyn}, cel.StringType,
+	return cel.Function("toJSON",
+		cel.MemberOverload("toJSON_dyn", []*cel.Type{cel.DynType}, cel.StringType,
 			cel.UnaryBinding(valToJSONString)),
 	)
 }