Expands chifra abis --list_events and --list_funcs

Author: tjayrush

src/apps/chifra/internal/abis/handle_listitems.go

@@ -3,21 +3,39 @@ package abisPkg
 import (
 	"errors"
 	"fmt"
+	"path/filepath"
+	"strings"
 
+	"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/base"
 	"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/output"
 	"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/rpc"
 	"github.com/TrueBlocks/trueblocks-core/src/apps/chifra/pkg/types"
 )
 
 func (opts *AbisOptions) HandleListFuncs(rCtx *output.RenderCtx) (err error) {
-	return opts.HandleListItems(rCtx, "function")
+	return opts.HandleListItems(rCtx)
 }
 
 func (opts *AbisOptions) HandleListEvents(rCtx *output.RenderCtx) (err error) {
-	return opts.HandleListItems(rCtx, "event")
+	return opts.HandleListItems(rCtx)
 }
 
-func (opts *AbisOptions) HandleListItems(rCtx *output.RenderCtx, filter string) (err error) {
+func (opts *AbisOptions) HandleListItems(rCtx *output.RenderCtx) (err error) {
+	if len(opts.Addrs) == 0 {
+		vFunc := func(fn string, vP any) (bool, error) {
+			_ = vP
+			_, name := filepath.Split(fn)
+			if strings.HasSuffix(name, ".json") {
+				if base.IsValidAddress(strings.TrimSuffix(name, ".json")) {
+					// silent ignore
+					opts.Addrs = append(opts.Addrs, strings.TrimSuffix(name, ".json"))
+				}
+			}
+			return true, nil
+		}
+		opts.ForEveryAbi(true, vFunc, nil)
+	}
+
 	fetchData := func(modelChan chan types.Modeler, errorChan chan error) {
 		for _, addr := range opts.Addrs {
 			functions, which, err := opts.LoadAbis([]string{addr}, false /* known */)
@@ -36,7 +54,7 @@ func (opts *AbisOptions) HandleListItems(rCtx *output.RenderCtx, filter string)
 			}
 
 			for _, f := range functions {
-				if filter == "" || filter == f.FunctionType {
+				if opts.ListFilter == "" || opts.ListFilter == f.FunctionType {
 					modelChan <- f
 				}
 			}

src/apps/chifra/internal/abis/options.go

@@ -43,6 +43,7 @@ type AbisOptions struct {
 	BadFlag    error                 `json:"badFlag,omitempty"`    // An error flag if needed
 	// EXISTING_CODE
 	ProxyForAddr base.Address `json:"-"`
+	ListFilter   string       `json:"-"`
 	// EXISTING_CODE
 }
 

src/apps/chifra/internal/abis/validate.go

@@ -43,6 +43,8 @@ func (opts *AbisOptions) validateAbis() error {
 		len(opts.Find) == 0 &&
 		!opts.Count &&
 		!opts.List &&
+		!opts.ListFuncs &&
+		!opts.ListEvents &&
 		!opts.Known &&
 		!opts.Globals.Decache {
 		// If we're not find and not known we better have at least one address
@@ -52,6 +54,18 @@ func (opts *AbisOptions) validateAbis() error {
 		}
 	}
 
+	if opts.ListFuncs || opts.ListEvents {
+		if opts.List {
+			return validate.Usage("The {0} options cannot be used with {1}.", "--list", "--listFuncs or --listEvents")
+		}
+		opts.ListFilter = "" // assume both pass
+		if opts.ListFuncs && !opts.ListEvents {
+			opts.ListFilter = "function"
+		} else if opts.ListEvents && !opts.ListFuncs {
+			opts.ListFilter = "event"
+		}
+	}
+
 	other := len(opts.Encode) != 0 || len(opts.Find) != 0 || opts.Globals.Decache
 	if other && (opts.Count || opts.List) {
 		return validate.Usage("The {0} options must be used alone.", "--count and --list")