chore: add stringify support for Map and Array data (#817)

Because

 - we previously lacked stringify support for Map and Array data.

This commit

 - adds stringify support for Map and Array data.

.github/workflows/integration-test.yml

@@ -98,7 +98,7 @@ jobs:
       - name: Install k6
         run: |
           go install go.k6.io/xk6/cmd/xk6@v${{ env.XK6_VERSION }}
-          xk6 build v${{ env.K6_VERSION }} --with github.com/grafana/xk6-sql && sudo cp k6 /usr/bin
+          xk6 build v${{ env.K6_VERSION }} --with github.com/grafana/xk6-sql@v0.4.1 && sudo cp k6 /usr/bin
 
       - name: Checkout (pipeline)
         uses: actions/checkout@v3

Dockerfile.dev

@@ -43,7 +43,7 @@ RUN --mount=target=. --mount=type=cache,target=/root/.cache/go-build --mount=typ
 
 # k6
 RUN --mount=target=. --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOOS=$TARGETOS GOARCH=$TARGETARCH go install go.k6.io/xk6/cmd/xk6@v${XK6_VERSION}
-RUN --mount=target=. --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOOS=$TARGETOS GOARCH=$TARGETARCH xk6 build v${K6_VERSION} --with github.com/grafana/xk6-sql --output /usr/bin/k6
+RUN --mount=target=. --mount=type=cache,target=/root/.cache/go-build --mount=type=cache,target=/go/pkg GOOS=$TARGETOS GOARCH=$TARGETARCH xk6 build v${K6_VERSION} --with github.com/grafana/xk6-sql@v0.4.1 --output /usr/bin/k6
 
 # -- set up Go
 

pkg/data/array.go

@@ -2,6 +2,7 @@ package data
 
 import (
 	"fmt"
+	"strings"
 
 	"google.golang.org/protobuf/types/known/structpb"
 
@@ -78,3 +79,16 @@ func (a Array) Equal(other format.Value) bool {
 func (a Array) Length() format.Number {
 	return NewNumberFromInteger(len(a))
 }
+
+func (a Array) String() string {
+	segments := make([]string, 0, len(a))
+	for _, v := range a {
+		switch v := v.(type) {
+		case *stringData:
+			segments = append(segments, fmt.Sprintf("\"%s\"", v.String()))
+		default:
+			segments = append(segments, v.String())
+		}
+	}
+	return fmt.Sprintf("[%s]", strings.Join(segments, ", "))
+}

pkg/data/format/format.go

@@ -16,24 +16,20 @@ type Number interface {
 	Value
 	Integer() int
 	Float64() float64
-	String() string
 }
 
 type String interface {
 	Value
-	String() string
 }
 
 type Boolean interface {
 	Value
 	Boolean() bool
-	String() string
 }
 
 type ByteArray interface {
 	Value
 	ByteArray() []byte
-	String() string
 }
 
 type File interface {
@@ -46,13 +42,11 @@ type File interface {
 	ContentType() (t String)
 	Filename() (t String)
 	SourceURL() (t String)
-	String() string
 }
 
 type Document interface {
 	File
 
-	String() string
 	Text() (val String, err error)
 	PDF() (val Document, err error)
 }

pkg/data/format/value.go

@@ -11,4 +11,5 @@ type Value interface {
 	ToStructValue() (v *structpb.Value, err error)
 	Get(p *path.Path) (v Value, err error)
 	Equal(other Value) bool
+	String() string
 }

pkg/data/map.go

@@ -2,6 +2,7 @@ package data
 
 import (
 	"fmt"
+	"strings"
 
 	"google.golang.org/protobuf/types/known/structpb"
 
@@ -67,3 +68,16 @@ func (m Map) Equal(other format.Value) bool {
 	}
 	return false
 }
+
+func (m Map) String() string {
+	segments := make([]string, 0, len(m))
+	for k, v := range m {
+		switch v := v.(type) {
+		case *stringData:
+			segments = append(segments, fmt.Sprintf("\"%s\": \"%s\"", k, v.String()))
+		default:
+			segments = append(segments, fmt.Sprintf("\"%s\": %s", k, v.String()))
+		}
+	}
+	return fmt.Sprintf("{%s}", strings.Join(segments, ", "))
+}

pkg/data/null.go

@@ -39,3 +39,7 @@ func (n *nullData) Equal(other format.Value) bool {
 	}
 	return false
 }
+
+func (n *nullData) String() string {
+	return "null"
+}

pkg/data/struct.go

@@ -75,13 +75,13 @@ func unmarshalStruct(m Map, v reflect.Value) error {
 // unmarshalValue dispatches to type-specific unmarshal functions based on the value type.
 func unmarshalValue(val format.Value, field reflect.Value, structField reflect.StructField) error {
 	switch v := val.(type) {
-	case format.File, format.Document, format.Image, format.Video, format.Audio:
+	case *fileData, *documentData, *imageData, *videoData, *audioData:
 		return unmarshalInterface(v, field, structField)
-	case format.Boolean:
+	case *booleanData:
 		return unmarshalBoolean(v, field)
-	case format.Number:
+	case *numberData:
 		return unmarshalNumber(v, field)
-	case format.String:
+	case *stringData:
 		return unmarshalString(v, field)
 	case Array:
 		if field.Type().Implements(reflect.TypeOf((*format.Value)(nil)).Elem()) {
@@ -95,7 +95,7 @@ func unmarshalValue(val format.Value, field reflect.Value, structField reflect.S
 			return nil
 		}
 		return unmarshalMap(v, field)
-	case format.Null:
+	case *nullData:
 		if field.Type().Implements(reflect.TypeOf((*format.Value)(nil)).Elem()) {
 			field.Set(reflect.ValueOf(v))
 			return nil

pkg/recipe/dag.go

@@ -214,10 +214,7 @@ func Render(ctx context.Context, template format.Value, batchIdx int, wfm memory
 				}
 				return nil, err
 			}
-
-			if s, ok := v.(format.String); ok {
-				val += s.String()
-			}
+			val += v.String()
 			s = s[endIdx+1:]
 		}
 		return data.NewString(val), nil