Skip to content

Add test for map key behaviour #80

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 4 commits into
base: master
Choose a base branch
from
Open

Add test for map key behaviour #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e3f0889
Add test demonstrating inconsistent map behaviour
dan1elhughes Feb 3, 2025
b3fb79e
use a class instead of interfaces
dan1elhughes Feb 3, 2025
ae2b6d6
Try using the mapped type returned from the array
dan1elhughes Feb 3, 2025
55861f2
Non-strict test
dan1elhughes Feb 3, 2025
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
13 changes: 7 additions & 6 deletions typescriptify/typescriptify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,12 +272,13 @@ func (t *typeScriptClassBuilder) AddMapField(fieldName string, field reflect.Str
}
strippedFieldName := strings.ReplaceAll(fieldName, "?", "")

keyTypeStr := keyType.Name()
// Key should always be string, no need for this:
// _, isSimple := t.types[keyType.Kind()]
// if !isSimple {
// keyTypeStr = t.prefix + keyType.Name() + t.suffix
// }
var keyTypeStr string
mappedType, isSimple := t.types[keyType.Kind()]
if !isSimple {
keyTypeStr = t.prefix + keyType.Name() + t.suffix
} else {
keyTypeStr = t.prefix + mappedType + t.suffix
}

if valueType.Kind() == reflect.Struct {
t.fields = append(t.fields, fmt.Sprintf("%s%s: {[key: %s]: %s};", t.indent, fieldName, keyTypeStr, t.prefix+valueTypeName))
Expand Down
24 changes: 24 additions & 0 deletions typescriptify/typescriptify_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,3 +1076,27 @@ func TestTypescriptifyCustomJsonTag(t *testing.T) {
}`
testConverter(t, converter, false, desiredResult, nil)
}

func TestTypescriptifyCustomTypeInMap(t *testing.T) {
converter := New()
converter.CreateConstructor = false

type Foo uint
converter.ManageType(reflect.TypeOf(Foo(0)), TypeOptions{TSType: "number"})

type Bar struct {
Foo Foo `json:"foo"`
FooInKey map[Foo]bool `json:"fooInKey"`
FooInValue map[string]Foo `json:"fooInValue"`
}

converter.AddType(reflect.TypeOf(Bar{}))

desiredResult := `export class Bar {
foo: number;
fooInKey: {[key: number]: boolean};
fooInValue: {[key: string]: number};
}`

testConverter(t, converter, false, desiredResult, nil)
}
Loading