diff --git a/entc/gen/template/builder/delete.tmpl b/entc/gen/template/builder/delete.tmpl index 5802ca0f5..653f7ccc0 100644 --- a/entc/gen/template/builder/delete.tmpl +++ b/entc/gen/template/builder/delete.tmpl @@ -14,7 +14,7 @@ in the LICENSE file in the root directory of this source tree. {{ template "import" $ }} import ( - {{ $.Alias }} "{{ $.Config.Package }}/{{ $.PackageDir }}" + {{ $.PackageAlias }} "{{ $.Config.Package }}/{{ $.PackageDir }}" ) {{ $builder := $.DeleteName }} diff --git a/entc/gen/template/builder/mutation.tmpl b/entc/gen/template/builder/mutation.tmpl index 871cbe72d..9f719b9a3 100644 --- a/entc/gen/template/builder/mutation.tmpl +++ b/entc/gen/template/builder/mutation.tmpl @@ -17,7 +17,7 @@ import ( "sync" {{- range $n := $.Nodes }} - {{ $n.Alias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" + {{ $n.PackageAlias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" {{- template "import/types" $n }} {{- end }} diff --git a/entc/gen/template/client.tmpl b/entc/gen/template/client.tmpl index 1e4afe555..ebcf907c6 100644 --- a/entc/gen/template/client.tmpl +++ b/entc/gen/template/client.tmpl @@ -16,7 +16,7 @@ import ( "{{ $.Config.Package }}/migrate" {{ range $n := $.Nodes }} - {{ $n.Alias }} "{{ $n.Config.Package }}/{{ $n.PackageDir }}" + {{ $n.PackageAlias }} "{{ $n.Config.Package }}/{{ $n.PackageDir }}" {{- end }} "entgo.io/ent/dialect" diff --git a/entc/gen/template/dialect/sql/entql.tmpl b/entc/gen/template/dialect/sql/entql.tmpl index e972e43d4..8690f5c44 100644 --- a/entc/gen/template/dialect/sql/entql.tmpl +++ b/entc/gen/template/dialect/sql/entql.tmpl @@ -14,7 +14,7 @@ in the LICENSE file in the root directory of this source tree. import ( "{{ $.Config.Package }}/predicate" {{- range $n := $.Nodes }} - {{ $n.Alias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" + {{ $n.PackageAlias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" {{- end }} "entgo.io/ent/dialect/sql" diff --git a/entc/gen/template/migrate/schema.tmpl b/entc/gen/template/migrate/schema.tmpl index 5e9dab604..9bd7464b3 100644 --- a/entc/gen/template/migrate/schema.tmpl +++ b/entc/gen/template/migrate/schema.tmpl @@ -14,7 +14,7 @@ in the LICENSE file in the root directory of this source tree. import ( {{ range $n := $.Nodes }} - {{ $n.Alias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" + {{ $n.PackageAlias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" {{- end }} "entgo.io/ent/dialect/entsql" diff --git a/entc/gen/template/runtime.tmpl b/entc/gen/template/runtime.tmpl index c6c3dfe20..2fc52d2a2 100644 --- a/entc/gen/template/runtime.tmpl +++ b/entc/gen/template/runtime.tmpl @@ -72,7 +72,7 @@ import ( "{{ . }}" {{- end }} {{- range $n := $.Nodes }} - {{ $n.Alias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" + {{ $n.PackageAlias }} "{{ $.Config.Package }}/{{ $n.PackageDir }}" {{- /* Import external packages */}} {{- template "import/types" $n }} {{- end }} diff --git a/entc/gen/type.go b/entc/gen/type.go index a321ad0ee..5f07226b5 100644 --- a/entc/gen/type.go +++ b/entc/gen/type.go @@ -272,7 +272,7 @@ func (t Type) EntSQL() *entsql.Annotation { // Package returns the package name of this node. func (t Type) Package() string { - if name := t.Alias(); name != "" { + if name := t.PackageAlias(); name != "" { return name } return t.PackageDir() @@ -281,10 +281,10 @@ func (t Type) Package() string { // PackageDir returns the name of the package directory. func (t Type) PackageDir() string { return strings.ToLower(t.Name) } -// Alias returns local package name of a type if there is one. +// PackageAlias returns local package name of a type if there is one. // A package has an alias if its generated name conflicts with // one of the imports of the user-defined types. -func (t Type) Alias() string { return t.alias } +func (t Type) PackageAlias() string { return t.alias } // Receiver returns the receiver name of this node. It makes sure the // receiver names doesn't conflict with import names. @@ -757,14 +757,14 @@ func (t Type) MutationName() string { // SiblingImports returns all sibling packages that are needed for the different builders. func (t Type) SiblingImports() []struct{ Alias, Path string } { var ( - imports = []struct{ Alias, Path string }{{Alias: t.Alias(), Path: path.Join(t.Config.Package, t.PackageDir())}} + imports = []struct{ Alias, Path string }{{Alias: t.PackageAlias(), Path: path.Join(t.Config.Package, t.PackageDir())}} seen = map[string]bool{imports[0].Path: true} ) for _, e := range t.Edges { p := path.Join(t.Config.Package, e.Type.PackageDir()) if !seen[p] { seen[p] = true - imports = append(imports, struct{ Alias, Path string }{Alias: e.Type.Alias(), Path: p}) + imports = append(imports, struct{ Alias, Path string }{Alias: e.Type.PackageAlias(), Path: p}) } } return imports