Merge pull request #53 from k1LoW/fix-resolve-paths

Fix resolvePaths() to handle relative paths correctly

dynamic_test.go

@@ -61,7 +61,7 @@ func TestResponseDynamicRepeated(t *testing.T) {
 	client := hello.NewGrpcTestServiceClient(ts.Conn())
 	res, err := client.Hello(ctx, &hello.HelloRequest{})
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 	if len(res.Hellos) == 0 {
 		t.Error("invalid repeated field value")
@@ -84,7 +84,7 @@ func TestResponseDynamicGenerated(t *testing.T) {
 	client := hello.NewGrpcTestServiceClient(ts.Conn())
 	res, err := client.Hello(ctx, &hello.HelloRequest{})
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 	if res.CreateTime.AsTime().UnixNano() != want.UnixNano() {
 		t.Errorf("got %v\nwant %v", res.CreateTime.AsTime().UnixNano(), want.UnixNano())
@@ -107,7 +107,7 @@ func TestResponseDynamicServer(t *testing.T) {
 	client := hello.NewGrpcTestServiceClient(ts.Conn())
 	res, err := client.Hello(ctx, &hello.HelloRequest{})
 	if err != nil {
-		t.Error(err)
+		t.Fatal(err)
 	}
 	if res.CreateTime.AsTime().UnixNano() != want.UnixNano() {
 		t.Errorf("got %v\nwant %v", res.CreateTime.AsTime().UnixNano(), want.UnixNano())

grpcstub.go

@@ -902,12 +902,30 @@ func rangeTopLevelDescriptors(fd protoreflect.FileDescriptor, f func(protoreflec
 }
 
 func resolvePaths(importPaths []string, protos ...string) ([]string, []string, error) {
-	resolvedIPaths := importPaths
+	if len(importPaths) == 0 {
+		return importPaths, protos, nil
+	}
+	const sep = string(filepath.Separator)
+	importPaths = unique(importPaths)
+	var resolvedIPaths []string
+	for _, p := range importPaths {
+		abs, err := filepath.Abs(p)
+		if err != nil {
+			return nil, nil, err
+		}
+		resolvedIPaths = append(resolvedIPaths, abs)
+	}
 	resolvedProtos := []string{}
 	for _, p := range protos {
-		d, b := filepath.Split(p)
-		resolvedIPaths = append(resolvedIPaths, d)
-		resolvedProtos = append(resolvedProtos, b)
+		abs, err := filepath.Abs(p)
+		if err != nil {
+			return nil, nil, err
+		}
+		for _, ip := range resolvedIPaths {
+			if strings.HasPrefix(abs, ip+sep) {
+				resolvedProtos = append(resolvedProtos, strings.TrimPrefix(abs, ip+sep))
+			}
+		}
 	}
 	resolvedIPaths = unique(resolvedIPaths)
 	resolvedProtos = unique(resolvedProtos)

grpcstub_test.go

@@ -100,7 +100,7 @@ func TestServerStreaming(t *testing.T) {
 			break
 		}
 		if err != nil {
-			t.Error(err)
+			t.Fatal(err)
 		}
 		switch c {
 		case 0: