feat: [ts] add basic field for interface support

phodal · Jan 10, 2020 · 052efb5 · 052efb5
1 parent f5423a3
commit 052efb5
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 45 deletions.
diff --git a/languages/g4/TypeScriptParser.g4 b/languages/g4/TypeScriptParser.g4
@@ -149,7 +149,7 @@ typeMemberList
     ;
 
 typeMember
-    : propertySignatur
+    : propertySignature
     | callSignature
     | constructSignature
     | indexSignature
@@ -185,7 +185,7 @@ typeQueryExpression
     | (identifierName '.')+ identifierName
     ;
 
-propertySignatur
+propertySignature
     : ReadOnly? propertyName '?'? typeAnnotation? ('=>' type_)?
     ;
 

diff --git a/languages/ts/TypeScriptParser.interp b/languages/ts/TypeScriptParser.interp
@@ -293,7 +293,7 @@ functionType
 constructorType
 typeQuery
 typeQueryExpression
-propertySignatur
+propertySignature
 typeAnnotation
 callSignature
 parameterList

diff --git a/languages/ts/typescript_parser.go b/languages/ts/typescript_parser.go
diff --git a/languages/ts/typescriptparser_base_listener.go b/languages/ts/typescriptparser_base_listener.go
diff --git a/languages/ts/typescriptparser_listener.go b/languages/ts/typescriptparser_listener.go
diff --git a/trial/pkg/application/ts/ts_ident_app_test.go b/trial/pkg/application/ts/ts_ident_app_test.go
@@ -108,6 +108,21 @@ interface IEmployee extends IPerson{
 	g.Expect(results[1].Extend).To(Equal("IPerson"))
 }
 
+func Test_ShouldGetInterfaceProperty(t *testing.T) {
+	g := NewGomegaWithT(t)
+
+	app := new(TypeScriptApiApp)
+
+	results := app.Analysis(`
+export interface IPerson {
+    name: string;
+    gender: string;
+}
+`)
+
+	g.Expect(len(results[0].Fields)).To(Equal(2))
+}
+
 func Test_ShouldGetDefaultFunctionName(t *testing.T) {
 	g := NewGomegaWithT(t)
 

diff --git a/trial/pkg/ast/typescript_ident_listener.go b/trial/pkg/ast/typescript_ident_listener.go
@@ -47,6 +47,31 @@ func (s *TypeScriptIdentListener) EnterInterfaceDeclaration(ctx *parser.Interfac
 		implements := BuildImplements(extendsContext.ClassOrInterfaceTypeList())
 		currentNode.Extend = implements[0]
 	}
+
+	objectTypeCtx := ctx.ObjectType().(*parser.ObjectTypeContext)
+	if objectTypeCtx.TypeBody() != nil {
+		typeMemberListCtx := objectTypeCtx.TypeBody().(*parser.TypeBodyContext).TypeMemberList().(*parser.TypeMemberListContext)
+		BuildInterfaceTypeBody(typeMemberListCtx, currentNode)
+	}
+}
+
+func BuildInterfaceTypeBody(ctx *parser.TypeMemberListContext, classNode *domain.JClassNode) {
+	for _, typeMember := range ctx.AllTypeMember() {
+		typeMemberContext := typeMember.(*parser.TypeMemberContext).GetChild(0)
+		currentType := reflect.TypeOf(typeMemberContext).String()
+		switch currentType {
+		case "*parser.PropertySignatureContext":
+			{
+				signatureCtx := typeMemberContext.(*parser.PropertySignatureContext)
+				field := &domain.JAppField{
+					Type:  BuildAnnotationType(signatureCtx.TypeAnnotation().(*parser.TypeAnnotationContext)),
+					Value: signatureCtx.PropertyName().GetText(),
+				}
+
+				classNode.Fields = append(classNode.Fields, *field)
+			}
+		}
+	}
 }
 
 func (s *TypeScriptIdentListener) ExitInterfaceDeclaration(ctx *parser.InterfaceDeclarationContext) {