cover some more type declarations

Author: Emyrk

bindings/declarations.go

@@ -105,6 +105,7 @@ type VariableStatement struct {
 	Modifiers    []Modifier
 	Declarations *VariableDeclarationList
 	Source
+	SupportComments
 }
 
 func (*VariableStatement) isNode()            {}

comments.go

@@ -58,16 +58,19 @@ func CommentForObject(obj types.Object, pkg *packages.Package) []bindings.Synthe
 					if !covers(sp, pos) {
 						continue
 					}
+
+					// nd.Doc are the comments for the entire type/const/var block.
+					if nd.Doc != nil {
+						found = append(found, syntheticComments(true, nd.Doc)...)
+					}
+
 					switch spec := sp.(type) {
 					case *ast.ValueSpec:
 						// const/var
 						for _, name := range spec.Names {
 							if name.Pos() == pos {
-								if spec.Doc != nil {
-									found = syntheticComments(true, nd.Doc)
-								} else {
-									found = syntheticComments(true, spec.Doc)
-								}
+								found = append(found, syntheticComments(true, spec.Doc)...)
+								found = append(found, syntheticComments(false, spec.Comment)...)
 								return false
 							}
 						}
@@ -76,11 +79,8 @@ func CommentForObject(obj types.Object, pkg *packages.Package) []bindings.Synthe
 						// type declarations (struct/interface/alias)
 						if spec.Name != nil && spec.Name.Pos() == pos {
 							// comment on the type itself
-							if spec.Doc != nil {
-								found = syntheticComments(true, spec.Doc)
-							} else {
-								found = syntheticComments(true, nd.Doc)
-							}
+							found = append(found, syntheticComments(true, spec.Doc)...)
+							found = append(found, syntheticComments(false, spec.Comment)...)
 							return false
 						}
 

convert.go

@@ -488,14 +488,21 @@ func (ts *Typescript) parse(obj types.Object) error {
 				return xerrors.Errorf("(map) generate %q: %w", objectIdentifier.Ref(), err)
 			}
 
+			aliasNode := &bindings.Alias{
+				Name:       objectIdentifier,
+				Modifiers:  []bindings.Modifier{},
+				Type:       ty.Value,
+				Parameters: ty.TypeParameters,
+				Source:     ts.location(obj),
+			}
+
+			if ts.preserveComments {
+				cmts := ts.parsed.CommentForObject(obj)
+				aliasNode.AppendComments(cmts)
+			}
+
 			return ts.setNode(objectIdentifier.Ref(), typescriptNode{
-				Node: &bindings.Alias{
-					Name:       objectIdentifier,
-					Modifiers:  []bindings.Modifier{},
-					Type:       ty.Value,
-					Parameters: ty.TypeParameters,
-					Source:     ts.location(obj),
-				},
+				Node: aliasNode,
 			})
 		case *types.Interface:
 			// Interfaces are used as generics. Non-generic interfaces are
@@ -576,6 +583,12 @@ func (ts *Typescript) parse(obj types.Object) error {
 					if err != nil {
 						return xerrors.Errorf("basic const %q: %w", objectIdentifier.Ref(), err)
 					}
+
+					if ts.preserveComments {
+						cmts := ts.parsed.CommentForObject(obj)
+						cnst.AppendComments(cmts)
+					}
+
 					return ts.setNode(objectIdentifier.Ref(), typescriptNode{
 						Node: cnst,
 					})

testdata/comments/comments.go

@@ -40,5 +40,4 @@ type BlockComment struct {
 }
 
 // Constant is just a value
-// Constants are not yet supported for comments
-const Constant = "value" // Constant comment
+const Constant = "value" // An inline note

testdata/comments/comments.ts

@@ -29,7 +29,9 @@ export interface CommentedStructure {
 }
 
 // From comments/comments.go
-export const Constant = "value";
+// Constant is just a value
+export const Constant = "value"; // An inline note
+
 
 // From comments/comments.go
 export interface InheritedCommentedStructure extends CommentedStructure {

testdata/enums/enums.go

@@ -3,7 +3,9 @@ package enums
 import "time"
 
 type (
-	EnumString    string
+	// EnumString is a string-based enum
+	EnumString string
+	// EnumSliceType is a slice of string-based enums
 	EnumSliceType []EnumString
 
 	EnumInt int
@@ -12,6 +14,7 @@ type (
 )
 
 const (
+	// EnumFoo is the "foo" value
 	EnumFoo EnumString = "foo"
 	EnumBar EnumString = "bar"
 	EnumBaz EnumString = "baz"

testdata/enums/enums.ts

@@ -14,6 +14,7 @@ export enum EnumInt {
 }
 
 // From enums/enums.go
+// EnumSliceType is a slice of string-based enums
 export type EnumSliceType = readonly EnumString[];
 
 // From enums/enums.go