[housekeeping] refactor file names, better interpolation perf

Author: lispyclouds

cobra.go

@@ -10,8 +10,8 @@ package climate
 import (
 	"fmt"
 	"log/slog"
-	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/pb33f/libopenapi"
 	v3 "github.com/pb33f/libopenapi/datamodel/high/v3"
@@ -94,11 +94,6 @@ func interpolatePathCobra(cmd *cobra.Command, h *HandlerData) error {
 	flags := cmd.Flags()
 
 	for _, param := range h.PathParams {
-		pattern, err := regexp.Compile(fmt.Sprintf("({%s})+", param.Name))
-		if err != nil {
-			return err
-		}
-
 		var value string
 
 		switch param.Type {
@@ -115,7 +110,7 @@ func interpolatePathCobra(cmd *cobra.Command, h *HandlerData) error {
 			value = strconv.FormatBool(v)
 		}
 
-		h.Path = pattern.ReplaceAllString(h.Path, value)
+		h.Path = strings.ReplaceAll(h.Path, "{"+param.Name+"}", value)
 	}
 
 	return nil

cobra_test.go

@@ -11,7 +11,7 @@ func TestInterpolatePath(t *testing.T) {
 	cmd := cobra.Command{}
 	hData := HandlerData{
 		Method: "get",
-		Path:   "/path/{foo}/to/{bar}/with/{baz}/and/{quxx}/together",
+		Path:   "/path/{foo}/to/{bar}/with/{baz}/and/{quxx}/together/{foo}",
 		PathParams: []ParamMeta{
 			{Name: "foo", Type: String},
 			{Name: "bar", Type: Integer},
@@ -28,7 +28,7 @@ func TestInterpolatePath(t *testing.T) {
 	err := interpolatePathCobra(&cmd, &hData)
 	assert.NoError(t, err)
 
-	assert.Equal(t, hData.Path, "/path/yes/to/420/with/420.69/and/false/together")
+	assert.Equal(t, hData.Path, "/path/yes/to/420/with/420.69/and/false/together/yes")
 }
 
 func assertCmdTree(t *testing.T, cmd *cobra.Command, assertConf map[string]map[string]any, prefix string) {

urfavecli.go urfavecliv3.gourfavecli.go renamed to urfavecliv3.go

@@ -11,8 +11,8 @@ import (
 	"context"
 	"fmt"
 	"log/slog"
-	"regexp"
 	"strconv"
+	"strings"
 
 	"github.com/pb33f/libopenapi"
 	v3 "github.com/pb33f/libopenapi/datamodel/high/v3"
@@ -109,11 +109,6 @@ func addRequestBodyUrfaveCliV3(cmd *cli.Command, op *v3.Operation, handlerData *
 func interpolatePathUrfaveCliV3(cmd *cli.Command, h *HandlerData) error {
 	// TODO: Extract commom
 	for _, param := range h.PathParams {
-		pattern, err := regexp.Compile(fmt.Sprintf("({%s})+", param.Name))
-		if err != nil {
-			return err
-		}
-
 		var value string
 
 		switch param.Type {
@@ -127,7 +122,7 @@ func interpolatePathUrfaveCliV3(cmd *cli.Command, h *HandlerData) error {
 			value = strconv.FormatBool(cmd.Bool(param.Name))
 		}
 
-		h.Path = pattern.ReplaceAllString(h.Path, value)
+		h.Path = strings.ReplaceAll(h.Path, "{"+param.Name+"}", value)
 	}
 
 	return nil
@@ -179,6 +174,10 @@ func BootstrapV3UrfaveCliV3(rootCmd *cli.Command, model libopenapi.DocumentModel
 			if altName := exts.name; altName != "" {
 				cmd.Name = altName
 			}
+			cmd.CommandNotFound = func(_ context.Context, cmd *cli.Command, command string) {
+				slog.Error("Unknown command", "command", command)
+				cli.ShowSubcommandHelpAndExit(cmd, 1)
+			}
 
 			if g := exts.group; g != "" {
 				_, ok := cmdGroups[g]

urfavecli_test.go urfavecliv3_test.gourfavecli_test.go renamed to urfavecliv3_test.go

@@ -11,7 +11,7 @@ import (
 func TestInterpolatePathUrfaveCliV3(t *testing.T) {
 	hData := HandlerData{
 		Method: "get",
-		Path:   "/path/{foo}/to/{bar}/with/{baz}/and/{quxx}/together",
+		Path:   "/path/{foo}/to/{bar}/with/{baz}/and/{quxx}/together/{foo}",
 		PathParams: []ParamMeta{
 			{Name: "foo", Type: String},
 			{Name: "bar", Type: Integer},
@@ -47,7 +47,7 @@ func TestInterpolatePathUrfaveCliV3(t *testing.T) {
 	err := interpolatePathUrfaveCliV3(&cmd, &hData)
 	assert.NoError(t, err)
 
-	assert.Equal(t, hData.Path, "/path/yes/to/420/with/420.69/and/false/together")
+	assert.Equal(t, hData.Path, "/path/yes/to/420/with/420.69/and/false/together/yes")
 }
 
 func assertCmdTreeUrfaveCliV3(t *testing.T, cmd *cli.Command, expected *cli.Command) {