Merge pull request #40 from Balaji01-4D/feat/basic-auto-completion

Feat/basic auto completion

Author: balajz

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/fatih/color v1.19.0
 	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
 	github.com/jedib0t/go-pretty/v6 v6.7.9
-	github.com/jedib0t/go-prompter v0.1.0
+	github.com/jedib0t/go-prompter v0.1.1-0.20260227172322-e85600bef9c9
 	github.com/muesli/termenv v0.16.0
 	github.com/pganalyze/pg_query_go/v6 v6.2.2
 	github.com/spf13/cobra v1.10.2

go.sum

@@ -104,8 +104,8 @@ github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo
 github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
 github.com/jedib0t/go-pretty/v6 v6.7.9 h1:frarzQWmkZd97syT81+TH8INKPpzoxQnk+Mk5EIHSrM=
 github.com/jedib0t/go-pretty/v6 v6.7.9/go.mod h1:YwC5CE4fJ1HFUDeivSV1r//AmANFHyqczZk+U6BDALU=
-github.com/jedib0t/go-prompter v0.1.0 h1:d90s+xWEp4+B52wI3NH5pO4zLG5ZMxoch7GPOxIlpHk=
-github.com/jedib0t/go-prompter v0.1.0/go.mod h1:r0rLW2jSPjaUdNsPyg+gYryZ5oaHOcow3OL9RFOT/bM=
+github.com/jedib0t/go-prompter v0.1.1-0.20260227172322-e85600bef9c9 h1:e+BsMawvjlbHkKVtrElEWFMhCsDOvxX2FSWDXbOnjYU=
+github.com/jedib0t/go-prompter v0.1.1-0.20260227172322-e85600bef9c9/go.mod h1:r0rLW2jSPjaUdNsPyg+gYryZ5oaHOcow3OL9RFOT/bM=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

internal/app/app.go

@@ -30,7 +30,7 @@ type PgxCLI struct {
 	logger  *slog.Logger
 }
 
-func NewPgxCLI(config *config.Config, printer cliio.Printer, logger *slog.Logger) (*PgxCLI, error) {
+func New(config *config.Config, printer cliio.Printer, logger *slog.Logger) (*PgxCLI, error) {
 	history, entries := newHistory(config.Main.HistoryFile, logger)
 	reader, err := NewPgxReader()
 	if err != nil {
@@ -126,6 +126,10 @@ func (p *PgxCLI) Start(ctx context.Context, client *database.Client) {
 	}
 }
 
+func (p *PgxCLI) SetAutocompleter(keywords []string) {
+	p.prompt.SetAutocompleter(keywords)
+}
+
 func (p *PgxCLI) Close() error {
 	p.History.saveHistory(p.prompt.History())
 	return nil

internal/app/reader.go

@@ -24,6 +24,7 @@ var chromaFormatter = detectTerminalColorProfile()
 type Reader interface {
 	Read(prefix string, ctx context.Context) (string, error)
 	History() []prompt.HistoryCommand
+	SetAutocompleter(keywords []string)
 }
 
 type PgxReader struct {
@@ -48,6 +49,14 @@ func (r *PgxReader) Read(prefix string, ctx context.Context) (string, error) {
 	return text, nil
 }
 
+func (r *PgxReader) SetAutocompleter(keywords []string) {
+	suggestions := make([]prompt.Suggestion, len(keywords))
+	for i, kw := range keywords {
+		suggestions[i] = prompt.Suggestion{Value: kw}
+	}
+	r.prompt.SetAutoCompleterContextual(prompt.AutoCompleteSimple(suggestions, true))
+}
+
 func (r *PgxReader) History() []prompt.HistoryCommand {
 	return r.prompt.History()
 }

internal/cli/root.go

@@ -12,6 +12,7 @@ import (
 	"github.com/balaji01-4d/pgxcli/internal/config"
 	"github.com/balaji01-4d/pgxcli/internal/database"
 	"github.com/balaji01-4d/pgxcli/internal/logger"
+	"github.com/balaji01-4d/pgxcli/internal/parser"
 	"github.com/balaji01-4d/pgxcli/internal/ui"
 	"github.com/spf13/cobra"
 )
@@ -41,6 +42,8 @@ func NewRootCmd(ctx context.Context, cliCtx *CliContext) *cobra.Command {
 		finalPassword string
 	)
 
+	var pgKws []string
+
 	rootCmd := &cobra.Command{
 		Use:     "pgxcli [DBNAME] [USERNAME]",
 		Short:   "Interactive PostgreSQL command-line client for querying and managing databases.",
@@ -64,6 +67,8 @@ func NewRootCmd(ctx context.Context, cliCtx *CliContext) *cobra.Command {
 
 			cliCtx.Logger = logger
 
+			pgKws = parser.LoadPgKeywords()
+
 			return nil
 		},
 
@@ -190,11 +195,12 @@ func NewRootCmd(ctx context.Context, cliCtx *CliContext) *cobra.Command {
 				return err
 			}
 
-			app, err := app.NewPgxCLI(cliCtx.config, cliCtx.Printer, cliCtx.Logger.Logger)
+			app, err := app.New(cliCtx.config, cliCtx.Printer, cliCtx.Logger.Logger)
 			if err != nil {
 				cliCtx.Logger.Error("Failed to initialize app", "error", err)
 				return err
 			}
+			app.SetAutocompleter(pgKws)
 			cliCtx.App = app
 			return nil
 		},

internal/parser/pg_kw.go

@@ -0,0 +1,25 @@
+package parser
+
+import (
+	_ "embed"
+	"strings"
+)
+
+//go:embed pg_kw.txt
+var pgKeywords string
+
+func LoadPgKeywords() []string {
+	return suggestionsFromFile(pgKeywords)
+}
+
+func suggestionsFromFile(contents string) []string {
+	var suggestions []string
+	for _, line := range strings.Split(contents, "\n") {
+		line = strings.TrimSpace(line)
+		if line != "" {
+			suggestions = append(suggestions, line)
+		}
+	}
+
+	return suggestions
+}