Skip to content

Commit

Permalink
fix: Packages -> PackageNames
Browse files Browse the repository at this point in the history
  • Loading branch information
aereal committed Apr 6, 2022
1 parent e41ff92 commit 931b45c
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 17 deletions.
10 changes: 5 additions & 5 deletions onion.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ func (p Package) Key() string { return string(p) }

// Layer is a named set of packages.
type Layer struct {
Name string
Packages *OrderedSet[Package]
Name string
PackageNames *OrderedSet[Package]
}

func (l *Layer) Key() string {
Expand All @@ -30,7 +30,7 @@ func (l *Layer) Key() string {

func (l *Layer) GoString() string {
b := new(strings.Builder)
fmt.Fprintf(b, "Layer( %q %#v )", l.Name, l.Packages)
fmt.Fprintf(b, "Layer( %q %#v )", l.Name, l.PackageNames)
return b.String()
}

Expand Down Expand Up @@ -87,7 +87,7 @@ func (s *LayersSet) toSet() *OrderedSet[*Layer] {

func (s *LayersSet) findByPackagePath(pkgPath string) *Layer {
for _, layer := range s.toSet().items() {
if layer.Packages.contains(Package(pkgPath)) {
if layer.PackageNames.contains(Package(pkgPath)) {
return layer
}
}
Expand All @@ -103,7 +103,7 @@ func layersForPackages(layers *OrderedSet[*Layer], pkg Package) *OrderedSet[*Lay
x := initOrderedSet[*Layer]()
for _, layer := range layers.items() {
layer := layer
if layer.Packages.contains(pkg) {
if layer.PackageNames.contains(pkg) {
x.add(layer)
}
}
Expand Down
18 changes: 9 additions & 9 deletions onion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
func TestConfig_CanDepend(t *testing.T) {
cfg := &onion.Config{
Layers: onion.NewLayersSet(
&onion.Layer{Name: "a", Packages: onion.NewPackagesSet("pkg/1", "pkg/2")},
&onion.Layer{Name: "b", Packages: onion.NewPackagesSet("pkg/3", "pkg/4")},
&onion.Layer{Name: "c", Packages: onion.NewPackagesSet("pkg/5", "pkg/6")},
&onion.Layer{Name: "a", PackageNames: onion.NewPackagesSet("pkg/1", "pkg/2")},
&onion.Layer{Name: "b", PackageNames: onion.NewPackagesSet("pkg/3", "pkg/4")},
&onion.Layer{Name: "c", PackageNames: onion.NewPackagesSet("pkg/5", "pkg/6")},
),
Rules: []*onion.Rule{
{Layer: "a", Allowed: []string{"b"}},
Expand Down Expand Up @@ -89,16 +89,16 @@ func TestConfig_Marshaling(t *testing.T) {
},
Layers: onion.NewLayersSet(
&onion.Layer{
Name: "App",
Packages: onion.NewPackagesSet("github.com/aereal/a"),
Name: "App",
PackageNames: onion.NewPackagesSet("github.com/aereal/a"),
},
&onion.Layer{
Name: "Errors",
Packages: onion.NewPackagesSet("errors"),
Name: "Errors",
PackageNames: onion.NewPackagesSet("errors"),
},
&onion.Layer{
Name: "Print",
Packages: onion.NewPackagesSet("fmt", "log"),
Name: "Print",
PackageNames: onion.NewPackagesSet("fmt", "log"),
},
),
}
Expand Down
6 changes: 3 additions & 3 deletions testdata/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"Layers": [
{
"Name": "App",
"Packages": [
"PackageNames": [
"github.com/aereal/a"
]
},
{
"Name": "Errors",
"Packages": [
"PackageNames": [
"errors"
]
},
{
"Name": "Print",
"Packages": [
"PackageNames": [
"fmt",
"log"
]
Expand Down

0 comments on commit 931b45c

Please sign in to comment.