golang/ent
1
0
Fork 0
mirror of https://github.com/ent/ent.git synced 2026-05-22 09:31:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

cmd/internal/base: add name conflict check for init command (#1110)

Browse Source 
* adds checks for name conflicts
also tidies up error handling inside init

* fix failing test, check for lower name for golang idents

* update function name and prefer builtin function

* pkg instead of lowerName
This commit is contained in:
Nathaniel Peiffer
2021-01-03 07:25:39 +11:00
committed by GitHub
parent 56b3db8448
commit cfefd26543
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/internal/base/base.go
View File

@@ -83,7 +83,7 @@ func InitCmd() *cobra.Command {
},
Run: func(cmd *cobra.Command, names []string) {
if err := initEnv(target, names); err != nil {
log.Fatalln(err)
log.Fatalln(fmt.Errorf("ent/init: %w", err))
}
},
}
@@ -179,16 +179,19 @@ func GenerateCmd(postRun ...func(*gen.Config)) *cobra.Command {
// initEnv initialize an environment for ent codegen.
func initEnv(target string, names []string) error {
if err := createDir(target); err != nil {
return err
return fmt.Errorf("create dir %s: %w", target, err)
}
for _, name := range names {
if err := gen.ValidSchemaName(name); err != nil {
return fmt.Errorf("init schema %s: %w", name, err)
}
b := bytes.NewBuffer(nil)
if err := tmpl.Execute(b, name); err != nil {
log.Fatalln(err)
return fmt.Errorf("executing template %s: %w", name, err)
}
target := filepath.Join(target, strings.ToLower(name+".go"))
if err := ioutil.WriteFile(target, b.Bytes(), 0644); err != nil {
log.Fatalln(err)
newFileTarget := filepath.Join(target, strings.ToLower(name+".go"))
if err := ioutil.WriteFile(newFileTarget, b.Bytes(), 0644); err != nil {
return fmt.Errorf("writing file %s: %w", newFileTarget, err)
}
}
return nil