Skip to content

export interfaces inline #16

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

Merged
merged 1 commit into from
Jun 8, 2019
Merged

export interfaces inline #16

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
14 changes: 11 additions & 3 deletions s2ts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ func (s *StructToTS) RenderTo(w io.Writer) (err error) {
io.WriteString(w, "\n")
}

io.WriteString(w, "// classes\n")
io.WriteString(w, "// structs\n")
for _, st := range s.structs {
if err = st.RenderTo(s.opts, buf); err != nil {
return
Expand All @@ -186,6 +186,11 @@ func (s *StructToTS) RenderTo(w io.Writer) (err error) {
}

func (s *StructToTS) RenderExports(w io.Writer) (err error) {
if s.opts.InterfaceOnly && s.opts.NoHelpers {
// nothing else to export
return nil
}

io.WriteString(w, "// exports\n")

export := func(n string) { _, err = fmt.Fprintf(w, "%s%s,\n", s.opts.indents[1], n) }
Expand All @@ -196,8 +201,11 @@ func (s *StructToTS) RenderExports(w io.Writer) (err error) {
io.WriteString(w, "export {\n")
}

for _, st := range s.structs {
export(st.Name)
// interfaces are exported inline!
if !s.opts.InterfaceOnly {
for _, st := range s.structs {
export(st.Name)
}
}

if !s.opts.NoHelpers {
Expand Down
3 changes: 3 additions & 0 deletions struct.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ func (s *Struct) RenderTo(opts *Options, w io.Writer) (err error) {
if opts.ES6 { // no interfaces in js
return
}
if !opts.NoExports {
fmt.Fprintf(w, "export ")
}
_, err = fmt.Fprintf(w, "interface %s {\n", s.Name)
} else {
_, err = fmt.Fprintf(w, "class %s {\n", s.Name)
Expand Down