Skip to content
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

Jump to bottom

Revert "fix: stop loading package dependencies (#2988)" #3182

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+26 −2
Open

Revert "fix: stop loading package dependencies (#2988)" #3182

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
20 changes: 18 additions & 2 deletions internal/code/packages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,12 @@ var (

var mode = packages.NeedName |
packages.NeedFiles |
packages.NeedImports |
packages.NeedTypes |
packages.NeedSyntax |
packages.NeedTypesInfo |
packages.NeedModule
packages.NeedModule |
packages.NeedDeps

type (
// Packages is a wrapper around x/tools/go/packages that maintains a (hopefully prewarmed) cache of packages
Expand Down Expand Up @@ -133,6 +135,11 @@ func (p *Packages) LoadAll(importPaths ...string) []*packages.Package {
func (p *Packages) addToCache(pkg *packages.Package) {
imp := NormalizeVendor(pkg.PkgPath)
p.packages[imp] = pkg
for _, imp := range pkg.Imports {
if _, found := p.packages[NormalizeVendor(imp.PkgPath)]; !found {
p.addToCache(imp)
}
}
}

// Load works the same as LoadAll, except a single package at a time.
Expand Down Expand Up @@ -213,9 +220,18 @@ func (p *Packages) NameForPackage(importPath string) string {
return pkg.Name
}

// Evict removes a given package import path from the cache. Further calls to Load will fetch it from disk.
// Evict removes a given package import path from the cache, along with any packages that depend on it. Further calls
// to Load will fetch it from disk.
func (p *Packages) Evict(importPath string) {
delete(p.packages, importPath)

for _, pkg := range p.packages {
for _, imported := range pkg.Imports {
if imported.PkgPath == importPath {
p.Evict(pkg.PkgPath)
}
}
}
}

func (p *Packages) ModTidy() error {
Expand Down
8 changes: 8 additions & 0 deletions internal/code/packages_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ func TestPackages(t *testing.T) {
require.Equal(t, 2, p.numLoadCalls)
})

t.Run("evicting a package also evicts its dependencies", func(t *testing.T) {
p := initialState(t)
p.Evict("github.com/99designs/gqlgen/internal/code/testdata/a")
require.Equal(t, "a", p.Load("github.com/99designs/gqlgen/internal/code/testdata/a").Name)
require.Equal(t, 2, p.numLoadCalls)
require.Equal(t, "b", p.Load("github.com/99designs/gqlgen/internal/code/testdata/b").Name)
require.Equal(t, 3, p.numLoadCalls)
})
t.Run("able to load private package with build tags", func(t *testing.T) {
p := initialState(t, WithBuildTags("private"))
p.Evict("github.com/99designs/gqlgen/internal/code/testdata/a")
Expand Down
Loading