gracefull shutdown for unresolvable errors

This commit is contained in:
2025-03-07 21:40:53 +07:00
parent 2fd8b20b77
commit e6f21d1bb2
19 changed files with 181 additions and 133 deletions

1
.gitignore vendored
View File

@@ -3,3 +3,4 @@ main.exe
frontend frontend
task.py task.py
example example
nto_cli

8
.idea/.gitignore generated vendored Normal file
View File

@@ -0,0 +1,8 @@
# Default ignored files
/shelf/
/workspace.xml
# Editor-based HTTP Client requests
/httpRequests/
# Datasource local storage ignored files
/dataSources/
/dataSources.local.xml

8
.idea/modules.xml generated Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/nto-cli.iml" filepath="$PROJECT_DIR$/.idea/nto-cli.iml" />
</modules>
</component>
</project>

9
.idea/nto-cli.iml generated Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="Go" enabled="true" />
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

View File

@@ -2,6 +2,7 @@ package cmd
import ( import (
"fmt" "fmt"
"log"
"nto_cli/utils" "nto_cli/utils"
"os" "os"
@@ -16,16 +17,20 @@ func Input() (string, string) {
} }
func SelectionInput() ([]string, string) { func SelectionInput() ([]string, string) {
if len(os.Args) == 1 {
log.Fatalf("Please provide path to models.go")
}
path := os.Args[1] path := os.Args[1]
structNames := utils.GetStructList(path) structNames := utils.GetStructList(path)
result := []string{} var result []string
app := tview.NewApplication() app := tview.NewApplication()
form := tview.NewForm() form := tview.NewForm()
checkboxes := []*tview.Checkbox{} var checkboxes []*tview.Checkbox
for _, name := range structNames { for _, name := range structNames {
cb := tview.NewCheckbox().SetLabel(name) cb := tview.NewCheckbox().SetLabel(name)

View File

@@ -9,7 +9,7 @@ import (
type Field struct { type Field struct {
Name string Name string
Type string Type string
Medatada []Medatada Medatada []Metadata
} }
var PRIMITIVE_TYPES = map[string]string{ var PRIMITIVE_TYPES = map[string]string{

View File

@@ -4,12 +4,12 @@ import (
"strings" "strings"
) )
type Medatada struct { type Metadata struct {
Name string Name string
Values []string Values []string
} }
func NewMetadata(tag string) *Medatada { func NewMetadata(tag string) *Metadata {
tag = strings.TrimSpace(tag) tag = strings.TrimSpace(tag)
tagName := "" tagName := ""
var values []string var values []string
@@ -26,7 +26,7 @@ func NewMetadata(tag string) *Medatada {
} else { } else {
tagName = tag tagName = tag
} }
return &Medatada{ return &Metadata{
Name: strings.TrimSpace(strings.ToLower(tagName)), Name: strings.TrimSpace(strings.ToLower(tagName)),
Values: values, Values: values,
} }

View File

@@ -2,6 +2,7 @@ package generation
import ( import (
"fmt" "fmt"
"log"
"nto_cli/entities" "nto_cli/entities"
"nto_cli/utils" "nto_cli/utils"
"os" "os"
@@ -11,7 +12,7 @@ import (
func Generate(structName string, fields []entities.Field) { func Generate(structName string, fields []entities.Field) {
mkPath := fmt.Sprintf("%s/frontend/src/%s", utils.FindFrontendPath(), strings.ToLower(structName)) mkPath := fmt.Sprintf("%s/frontend/src/%s", utils.FindFrontendPath(), strings.ToLower(structName))
if err := os.Mkdir(mkPath, 0755); err != nil { if err := os.Mkdir(mkPath, 0755); err != nil {
panic(err) log.Fatalf("Failed to mkdir for model: %s", err)
} }
GenerateService(structName, mkPath) GenerateService(structName, mkPath)
GenerateScheme(structName, fields, mkPath) GenerateScheme(structName, fields, mkPath)

View File

@@ -2,6 +2,7 @@ package generation
import ( import (
"fmt" "fmt"
"log"
"nto_cli/entities" "nto_cli/entities"
"nto_cli/utils" "nto_cli/utils"
"os" "os"
@@ -10,10 +11,11 @@ import (
func GenerateScheme(structName string, fields []entities.Field, mkPath string) { func GenerateScheme(structName string, fields []entities.Field, mkPath string) {
schemeFile, err := os.Create(mkPath + "/" + strings.ToUpper(structName[:1]) + strings.ToLower(structName[1:]) + "Scheme.vue") schemeFile, err := os.Create(mkPath + "/" + strings.ToUpper(structName[:1]) + strings.ToLower(structName[1:]) + "Scheme.vue")
if err != nil {
panic(err)
}
defer schemeFile.Close() defer schemeFile.Close()
if err != nil {
log.Fatalf("Failed to create file: %s", err)
}
_, err = schemeFile.WriteString(fmt.Sprintf( _, err = schemeFile.WriteString(fmt.Sprintf(
`<script setup lang="ts"> `<script setup lang="ts">
import Table from '../table/Table.vue' import Table from '../table/Table.vue'
@@ -40,7 +42,7 @@ const getDefaults = () => getDefaultValues(scheme)
</template> </template>
`, strings.ToLower(structName), structName, utils.GetServiceStructType(structName), LoadDependencies(fields), structName, GenerateFields(fields))) `, strings.ToLower(structName), structName, utils.GetServiceStructType(structName), LoadDependencies(fields), structName, GenerateFields(fields)))
if err != nil { if err != nil {
panic(err) log.Fatalf("Failed to write to file: %s", err)
} }
} }
@@ -59,7 +61,7 @@ func LoadDependencies(fields []entities.Field) string {
} }
result := "" result := ""
dependencies := []Dependency{} var dependencies []Dependency
for _, field := range fields { for _, field := range fields {
for _, meta := range field.Medatada { for _, meta := range field.Medatada {
if meta.Name == "data" { if meta.Name == "data" {

View File

@@ -7,8 +7,6 @@ import (
"strings" "strings"
) )
func GenerateService(structName, mkPath string) { func GenerateService(structName, mkPath string) {
serviceFile, err := os.Create(mkPath + "/" + strings.ToLower(structName) + ".service.ts") serviceFile, err := os.Create(mkPath + "/" + strings.ToLower(structName) + ".service.ts")
if err != nil { if err != nil {
@@ -26,7 +24,7 @@ export default class %sService implements IService<%s> {
} }
async readAll() { async readAll() {
return await GetAll() return await GetAll() as %s
} }
async create(item: %s) { async create(item: %s) {

2
go.mod
View File

@@ -1,6 +1,6 @@
module nto_cli module nto_cli
go 1.23.6 go 1.22.12
require ( require (
github.com/fatih/structtag v1.2.0 // indirect github.com/fatih/structtag v1.2.0 // indirect

View File

@@ -1,6 +1,7 @@
package main package main
import ( import (
"log"
"nto_cli/cmd" "nto_cli/cmd"
"nto_cli/generation" "nto_cli/generation"
"nto_cli/utils" "nto_cli/utils"
@@ -8,13 +9,13 @@ import (
) )
func main() { func main() {
log.SetFlags(0)
structNames, path := cmd.SelectionInput() structNames, path := cmd.SelectionInput()
for _, structName := range structNames { for _, structName := range structNames {
file, err := os.Open(path) file, err := os.Open(path)
defer file.Close()
if err != nil { if err != nil {
panic(err) log.Fatalf("Failed to open file: %s", err)
} }
structFields := utils.GetStructFields(file, structName) structFields := utils.GetStructFields(file, structName)
generation.Generate(structName, structFields) generation.Generate(structName, structFields)

BIN
nto_cli Executable file

Binary file not shown.

View File

@@ -2,14 +2,14 @@ package utils
import "strings" import "strings"
func ContainsMany(str string, substrs... string) bool { func ContainsMany(str string, substrings ...string) bool {
count := 0 var matches int
for _, substr := range substrs { for _, substr := range substrings {
if strings.Contains(str, substr) { if strings.Contains(str, substr) {
count++; matches++
} else { } else {
return false; return false
} }
} }
return count == len(substrs) return matches == len(substrings)
} }

View File

@@ -1,7 +1,7 @@
package utils package utils
import ( import (
"errors" "log"
"os" "os"
"path/filepath" "path/filepath"
) )
@@ -22,7 +22,7 @@ func FindFrontendPath() string {
} }
if len(dirs) < 2 || filepath.Join(dirs[len(dirs)-2], dirs[len(dirs)-1]) != filepath.Join("frontend", "src") { if len(dirs) < 2 || filepath.Join(dirs[len(dirs)-2], dirs[len(dirs)-1]) != filepath.Join("frontend", "src") {
panic(errors.New("You're not in frontend/src")) log.Fatalf("Run this program in frontend/ directory")
} }
var path string var path string

View File

@@ -2,6 +2,7 @@ package utils
import ( import (
"bufio" "bufio"
"log"
"nto_cli/entities" "nto_cli/entities"
"os" "os"
"strings" "strings"
@@ -12,7 +13,7 @@ func GetStructFields(file *os.File, structName string) []entities.Field {
structFound := false structFound := false
structFields := []entities.Field{} var structFields []entities.Field
scanner := bufio.NewScanner(file) scanner := bufio.NewScanner(file)
for i := 1; scanner.Scan() && bracketsCount > 0; i++ { for i := 1; scanner.Scan() && bracketsCount > 0; i++ {
@@ -35,7 +36,7 @@ func GetStructFields(file *os.File, structName string) []entities.Field {
} }
if err := scanner.Err(); err != nil { if err := scanner.Err(); err != nil {
panic(err) log.Fatalf("Failed to read file with scanner: %s", err)
} }
return structFields return structFields
} }

View File

@@ -2,16 +2,18 @@ package utils
import ( import (
"bufio" "bufio"
"log"
"os" "os"
"strings" "strings"
) )
func GetStructList(filePath string) ([]string) { func GetStructList(filePath string) []string {
file, err := os.Open(filePath) file, err := os.Open(filePath)
if err != nil {
panic(err)
}
defer file.Close() defer file.Close()
if err != nil {
log.Fatalf("Failed to open a file: %s", err)
}
var structNames []string var structNames []string
s := bufio.NewScanner(file) s := bufio.NewScanner(file)
for s.Scan() { for s.Scan() {
@@ -25,8 +27,10 @@ func GetStructList(filePath string) ([]string) {
} }
} }
} }
if err := s.Err(); err != nil {
panic(err) if s.Err() != nil {
log.Fatalf("")
} }
return structNames return structNames
} }

View File

@@ -2,6 +2,7 @@ package utils
import ( import (
"errors" "errors"
"log"
"nto_cli/entities" "nto_cli/entities"
"strings" "strings"
@@ -13,19 +14,21 @@ func SplitStructField(field string) (*entities.Field, error) {
return nil, nil return nil, nil
} }
if len(strings.TrimSpace(field)) < 2 { if len(strings.TrimSpace(field)) < 2 {
return nil, errors.New("End") return nil, errors.New("unexpected end of struct field")
} }
startBacktip := strings.Index(field, "`") startBacktick := strings.Index(field, "`")
endBacktip := -1 endBacktick := -1
var metadata []entities.Medatada
if startBacktip > -1 { var metadata []entities.Metadata
endBacktip = strings.Index(field[startBacktip+1:], "`")
if endBacktip > -1 { if startBacktick > -1 {
endBacktip += startBacktip + 1 endBacktick = strings.Index(field[startBacktick+1:], "`")
meta := field[startBacktip+1 : endBacktip] if endBacktick > -1 {
endBacktick += startBacktick + 1
meta := field[startBacktick+1 : endBacktick]
tags, err := structtag.Parse(meta) tags, err := structtag.Parse(meta)
if err != nil { if err != nil {
panic(err) log.Fatalf("failed to parse struct tag: %s", err)
} }
uiTag, err := tags.Get("ui") uiTag, err := tags.Get("ui")
@@ -40,9 +43,10 @@ func SplitStructField(field string) (*entities.Field, error) {
} }
} }
} else { } else {
startBacktip = len(field) startBacktick = len(field)
} }
field = strings.TrimSpace(field[:startBacktip])
field = strings.TrimSpace(field[:startBacktick])
data := SplitBySingleSpace(field) data := SplitBySingleSpace(field)