eliaskohout/ax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: add tag and relation methods to node to enforce integrity

Browse Source
This commit is contained in:
Elias Kohout
2026-03-29 23:16:44 +02:00
parent 4ebcb88628
commit dadd3d9e13
15 changed files with 313 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
cmd/add.go
View File

@@ -18,38 +18,53 @@ var cTags, cRels []string
var addCmd = &cobra.Command{
Use: "add <title>", Short: "Create a new node", Args: cobra.ExactArgs(1),
Run: func(cmd *cobra.Command, args []string) {
if !slices.ContainsFunc(cTags, func(e string) bool { return strings.HasPrefix(e, "_type::") }) {
cTags = append(cTags, "_type::issue")
}
if slices.Contains(cTags, "_type::issue") && !slices.ContainsFunc(cTags, func(e string) bool { return strings.HasPrefix(e, "_status::") }) {
cTags = append(cTags, "_status::open")
svc, err := service.GetNodeService(cfg)
if err != nil {
fmt.Fprintln(os.Stderr, "failed to create:", err)
}
// default relations
if !slices.ContainsFunc(cRels, func(e string) bool { return strings.HasPrefix(e, "_namespace::") }) {
cRels = append(cRels, "_namespace::"+cfg.GetUser())
}
// parse relations
rels := make(map[models.RelType][]string)
relNamespace := false
for _, r := range cRels {
rt, tgt, err := parseRelFlag(r)
rel, err := parseRelFlag(svc, r)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return
}
if rt == models.RelInNamespace {
relNamespace = true
}
rels[rt] = append(rels[rt], tgt)
}
if !relNamespace {
rels[models.RelInNamespace] = append(rels[models.RelInNamespace], cfg.GetUser())
rels[rel.Type] = append(rels[rel.Type], rel.Target)
}
svc, err := service.GetNodeService(cfg)
// create
n, err := svc.Create(args[0], cContent, cDue, nil, rels)
if err != nil {
fmt.Fprintln(os.Stderr, "failed to create:", err)
} else if n, err := svc.Create(args[0], cContent, cDue, cTags, rels); err != nil {
fmt.Fprintln(os.Stderr, "failed to create:", err)
} else {
output.PrintNode(cmd.OutOrStdout(), svc, n, jsonFlag)
return
}
for _, t := range cTags {
n.AddTag(t)
}
// default tags
if !slices.ContainsFunc(cTags, func(e string) bool { return strings.HasPrefix(e, "_type::") }) {
n.AddTag("_type::issue")
}
if n.HasTag("_type::issue") && !slices.ContainsFunc(cTags, func(e string) bool { return strings.HasPrefix(e, "_status::") }) {
n.AddTag("_status::open")
}
// persist tags added above
if err := svc.Update(n); err != nil {
fmt.Fprintln(os.Stderr, "failed to update with tags:", err)
return
}
output.PrintNode(cmd.OutOrStdout(), svc, n, jsonFlag)
},
}

1
cmd/alias.go
View File

@@ -15,7 +15,6 @@ var aliasCmd = &cobra.Command{
Use: "alias [name] [command]", Short: "Manage aliases", Args: cobra.MaximumNArgs(2),
Run: func(cmd *cobra.Command, args []string) {
w := cmd.OutOrStdout()
if len(args) == 0 {
if aliases, err := cfg.ListAliases(); err == nil {
output.PrintAliases(w, aliases, jsonFlag)

7
cmd/del.go
View File

@@ -17,12 +17,13 @@ var delCmd = &cobra.Command{
Run: func(cmd *cobra.Command, args []string) {
svc, err := service.GetNodeService(cfg)
if err != nil {
fmt.Fprintln(os.Stderr, "failed to create service: %v", err)
fmt.Fprintln(os.Stderr, err)
return
}
n, err := svc.GetByID(args[0])
if err != nil {
fmt.Fprintln(os.Stderr, " node not found:", args[0])
fmt.Fprintf(os.Stderr, "node not found: %s", args[0])
return
}
@@ -36,7 +37,7 @@ var delCmd = &cobra.Command{
}
if err := svc.Delete(args[0]); err != nil {
fmt.Fprintln(os.Stderr, "failed to delete: ", err)
fmt.Fprintf(os.Stderr, "failed to delete: %v", err)
} else {
output.PrintAction(cmd.OutOrStdout(), "Deleted", args[0], true)
}

1
cmd/edit.go
View File

@@ -18,6 +18,7 @@ var editCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
n, err := svc.GetByID(args[0])
if err != nil {
fmt.Fprintln(os.Stderr, "node not found:", args[0])

22
cmd/list.go
View File

@@ -9,9 +9,7 @@ import (
"github.com/spf13/cobra"
)
var lAssignee string
var lTags []string
var lMention string
var lTags, lRels []string
var listCmd = &cobra.Command{
Use: "list", Short: "List nodes",
@@ -21,15 +19,19 @@ var listCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
opts := []service.ListOption{}
if len(lTags) > 0 {
opts = append(opts, service.WithTags(lTags...))
}
if lAssignee != "" {
opts = append(opts, service.WithAssignee(lAssignee))
}
if lMention != "" {
opts = append(opts, service.WithMentions(lMention))
for _, relStr := range lRels {
rel, err := parseRelFlag(svc, relStr)
if err != nil {
fmt.Fprintf(os.Stderr, "failed to parse relation flag: %v", err)
return
}
opts = append(opts, service.WithRels(rel))
}
if nodes, err := svc.List(opts...); err == nil {
@@ -44,7 +46,7 @@ func init() {
rootCmd.AddCommand(listCmd)
addPropertyFlags(listCmd)
f := listCmd.Flags()
f.StringVar(&lAssignee, "assignee", "", "")
//TODO: assignee/ mention flags?
f.StringArrayVar(&lTags, "tag", nil, "")
f.StringVar(&lMention, "mention", "", "")
f.StringArrayVar(&lRels, "rel", nil, "")
}

11
cmd/rel.go
View File

@@ -2,13 +2,18 @@ package cmd
import (
"axolotl/models"
"axolotl/service"
"fmt"
"strings"
)
func parseRelFlag(s string) (models.RelType, string, error) {
func parseRelFlag(svc service.NodeService, s string) (*models.Rel, error) {
if p := strings.SplitN(s, ":", 2); len(p) == 2 {
return models.RelType(p[0]), p[1], nil
return &models.Rel{Type: models.RelType(p[0]), Target: p[1]}, nil
}
return "", "", fmt.Errorf("invalid relation format: %s (expected type:id)", s)
// name resolution for rels
//TODO:
return &models.Rel{}, fmt.Errorf("invalid relation format: %s (expected type:id)", s)
}

70
cmd/root.go
View File

@@ -27,35 +27,15 @@ func Execute() {
}
}
func expandAlias(alias *service.Alias, args []string, currentUser string) []string {
cmd := alias.Command
cmd = strings.ReplaceAll(cmd, "$me", currentUser)
func init() {
rootCmd.PersistentFlags().BoolVar(&jsonFlag, "json", false, "")
}
parts := strings.Fields(cmd)
var result []string
for _, part := range parts {
if part == "$@" {
result = append(result, args...)
continue
}
hasCatchAll := strings.Contains(part, "$@")
replaced := part
if hasCatchAll {
replaced = strings.ReplaceAll(replaced, "$@", strings.Join(args, " "))
}
for i := len(args) - 1; i >= 0; i-- {
placeholder := fmt.Sprintf("$%d", i+1)
replaced = strings.ReplaceAll(replaced, placeholder, args[i])
}
result = append(result, replaced)
}
return result
func addPropertyFlags(cmd *cobra.Command) {
cmd.Flags().String("type", "", "node type")
cmd.Flags().String("status", "", "node status")
cmd.Flags().String("prio", "", "node priority")
cmd.Flags().String("namespace", "", "node namespace")
}
func registerAliasCommands() {
@@ -67,8 +47,27 @@ func registerAliasCommands() {
Short: a.Description,
GroupID: "aliases",
DisableFlagParsing: true,
Run: func(cmd *cobra.Command, args []string) {
expanded := expandAlias(a, args, cfg.GetUser())
Run: func(ccmd *cobra.Command, args []string) {
acmd := a.Command
acmd = strings.ReplaceAll(acmd, "$me", cfg.GetUser())
parts := strings.Fields(acmd)
var expanded []string
for _, part := range parts {
if part == "$@" {
expanded = append(expanded, args...)
continue
}
hasCatchAll := strings.Contains(part, "$@")
replaced := part
if hasCatchAll {
replaced = strings.ReplaceAll(replaced, "$@", strings.Join(args, " "))
}
for i := len(args) - 1; i >= 0; i-- {
placeholder := fmt.Sprintf("$%d", i+1)
replaced = strings.ReplaceAll(replaced, placeholder, args[i])
}
expanded = append(expanded, replaced)
}
rootCmd.SetArgs(transformArgs(expanded))
if err := rootCmd.Execute(); err != nil {
os.Exit(1)
@@ -102,14 +101,3 @@ func transformArgs(args []string) []string {
}
return result
}
func init() {
rootCmd.PersistentFlags().BoolVar(&jsonFlag, "json", false, "")
}
func addPropertyFlags(cmd *cobra.Command) {
cmd.Flags().String("type", "", "node type")
cmd.Flags().String("status", "", "node status")
cmd.Flags().String("prio", "", "node priority")
cmd.Flags().String("namespace", "", "node namespace")
}

1
cmd/show.go
View File

@@ -17,6 +17,7 @@ var showCmd = &cobra.Command{
fmt.Fprintln(os.Stderr, err)
return
}
if n, err := svc.GetByID(args[0]); err == nil {
output.PrintNode(cmd.OutOrStdout(), svc, n, jsonFlag)
} else {

45
cmd/update.go
View File

@@ -7,7 +7,6 @@ import (
"fmt"
"os"
"slices"
"strings"
"github.com/spf13/cobra"
)
@@ -33,15 +32,16 @@ var updateCmd = &cobra.Command{
return
}
// parse relations
addRels, rmRels := make(map[models.RelType][]string), make(map[models.RelType][]string)
parseRel := func(src []string, dst map[models.RelType][]string) bool {
for _, r := range src {
rt, tgt, err := parseRelFlag(r)
rel, err := parseRelFlag(svc, r)
if err != nil {
fmt.Fprintln(os.Stderr, err)
return false
}
dst[rt] = append(dst[rt], tgt)
dst[rel.Type] = append(dst[rel.Type], rel.Target)
}
return true
}
@@ -49,6 +49,8 @@ var updateCmd = &cobra.Command{
return
}
// enforce blocking of tasks
//TODO: mabye part of the backend?
if slices.Contains(uAddTags, "_status::done") {
ok, blockers, err := svc.CanClose(args[0])
if err != nil {
@@ -59,21 +61,9 @@ var updateCmd = &cobra.Command{
fmt.Fprintf(os.Stderr, "cannot close: blocked by %v\n", blockers)
return
}
uRmTags = append(uRmTags, "_status::open")
} else if slices.Contains(uAddTags, "_status::open") {
uRmTags = append(uRmTags, "_status::done")
}
for _, prefix := range []string{"_type::", "_status::", "_prio::", "_namespace::"} {
if slices.ContainsFunc(uAddTags, func(e string) bool { return strings.HasPrefix(e, prefix) }) {
for _, existing := range node.Tags {
if strings.HasPrefix(existing, prefix) {
uRmTags = append(uRmTags, existing)
}
}
}
}
// update main fields
if cmd.Flags().Changed("title") {
node.Title = uTitle
}
@@ -87,28 +77,33 @@ var updateCmd = &cobra.Command{
node.DueDate = ""
}
// udpate tags
for _, t := range uRmTags {
node.Tags = slices.DeleteFunc(node.Tags, func(e string) bool { return e == t })
}
for _, t := range uAddTags {
if !slices.Contains(node.Tags, t) {
node.Tags = append(node.Tags, t)
if err := node.RemoveTag(t); err != nil {
fmt.Fprintln(os.Stderr, "failed to remove tag:", err)
return
}
}
for _, t := range uAddTags {
node.AddTag(t)
}
// update relations
for rt, tgts := range rmRels {
for _, tgt := range tgts {
node.Relations[string(rt)] = slices.DeleteFunc(node.Relations[string(rt)], func(e string) bool { return e == tgt })
if err := node.RemoveRelation(rt, tgt); err != nil {
fmt.Fprintln(os.Stderr, "failed to remove relation:", err)
return
}
}
}
for rt, tgts := range addRels {
for _, tgt := range tgts {
if !slices.Contains(node.Relations[string(rt)], tgt) {
node.Relations[string(rt)] = append(node.Relations[string(rt)], tgt)
}
node.AddRelation(rt, tgt)
}
}
// persist update
if err := svc.Update(node); err != nil {
fmt.Fprintln(os.Stderr, "failed to update:", err)
return