Skip to content

feat: Switch packages for typescript generation code #1196

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 18 commits into from
Apr 28, 2022
Merged

feat: Switch packages for typescript generation code #1196

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
ee71acd
feat: Switch packages for typescript generation code
Emyrk Apr 27, 2022
b0b17d0
Add enum functionality
Emyrk Apr 28, 2022
28c2811
Handle reused types
Emyrk Apr 28, 2022
710b427
Add comment
Emyrk Apr 28, 2022
071026d
Allow ignoring types for autogen
Emyrk Apr 28, 2022
2741efa
Fix ignore, add optional fields
Emyrk Apr 28, 2022
c62feeb
Add map support
Emyrk Apr 28, 2022
462ebeb
Handle unknown types better
Emyrk Apr 28, 2022
21d1687
Add comments, run gen
Emyrk Apr 28, 2022
9a3d7e3
Add basic readme
Emyrk Apr 28, 2022
1afaa5d
Merge remote-tracking branch 'origin/main' into stevenmasley/redo_typ…
Emyrk Apr 28, 2022
7cfba41
Reorder imports
Emyrk Apr 28, 2022
0127e6d
Sort all output
Emyrk Apr 28, 2022
0d943f1
Add 'DO NOT EDIT' to the top
Emyrk Apr 28, 2022
2379c21
Go linting
Emyrk Apr 28, 2022
3865f36
Fix typescript linter
Emyrk Apr 28, 2022
176b481
Use correct array size for allocation
Emyrk Apr 28, 2022
0d37eeb
Update readme
Emyrk Apr 28, 2022
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
Prev Previous commit
Next Next commit
Allow ignoring types for autogen
  • Loading branch information
@Emyrk
Emyrk committed Apr 28, 2022
commit 071026deca83f558f9c5be3c70f90cda0105aa82
1 change: 1 addition & 0 deletions codersdk/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func New(serverURL *url.URL) *Client {
}

// Client is an HTTP caller for methods to the Coder API.
// @typescript-ignore Client
type Client struct {
HTTPClient *http.Client
SessionToken string
Expand Down
40 changes: 35 additions & 5 deletions scripts/apitypings/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"os"
"path/filepath"
"reflect"
"regexp"
"strings"

"cdr.dev/slog/sloggers/sloghuman"
Expand Down Expand Up @@ -43,13 +44,26 @@ type TypescriptTypes struct {
// String just combines all the codeblocks. I store them in a map for unit testing purposes
func (t TypescriptTypes) String() string {
var s strings.Builder
for _, v := range t.Types {
sortedTypes := make([]string, 0, len(t.Types))
sortedEnums := make([]string, 0, len(t.Types))

for k := range t.Types {
sortedTypes = append(sortedTypes, k)
}
for k := range t.Enums {
sortedEnums = append(sortedEnums, k)
}

for _, k := range sortedTypes {
v := t.Types[k]
s.WriteString(v)
s.WriteRune('\n')
}

for _, v := range t.Enums {
for _, k := range sortedEnums {
v := t.Enums[k]
s.WriteString(v)
s.WriteRune('\n')
}
return s.String()
}
Expand Down Expand Up @@ -104,22 +118,38 @@ func (g *Generator) parsePackage(ctx context.Context, patterns ...string) error
return nil
}

type Generated struct {
}

// generateAll will generate for all types found in the pkg
func (g *Generator) generateAll() (*TypescriptTypes, error) {
structs := make(map[string]string)
enums := make(map[string]types.Object)
constants := make(map[string][]*types.Const)

ignoredTypes := make(map[string]struct{})
ignoreRegex := regexp.MustCompile("@typescript-ignore:(?P<ignored_types>)")
for _, file := range g.pkg.Syntax {
for _, comment := range file.Comments {
matches := ignoreRegex.FindStringSubmatch(comment.Text())
ignored := ignoreRegex.SubexpIndex("ignored_types")
if len(matches) >= ignored && matches[ignored] != "" {
arr := strings.Split(matches[ignored], ",")
for _, s := range arr {
ignoredTypes[strings.TrimSpace(s)] = struct{}{}
}
}
}
}

for _, n := range g.pkg.Types.Scope().Names() {
obj := g.pkg.Types.Scope().Lookup(n)
if obj == nil || obj.Type() == nil {
// This would be weird, but it is if the package does not have the type def.
continue
}

if _, ok := ignoredTypes[obj.Name()]; ok {
continue
}

switch obj.(type) {
// All named types are type declarations
case *types.TypeName:
Expand Down