Skip to content

Fix missing prefix on map types where value is an array of structs #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix missing prefix on map types where value is an array of structs #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions typescriptify/typescriptify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,8 @@ func (t *typeScriptClassBuilder) AddMapField(fieldName string, field reflect.Str
if name, ok := t.types[valueType.Kind()]; ok {
valueTypeName = name
}
if valueType.Kind() == reflect.Array || valueType.Kind() == reflect.Slice {
isArray := valueType.Kind() == reflect.Array || valueType.Kind() == reflect.Slice
if isArray {
valueTypeName = valueType.Elem().Name() + "[]"
}
if valueType.Kind() == reflect.Ptr {
Expand All @@ -277,7 +278,7 @@ func (t *typeScriptClassBuilder) AddMapField(fieldName string, field reflect.Str
// keyTypeStr = t.prefix + keyType.Name() + t.suffix
// }

if valueType.Kind() == reflect.Struct {
if valueType.Kind() == reflect.Struct || (isArray && valueType.Elem().Kind() == reflect.Struct) {
t.fields = append(t.fields, fmt.Sprintf("%s%s: {[key: %s]: %s};", t.indent, fieldName, keyTypeStr, t.prefix+valueTypeName))
t.constructorBody = append(t.constructorBody, fmt.Sprintf("%s%sthis.%s = this.convertValues(source[\"%s\"], %s, true);", t.indent, t.indent, strippedFieldName, strippedFieldName, t.prefix+valueTypeName+t.suffix))
} else {
Expand Down
29 changes: 29 additions & 0 deletions typescriptify/typescriptify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,3 +1034,32 @@ func TestTypescriptifyCustomJsonTag(t *testing.T) {
}`
testConverter(t, converter, false, desiredResult, nil)
}

type MapArrayValue struct {
Name string `json:"name"`
}
type StructWithEnumMapArrayStruct struct {
Value string `json:"value"`
Values map[string][]MapArrayValue `json:"values"`
}

func TestTypescriptifyWithStructWithEnumMapArrayStruct(t *testing.T) {
t.Parallel()
converter := New()
converter.Prefix = "test_"

converter.AddType(reflect.TypeOf(StructWithEnumMapArrayStruct{}))
converter.AddType(reflect.TypeOf(MapArrayValue{}))
converter.CreateInterface = true
converter.CreateConstructor = false
converter.BackupDir = ""

desiredResult := `export interface test_StructWithEnumMapArrayStruct {
value: string;
values: {[key: string]: test_MapArrayValue[]};
}
export interface test_MapArrayValue {
name: string;
}`
testConverter(t, converter, false, desiredResult, nil)
}