-
Notifications
You must be signed in to change notification settings - Fork 399
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore: cleanup, improve logging, do some renaming
Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
- Loading branch information
Showing
22 changed files
with
315 additions
and
324 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,108 +1,12 @@ | ||
| package packages | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "go/parser" | ||
| "go/token" | ||
| ) | ||
|
|
||
| type Loader interface { | ||
| // Load resolves package package paths and all their dependencies in the correct order. | ||
| Load(paths ...string) ([]Package, error) | ||
|
|
||
| // Resolve processes a single package path and returns the corresponding Package. | ||
| Resolve(path string) (*Package, error) | ||
| } | ||
|
|
||
| type BaseLoader struct { | ||
| Resolver | ||
| } | ||
|
|
||
| func NewLoader(res ...Resolver) *BaseLoader { | ||
| return &BaseLoader{ChainResolvers(res...)} | ||
| } | ||
|
|
||
| func (l BaseLoader) Load(paths ...string) ([]Package, error) { | ||
| fset := token.NewFileSet() | ||
| visited, stack := map[string]bool{}, map[string]bool{} | ||
| pkgs := make([]Package, 0) | ||
| for _, root := range paths { | ||
| deps, err := load(root, fset, l.Resolver, visited, stack) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| pkgs = append(pkgs, deps...) | ||
| } | ||
|
|
||
| return pkgs, nil | ||
| } | ||
|
|
||
| func (l BaseLoader) Resolve(path string) (*Package, error) { | ||
| fset := token.NewFileSet() | ||
| return l.Resolver.Resolve(fset, path) | ||
| } | ||
|
|
||
| func load(path string, fset *token.FileSet, resolver Resolver, visited, stack map[string]bool) ([]Package, error) { | ||
| if stack[path] { | ||
| return nil, fmt.Errorf("cycle detected: %s", path) | ||
| } | ||
| if visited[path] { | ||
| return nil, nil | ||
| } | ||
|
|
||
| visited[path] = true | ||
|
|
||
| mempkg, err := resolver.Resolve(fset, path) | ||
| if err != nil { | ||
| if errors.Is(err, ErrResolverPackageSkip) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| return nil, fmt.Errorf("unable to resolve package %q: %w", path, err) | ||
| } | ||
|
|
||
| var name string | ||
| imports := map[string]struct{}{} | ||
| for _, file := range mempkg.Files { | ||
| fname := file.Name | ||
| if !isGnoFile(fname) || isTestFile(fname) { | ||
| continue | ||
| } | ||
|
|
||
| f, err := parser.ParseFile(fset, fname, file.Body, parser.ImportsOnly) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to parse file %q: %w", file.Name, err) | ||
| } | ||
|
|
||
| if name != "" && name != f.Name.Name { | ||
| return nil, fmt.Errorf("conflict package name between %q and %q", name, f.Name.Name) | ||
| } | ||
|
|
||
| for _, imp := range f.Imports { | ||
| if len(imp.Path.Value) <= 2 { | ||
| continue | ||
| } | ||
|
|
||
| val := imp.Path.Value[1 : len(imp.Path.Value)-1] | ||
| imports[val] = struct{}{} | ||
| } | ||
|
|
||
| name = f.Name.Name | ||
| } | ||
|
|
||
| pkgs := []Package{} | ||
| for imp := range imports { | ||
| subDeps, err := load(imp, fset, resolver, visited, stack) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("importing %q: %w", imp, err) | ||
| } | ||
|
|
||
| pkgs = append(pkgs, subDeps...) | ||
| } | ||
| pkgs = append(pkgs, *mempkg) | ||
|
|
||
| stack[path] = false | ||
|
|
||
| return pkgs, nil | ||
| // Name of the loader | ||
| Name() string | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| package packages | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "go/parser" | ||
| "go/token" | ||
| ) | ||
|
|
||
| type BaseLoader struct { | ||
| Resolver | ||
| } | ||
|
|
||
| func NewLoader(res ...Resolver) *BaseLoader { | ||
| return &BaseLoader{ChainResolvers(res...)} | ||
| } | ||
|
|
||
| func (l BaseLoader) Name() string { | ||
| return l.Resolver.Name() | ||
| } | ||
|
|
||
| func (l BaseLoader) Load(paths ...string) ([]Package, error) { | ||
| fset := token.NewFileSet() | ||
| visited, stack := map[string]bool{}, map[string]bool{} | ||
| pkgs := make([]Package, 0) | ||
| for _, root := range paths { | ||
| deps, err := load(root, fset, l.Resolver, visited, stack) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| pkgs = append(pkgs, deps...) | ||
| } | ||
|
|
||
| return pkgs, nil | ||
| } | ||
|
|
||
| func (l BaseLoader) Resolve(path string) (*Package, error) { | ||
| fset := token.NewFileSet() | ||
| return l.Resolver.Resolve(fset, path) | ||
| } | ||
|
|
||
| func load(path string, fset *token.FileSet, resolver Resolver, visited, stack map[string]bool) ([]Package, error) { | ||
| if stack[path] { | ||
| return nil, fmt.Errorf("cycle detected: %s", path) | ||
| } | ||
| if visited[path] { | ||
| return nil, nil | ||
| } | ||
|
|
||
| visited[path] = true | ||
|
|
||
| mempkg, err := resolver.Resolve(fset, path) | ||
| if err != nil { | ||
| if errors.Is(err, ErrResolverPackageSkip) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| return nil, fmt.Errorf("unable to resolve package %q: %w", path, err) | ||
| } | ||
|
|
||
| var name string | ||
| imports := map[string]struct{}{} | ||
| for _, file := range mempkg.Files { | ||
| fname := file.Name | ||
| if !isGnoFile(fname) || isTestFile(fname) { | ||
| continue | ||
| } | ||
|
|
||
| f, err := parser.ParseFile(fset, fname, file.Body, parser.ImportsOnly) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("unable to parse file %q: %w", file.Name, err) | ||
| } | ||
|
|
||
| if name != "" && name != f.Name.Name { | ||
| return nil, fmt.Errorf("conflict package name between %q and %q", name, f.Name.Name) | ||
| } | ||
|
|
||
| for _, imp := range f.Imports { | ||
| if len(imp.Path.Value) <= 2 { | ||
| continue | ||
| } | ||
|
|
||
| val := imp.Path.Value[1 : len(imp.Path.Value)-1] | ||
| imports[val] = struct{}{} | ||
| } | ||
|
|
||
| name = f.Name.Name | ||
| } | ||
|
|
||
| pkgs := []Package{} | ||
| for imp := range imports { | ||
| subDeps, err := load(imp, fset, resolver, visited, stack) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("importing %q: %w", imp, err) | ||
| } | ||
|
|
||
| pkgs = append(pkgs, subDeps...) | ||
| } | ||
| pkgs = append(pkgs, *mempkg) | ||
|
|
||
| stack[path] = false | ||
|
|
||
| return pkgs, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.