Merge remote-tracking branch 'remotes/origin/master' into camel_case_functions

Conflicts:
	tests/basic_test.go

gen/generator.go

@@ -240,8 +240,13 @@ func (g *Generator) pkgAlias(pkgPath string) string {
 
 // getType return the textual type name of given type that can be used in generated code.
 func (g *Generator) getType(t reflect.Type) string {
-	if t.Kind() == reflect.Ptr {
+	switch t.Kind() {
+	case reflect.Ptr:
 		return "*" + g.getType(t.Elem())
+	case reflect.Slice:
+		return "[]" + g.getType(t.Elem())
+	case reflect.Map:
+		return "map[" + g.getType(t.Key()) + "]" + g.getType(t.Elem())
 	}
 
 	if t.Name() == "" || t.PkgPath() == "" {

tests/basic_test.go

@@ -31,6 +31,7 @@ var testCases = []struct {
 	{&unexportedStructValue, unexportedStructString},
 	{&excludedFieldValue, excludedFieldString},
 	{&mapsValue, mapsString},
+	{&deepNestValue, deepNestString},
 	{&camelCasesFunctionsValue, camelCasesFunctionsString},
 }
 

tests/data.go

@@ -436,6 +436,36 @@ var mapsString = `{` +
 	`"CustomMap":{"c":"d"}` +
 	`}`
 
+type DeepNest struct {
+	SliceMap map[Str][]Str
+	MapSlice []map[Str]Str
+}
+
+var deepNestValue = DeepNest{
+	SliceMap: map[Str][]Str{
+		"testSliceMap1": []Str{
+			"0",
+			"1",
+		},
+		"testSliceMap2": nil,
+	},
+	MapSlice: []map[Str]Str{
+		map[Str]Str{
+			"testMapSlice1": "someValue",
+		},
+	},
+}
+
+var deepNestString = `{` +
+	`"SliceMap":{` +
+	`"testSliceMap1":["0","1"],` +
+	`"testSliceMap2":[]` +
+	`},` +
+	`"MapSlice":[` +
+	`{"testMapSlice1":"someValue"}` +
+	`]` +
+	`}`
+
 type RequiredOptionalStruct struct {
 	FirstName string `json:"first_name,required"`
 	Lastname  string `json:"last_name"`