fix(thrift): support both relative and absolute check for idl include…

…s parse to make it compatible with generation tool (#90)

* fix: support both relative and absolute check

* fix: relative check first

* optimize: reduce memory allocations

thrift/idl.go

@@ -209,25 +209,34 @@ func parseIDLContent(path, content string, includes map[string]string, isAbsIncl
 func refIncludes(tree *parser.Thrift, path string, done map[string]*parser.Thrift, includes map[string]*parser.Thrift, isAbsIncludePath bool) error {
 	done[path] = tree
 	for _, i := range tree.Includes {
-		p := i.Path
+		ps := make([]string, 0, 2)
 		if isAbsIncludePath {
-			p = absPath(tree.Filename, i.Path)
+			p := absPath(tree.Filename, i.Path)
+			if p != i.Path {
+				ps = append(ps, p)
+			}
 		}
+		ps = append(ps, i.Path)
 
-		// check cycle reference
-		if t := done[p]; t != nil {
-			i.Reference = t
-			continue
-		}
+		for _, p := range ps {
+			// check cycle reference
+			if t := done[p]; t != nil {
+				i.Reference = t
+				continue
+			}
 
-		ref, ok := includes[p]
-		if !ok {
-			return fmt.Errorf("miss include path: %s for file: %s", p, tree.Filename)
-		}
-		if err := refIncludes(ref, p, done, includes, isAbsIncludePath); err != nil {
-			return err
+			ref, ok := includes[p]
+			if !ok {
+				if !isAbsIncludePath {
+					return fmt.Errorf("miss include path: %s for file: %s", p, tree.Filename)
+				}
+				continue
+			}
+			if err := refIncludes(ref, p, done, includes, isAbsIncludePath); err != nil {
+				return err
+			}
+			i.Reference = ref
 		}
-		i.Reference = ref
 	}
 	return nil
 }

thrift/idl_test.go

@@ -50,6 +50,14 @@ func TestThriftContentWithAbsIncludePath(t *testing.T) {
 		t.Fatal(err)
 	}
 	fmt.Printf("%#v\n", p)
+
+	delete(includes, "a/b/x.thrift")
+	includes["x.thrift"] = "namespace go kitex.test.server"
+	p, err = NewDescritorFromContent(context.Background(), path, content, includes, true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	fmt.Printf("%#v\n", p)
 }
 
 func TestBitmap(t *testing.T) {