cmd/refactor: fix src:dst parsing to deal with colons

cmd/refactor.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"io"
 	"os"
-	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -181,12 +180,19 @@ func parseSrcDstMap(data []string) (map[string]string, error) {
 	result := map[string]string{}
 
 	for _, d := range data {
-		parts := strings.Split(d, ":")
-		if len(parts) != 2 {
-			return nil, errors.New("expected mapping of the form <from>:<to>")
+		term, err := ast.ParseTerm("{" + d + "}")
+		if err != nil {
+			return nil, newError("failed to parse mapping: %v", err)
 		}
-
-		result[parts[0]] = parts[1]
+		obj, ok := term.Value.(ast.Object)
+		if !ok {
+			return nil, newError("expected mapping of the form <from>:<to>")
+		}
+		keys := obj.Keys()
+		if len(keys) != 1 {
+			return nil, newError("expected mapping of the form <from>:<to>")
+		}
+		result[keys[0].String()] = obj.Get(keys[0]).String()
 	}
 	return result, nil
 }

cmd/refactor_test.go

@@ -206,6 +206,16 @@ func TestParseSrcDstMap(t *testing.T) {
 		t.Fatalf("Expected mapping %v but got %v", expected, actual)
 	}
 
+	actual, err = parseSrcDstMap([]string{`data.foo:data.bar["baz:qux"]`})
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	expected = map[string]string{"data.foo": `data.bar["baz:qux"]`}
+	if !maps.Equal(actual, expected) {
+		t.Fatalf("Expected mapping %v but got %v", expected, actual)
+	}
+
 	_, err = parseSrcDstMap([]string{"data.lib.foo:data.baz.bar", "data::data.acme"})
 	if err == nil {
 		t.Fatal("Expected error but got nil")
@@ -215,6 +225,19 @@ func TestParseSrcDstMap(t *testing.T) {
 	if err == nil {
 		t.Fatal("Expected error but got nil")
 	}
+
+	_, err = parseSrcDstMap([]string{"[1]"}) // invalid term type
+	if err == nil {
+		t.Fatal("Expected error but got nil")
+	}
+	_, err = parseSrcDstMap([]string{"[1,"}) // parse error
+	if err == nil {
+		t.Fatal("Expected error but got nil")
+	}
+	_, err = parseSrcDstMap([]string{`{"data.a:data.b, data.c:data.d}`}) // multiple mappings
+	if err == nil {
+		t.Fatal("Expected error but got nil")
+	}
 }
 
 func TestDoMoveNoMapping(t *testing.T) {