create: support './' and abs for protofile path (#19)

* create: support './' and abs for protofile path

* add verbose

* trim path

cmd/create/create_test.go

@@ -169,6 +169,7 @@ func Test_CreateCmd(t *testing.T) {
 			opts = append(opts, "--protofile", tt.pbfile)
 			opts = append(opts, "-o", out)
 			opts = append(opts, "--check-update", "true")
+			opts = append(opts, "-v")
 
 			if tt.rpconly {
 				opts = append(opts, "--rpconly")

cmd/create/options.go

@@ -14,6 +14,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/pflag"
@@ -165,6 +166,10 @@ func (c *Create) fixProtoDirs() error {
 
 	if c.options.UseBaseName {
 		c.options.Protofile = filepath.Base(target)
+	} else if filepath.IsAbs(c.options.Protofile) {
+		c.options.Protofile = strings.TrimPrefix(c.options.Protofile, "/")
+	} else {
+		c.options.Protofile = strings.TrimPrefix(c.options.Protofile, "./")
 	}
 
 	c.options.ProtofileAbs = target
@@ -408,8 +413,8 @@ func (c *Create) parsePBIDLOptions(flags *pflag.FlagSet) error {
 	if err != nil {
 		return fmt.Errorf("flags get protodir string array failed err: %w", err)
 	}
-	// Always append the current working directory.
-	c.options.Protodirs = fs.UniqFilePath(append(dirs, "."))
+	// Always append the current working directory and root directory.
+	c.options.Protodirs = fs.UniqFilePath(append(dirs, ".", "/"))
 	c.options.Protofile, err = flags.GetString("protofile")
 	if err != nil {
 		return fmt.Errorf("flags get protofile string failed err: %w", err)

util/fs/file.go

@@ -47,7 +47,6 @@ func LocateFile(protofile string, protodirs []string) (string, error) {
 
 	// If we can find the protofile under the current directory,
 	// directly return to prevent possible conflicts resulting from the relative path in protofile.
-	// Reference: https://mk.woa.com/q/286784
 	fp := filepath.Join(abs, protofile)
 	if info, err := os.Lstat(fp); err == nil && !info.IsDir() {
 		return fp, nil
@@ -61,7 +60,7 @@ func LocateFile(protofile string, protodirs []string) (string, error) {
 	log.Debug("protodirs: %s", protodirs)
 	fpaths, err := getPbFilePathList(protofile, protodirs)
 	if err != nil {
-		return "", fmt.Errorf("get pb file path listerr: %w", err)
+		return "", fmt.Errorf("get pb file path list err: %w", err)
 	}
 
 	// `-protofile=abc/d.proto`, works like `-protodir=abc -protofile=d.proto`