Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: implement DataRef.schemaChildren() #893

Merged
merged 1 commit into from
Feb 7, 2024
Merged

chore: implement DataRef.schemaChildren() #893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions backend/schema/dataref.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,14 @@ func (d *DataRef) ToProto() protoreflect.ProtoMessage {
}
}

func (*DataRef) schemaChildren() []Node { return nil }
func (*DataRef) schemaType() {}
func (d *DataRef) schemaChildren() []Node {
out := make([]Node, 0, len(d.TypeParameters))
for _, t := range d.TypeParameters {
out = append(out, t)
}
return out
}
func (*DataRef) schemaType() {}

func ParseDataRef(ref string) (*DataRef, error) {
return dataRefParser.ParseString("", ref)
Expand Down
8 changes: 0 additions & 8 deletions backend/schema/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,14 +149,6 @@ func (m *Module) Imports() []string {
if n.Module != "" && n.Module != m.Name {
imports[n.Module] = true
}
// add imports for type parameters DataRefs as well
for _, p := range n.TypeParameters {
if p, ok := p.(*DataRef); ok {
if p.Module != "" && p.Module != m.Name {
imports[p.Module] = true
}
}
}

case *VerbRef:
if n.Module != "" && n.Module != m.Name {
Expand Down
66 changes: 16 additions & 50 deletions backend/schema/schema_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,11 +63,13 @@ func TestImports(t *testing.T) {
ref another.Data
ref Generic<new.Data>
}
verb myVerb(test.Data) test.Data
calls verbose.verb
}
`
schema, err := ParseModuleString("", input)
assert.NoError(t, err)
assert.Equal(t, []string{"another", "new", "other"}, schema.Imports())
assert.Equal(t, []string{"another", "new", "other", "verbose"}, schema.Imports())
}

func TestVisit(t *testing.T) {
Expand Down Expand Up @@ -98,7 +100,9 @@ Module
VerbRef
Verb
DataRef
DataRef
DataRef
DataRef
MetadataIngress
IngressPathLiteral
IngressPathLiteral
Expand All @@ -115,7 +119,7 @@ Module
return next()
})
assert.NoError(t, err)
assert.Equal(t, normaliseString(expected), normaliseString(actual.String()), "%s", actual.String())
assert.Equal(t, strings.TrimSpace(expected), strings.TrimSpace(actual.String()), "%s", actual.String())
}

func TestParserRoundTrip(t *testing.T) {
Expand Down Expand Up @@ -188,35 +192,15 @@ func TestParsing(t *testing.T) {
input: `module int { data String { name String } verb verb(String) String }`,
errors: []string{"1:14: data structure name \"String\" is a reserved word"}},
{name: "BuiltinRef",
input: `module test { verb myIngress(HttpRequest<string>) HttpResponse<string> }`,
input: `module test { verb myIngress(HttpRequest<String>) HttpResponse<String> }`,
expected: &Schema{
Modules: []*Module{{
Name: "test",
Decls: []Decl{
&Verb{
Name: "myIngress",
Request: &DataRef{Module: "builtin", Name: "HttpRequest", TypeParameters: []Type{
&DataRef{
Pos: Position{
Offset: 41,
Line: 1,
Column: 42,
},
Name: "string",
TypeParameters: []Type{},
},
}},
Response: &DataRef{Module: "builtin", Name: "HttpResponse", TypeParameters: []Type{
&DataRef{
Pos: Position{
Offset: 63,
Line: 1,
Column: 64,
},
Name: "string",
TypeParameters: []Type{},
},
}},
Name: "myIngress",
Request: &DataRef{Module: "builtin", Name: "HttpRequest", TypeParameters: []Type{&String{}}},
Response: &DataRef{Module: "builtin", Name: "HttpResponse", TypeParameters: []Type{&String{}}},
},
},
}},
Expand Down Expand Up @@ -310,32 +294,14 @@ func TestParsing(t *testing.T) {
Comments: []string{},
Name: "test",
Request: &DataRef{
Module: "test",
Name: "Data",
TypeParameters: []Type{
&String{
Pos: Position{
Offset: 81,
Line: 7,
Column: 21,
},
Str: true,
},
},
Module: "test",
Name: "Data",
TypeParameters: []Type{&String{}},
},
Response: &DataRef{
Module: "test",
Name: "Data",
TypeParameters: []Type{
&String{
Pos: Position{
Offset: 95,
Line: 7,
Column: 35,
},
Str: true,
},
},
Module: "test",
Name: "Data",
TypeParameters: []Type{&String{}},
},
},
},
Expand Down