fix: json parser issues

Author: mahendraintelops

cmd/generate.go

@@ -18,24 +18,25 @@ var generateCmd = &cobra.Command{
 
 Change the file as per your needs and then run the compage generate command to generate the code.`,
 	Run: func(cmd *cobra.Command, args []string) {
-		err := GenerateCode()
+		wD, err := os.Getwd()
+		if err != nil {
+			log.Errorf("error while getting the current directory [" + err.Error() + "]")
+			return
+		}
+		// set the project directory environment variable, if this is set, then the project will be generated in this folder
+		err = os.Setenv("COMPAGE_GENERATED_PROJECT_DIRECTORY", wD)
+		if err != nil {
+			log.Errorf("error while setting the project directory [" + err.Error() + "]")
+			return
+		}
+
+		err = GenerateCode()
 		cobra.CheckErr(err)
 	},
 }
 
 func init() {
 	rootCmd.AddCommand(generateCmd)
-	wD, err := os.Getwd()
-	if err != nil {
-		log.Errorf("error while getting the current directory [" + err.Error() + "]")
-		return
-	}
-	// set the project directory environment variable, if this is set, then the project will be generated in this folder
-	err = os.Setenv("COMPAGE_GENERATED_PROJECT_DIRECTORY", wD)
-	if err != nil {
-		log.Errorf("error while setting the project directory [" + err.Error() + "]")
-		return
-	}
 	// Here you will define your flags and configuration settings.
 
 	// Cobra supports Persistent Flags which will work for this command

internal/converter/converter.go

@@ -7,63 +7,12 @@ import (
 	"github.com/intelops/compage/internal/languages"
 	"github.com/intelops/compage/internal/languages/templates"
 	log "github.com/sirupsen/logrus"
-	"golang.org/x/exp/maps"
 )
 
-// GetNodes converts nodes map to string.
-func GetNodes(nodes interface{}) interface{} {
-	if nodes != nil {
-		nodesBytes, err := json.Marshal(maps.Values(nodes.(map[string]interface{})))
-		if err != nil {
-			log.Errorf("error marshalling nodes: %v", err)
-			return err
-		}
-		return string(nodesBytes)
-	}
-	return ""
-}
-
-// GetEdges converts an edge map to string.
-func GetEdges(edges interface{}) interface{} {
-	if edges != nil {
-		edgesBytes, err := json.Marshal(maps.Values(edges.(map[string]interface{})))
-		if err != nil {
-			log.Errorf("error marshalling edges: %v", err)
-			return err
-		}
-		return string(edgesBytes)
-	}
-	return ""
-}
-
-// ConvertMap converts compageJSON structure to {edges: [], nodes:[]}
-func ConvertMap(x map[string]interface{}) map[string]interface{} {
-	// convert key-value-based edges to edges Slice
-	if x["edges"] != nil {
-		x["edges"] = maps.Values(x["edges"].(map[string]interface{}))
-	}
-	// convert key-value-based nodes to nodes Slice
-	if x["nodes"] != nil {
-		x["nodes"] = maps.Values(x["nodes"].(map[string]interface{}))
-	}
-	return x
-}
-
 // GetCompageJSONForGRPC converts json string to CompageJSON struct
 func GetCompageJSONForGRPC(jsonString string) (*core.CompageJSON, error) {
-	x := map[string]interface{}{}
-	if err := json.Unmarshal([]byte(jsonString), &x); err != nil {
-		log.Errorf("error unmarshalling compageJSON: %v", err)
-		return nil, err
-	}
-	convertedX := ConvertMap(x)
-	convertedXBytes, err1 := json.Marshal(convertedX)
-	if err1 != nil {
-		log.Errorf("error marshalling compageJSON: %v", err1)
-		return nil, err1
-	}
 	compageJSON := &core.CompageJSON{}
-	if err2 := json.Unmarshal(convertedXBytes, compageJSON); err2 != nil {
+	if err2 := json.Unmarshal([]byte(jsonString), compageJSON); err2 != nil {
 		log.Errorf("error unmarshalling compageJSON: %v", err2)
 		return nil, err2
 	}